Commit 80e55efc authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6223

parent 86c1559b
......@@ -7,6 +7,7 @@ OpenLDAP 2.4.22 Engineering
Added slapo-ldap idassert-passthru (ITS#6456)
Added slapo-pbind
Fixed libldap gmtime re-entrancy (ITS#6262)
Fixed libldap gssapi off by one error (ITS#6223)
Fixed libldap GnuTLS serial length (ITS#6460)
Fixed libldap MozNSS context and PEM support (ITS#6432)
Fixed libldap referral on bind behavior(ITS#6510)
......
......@@ -542,12 +542,12 @@ guess_service_principal(
} else if (allow_remote && dnsHostName) {
principal_fmt = "ldap/%s";
svc_principal_size = strlen(dnsHostName) + strlen(principal_fmt);
svc_principal_size = STRLENOF("ldap/") + strlen(dnsHostName) + 1;
str = dnsHostName;
} else {
principal_fmt = "ldap/%s";
svc_principal_size = strlen(host) + strlen(principal_fmt);
svc_principal_size = STRLENOF("ldap/") + strlen(host) + 1;
str = host;
}
......@@ -557,8 +557,8 @@ guess_service_principal(
return ld->ld_errno;
}
ret = snprintf( svc_principal, svc_principal_size - 1, principal_fmt, str);
if (ret < 0 || (size_t)ret + 1 >= svc_principal_size) {
ret = snprintf( svc_principal, svc_principal_size, principal_fmt, str );
if (ret < 0 || (size_t)ret >= svc_principal_size) {
ld->ld_errno = LDAP_LOCAL_ERROR;
return ld->ld_errno;
}
......@@ -567,7 +567,7 @@ guess_service_principal(
host, svc_principal, 0 );
input_name.value = svc_principal;
input_name.length = strlen( svc_principal );
input_name.length = (size_t)ret;
gss_rc = gss_import_name( &minor_status, &input_name, &nt_principal, principal );
ldap_memfree( svc_principal );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment