X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsasl.c;h=4514f3ceff67ebd6e20745e74fe8fb9c4b565d9a;hb=7c41666c5e92beb301c10b9a71f45834255dcc21;hp=11abe8627963b3a998719f57a382b4fc18e286e0;hpb=b47d0d6b6a9594d32ae542ea9bdd8bcc3ed609dc;p=openldap

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 11abe86279..4514f3ceff 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -610,13 +610,13 @@ slap_sasl_canonicalize(
 	LDAP_LOG( TRANSPORT, ENTRY, 
 		"slap_sasl_canonicalize: conn %d %s=\"%s\"\n",
 		conn ? conn->c_connid : -1,
-		(flags & SASL_CU_AUTHID) ? "authcid" : "authzid", in ? in : "<empty>");
+		(flags & SASL_CU_AUTHID) ? "authcid" : "authzid",
+		in ? in : "<empty>");
 #else
-	Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: "
-		"%s=\"%s\"\n",
-			conn ? conn->c_connid : -1,
-			(flags & SASL_CU_AUTHID) ? "authcid" : "authzid",
-			in ? in : "<empty>" );
+	Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: %s=\"%s\"\n",
+		conn ? conn->c_connid : -1,
+		(flags & SASL_CU_AUTHID) ? "authcid" : "authzid",
+		in ? in : "<empty>");
 #endif
 
 	/* If name is too big, just truncate. We don't care, we're
@@ -685,14 +685,16 @@ slap_sasl_canonicalize(
 #ifdef NEW_LOGGING
 	LDAP_LOG( TRANSPORT, ENTRY, 
 		"slap_sasl_canonicalize: conn %d %s=\"%s\"\n",
-		conn ? conn->c_connid : -1, names[0]+1, dn.bv_val );
+		conn ? conn->c_connid : -1, names[0]+1,
+		dn.bv_val ? dn.bv_val : "<EMPTY>" );
 #else
-	Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: "
-		"%s=\"%s\"\n",
-			conn ? conn->c_connid : -1,
-			names[0]+1, dn.bv_val );
+	Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: %s=\"%s\"\n",
+		conn ? conn->c_connid : -1, names[0]+1,
+		dn.bv_val ? dn.bv_val : "<EMPTY>" );
 #endif
-done:	AC_MEMCPY( out, in, inlen );
+
+done:
+	AC_MEMCPY( out, in, inlen );
 	out[inlen] = '\0';
 
 	*out_len = inlen;
@@ -767,8 +769,8 @@ slap_sasl_authorize(
 ok:
 	if (conn->c_sasl_bindop) {
 		Statslog( LDAP_DEBUG_STATS,
-	    		"conn=%lu op=%lu BIND authcid=\"%s\"\n",
-	    		conn->c_connid, conn->c_sasl_bindop->o_opid, 
+			"conn=%lu op=%lu BIND authcid=\"%s\"\n",
+			conn->c_connid, conn->c_sasl_bindop->o_opid, 
 			auth_identity, 0, 0);
 	}
 
@@ -890,14 +892,12 @@ ok:
 		(long) (conn ? conn->c_connid : -1), 0, 0 );
 #endif
 
-#if 0
 	if (conn->c_sasl_bindop) {
 		Statslog( LDAP_DEBUG_STATS,
-	    		"conn=%lu op=%lu BIND authcid=\"%s\"\n",
-	    		conn->c_connid, conn->c_sasl_bindop->o_opid, 
-			auth_identity, 0, 0);
+			"conn=%lu op=%lu BIND authcid=\"%s\"\n",
+			conn->c_connid, conn->c_sasl_bindop->o_opid, 
+			authcid, 0, 0);
 	}
-#endif
 
 	*errstr = NULL;
 	return SASL_OK;