X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcontrols.c;h=88bfc9427986f2983d96c61f2390dbba7fc04dad;hb=17f95a3fd30247a0735a3526d85b46178304748d;hp=c2a7ce13dd10e7550b8eb81cb7bc8ee08804a0e1;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index c2a7ce13dd..88bfc94279 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -97,7 +97,7 @@ static struct slap_control { SLAP_CTRL_SEARCH, NULL, parseClientUpdate }, #endif /* LDAP_CLIENT_UPDATE */ - { NULL } + { NULL, 0, NULL, 0 } }; char * @@ -477,13 +477,13 @@ static int parseProxyAuthz ( #ifdef NEW_LOGGING LDAP_LOG( OPERATION, ARGS, - "parseProxyAuthz: conn %d authzid=\"%s\"\n", + "parseProxyAuthz: conn %lu authzid=\"%s\"\n", conn->c_connid, ctrl->ldctl_value.bv_len ? ctrl->ldctl_value.bv_val : "anonymous", 0 ); #else Debug( LDAP_DEBUG_ARGS, - "parseProxyAuthz: conn %d authzid=\"%s\"\n", + "parseProxyAuthz: conn %lu authzid=\"%s\"\n", conn->c_connid, ctrl->ldctl_value.bv_len ? ctrl->ldctl_value.bv_val : "anonymous", 0 ); @@ -492,11 +492,11 @@ static int parseProxyAuthz ( if( ctrl->ldctl_value.bv_len == 0 ) { #ifdef NEW_LOGGING LDAP_LOG( OPERATION, RESULTS, - "parseProxyAuthz: conn=%d anonymous\n", + "parseProxyAuthz: conn=%lu anonymous\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, - "parseProxyAuthz: conn=%d anonymous\n", + "parseProxyAuthz: conn=%lu anonymous\n", conn->c_connid, 0, 0 ); #endif @@ -523,12 +523,12 @@ static int parseProxyAuthz ( #ifdef NEW_LOGGING LDAP_LOG( OPERATION, RESULTS, - "parseProxyAuthz: conn=%d \"%s\"\n", + "parseProxyAuthz: conn=%lu \"%s\"\n", conn->c_connid, dn.bv_len ? dn.bv_val : "(NULL)", 0 ); #else Debug( LDAP_DEBUG_TRACE, - "parseProxyAuthz: conn=%d \"%s\"\n", + "parseProxyAuthz: conn=%lu \"%s\"\n", conn->c_connid, dn.bv_len ? dn.bv_val : "(NULL)", 0 ); #endif