[Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.12, 1.13

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/ldapserver/ldap/servers/slapd

Modified Files:
	saslbind.c 
Log Message:
Bug(s) fixed: 172672
Bug Description: sasl code needs to accomodate older versions of sasl
Reviewed by: Noriko (Thanks!)
Fix Description: 1) Change build to use -L/usr/kerberos/lib on RHEL3 
since that's where gssapi_krb5 is on that platform 2) ifdef out the use 
of SASL_AUX_PASSWORD_PROP - if it's not defined, we don't need to use it.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no



Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- saslbind.c	4 Nov 2005 19:02:57 -0000	1.12
+++ saslbind.c	8 Nov 2005 15:58:22 -0000	1.13
@@ -498,11 +498,14 @@
 
     clear = pw;
     if (clear) {
+/* older versions of sasl do not have SASL_AUX_PASSWORD_PROP, so omit it */
+#ifdef SASL_AUX_PASSWORD_PROP
         if (prop_set(propctx, SASL_AUX_PASSWORD_PROP, clear, -1) != 0) {
             /* Failure is benign here because some mechanisms don't support this property */
             /*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);
             goto fail */ ;
         }
+#endif /* SASL_AUX_PASSWORD_PROP */
         if (prop_set(propctx, SASL_AUX_PASSWORD, clear, -1) != 0) {
             /* Failure is benign here because some mechanisms don't support this property */
             /*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);