Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31545/ldapserver/ldap/servers/slapd
Modified Files:
util.c
Log Message:
Resolves: bug 476891
Bug Description: Replication: Server to Server Connection Error: SASL(-1): generic
failure: All-whitespace username.
Reviewed by: nkinder (Thanks!)
Fix Description: My earlier fix for this bug broke GSSAPI - it would cause the username
and authid to only be freed under certain conditions e.g. if the krb creds were still
valid, the code would not free the username and authid, so they would be passed via SASL
instead of the principal name. This fix just makes sure username and authid are always
freed, under all circumstances.
Platforms tested: RHEL5, Fedora 9
Flag Day: no
Doc impact: no
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- util.c 17 Dec 2008 20:47:36 -0000 1.22
+++ util.c 19 Dec 2008 19:26:01 -0000 1.23
@@ -1946,11 +1946,11 @@
cc_env_name);
}
+cleanup:
/* use NULL as username and authid */
slapi_ch_free_string(&vals->username);
slapi_ch_free_string(&vals->authid);
-cleanup:
krb5_free_unparsed_name(ctx, princ_name);
if (kt) { /* NULL not allowed */
krb5_kt_close(ctx, kt);