Re: small fixes for SASL/ANONYMOUS (ITS#2268)

[Kurt@OpenLDAP.org]

A (derived) fix has been applied to HEAD. Please test.  Thanks, Kurt

At 06:12 PM 1/14/2003, kuenne@rentec.com wrote:
>Full_Name: Karsten Kuenne
>Version: 2.1.12
>OS: Solaris 8
>URL: ftp://ftp.openldap.org/incoming/
>Submission from: (NULL) (65.213.85.53)
>
>
>Not that anybody cares probably but it bothered me that slapd bombed when I
>tried SASL/ANONYMOUS. The following small changes fix that:
>
>--- ./servers/slapd/sasl.c.orig Tue Jan 14 18:45:23 2003
>+++ ./servers/slapd/sasl.c      Tue Jan 14 20:39:06 2003
>@@ -867,12 +867,12 @@
> #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 :
>"<NULL>" );
> #else
>        Debug( LDAP_DEBUG_ARGS, "SASL Canonicalize [conn=%ld]: "
>                "%s=\"%s\"\n",
>                        conn ? conn->c_connid : -1,
>-                       names[0]+1, dn.bv_val );
>+                       names[0]+1, dn.bv_val ? dn.bv_val : "<NULL>" );
> #endif
> done:  AC_MEMCPY( out, in, inlen );
>        out[inlen] = '\0';
>
>--- ./servers/slapd/bind.c.orig Tue Jan 14 18:52:27 2003
>+++ ./servers/slapd/bind.c      Tue Jan 14 18:55:25 2003
>@@ -327,7 +327,7 @@
>                        Statslog( LDAP_DEBUG_STATS,
>                                "conn=%lu op=%lu AUTHZ dn=\"%s\" mech=%s
>ssf=%d\n",
>                                op->o_connid, op->o_opid,
>-                               conn->c_dn.bv_val, conn->c_authmech.bv_val, ssf
>);
>+                               conn->c_dn.bv_val?conn->c_dn.bv_val:"<NULL>",
>conn->c_authmech.bv_val, ssf );
>
> #ifdef NEW_LOGGING
>                        LDAP_LOG( OPERATION, DETAIL1,
>@@ -336,7 +336,7 @@
> #else
>                        Debug( LDAP_DEBUG_TRACE,
>                                "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
>-                               conn->c_authmech.bv_val, conn->c_dn.bv_val, ssf
>);
>+                               conn->c_authmech.bv_val,
>conn->c_dn.bv_val?conn->c_dn.bv_val:"<NULL>", ssf );
> #endif
>
>                } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {