Fix access_allowed() error checking bug

[openldap] / servers / slapd / back-dnssrv / bind.c

diff --git a/servers/slapd/back-dnssrv/bind.c b/servers/slapd/back-dnssrv/bind.c
index e69094b6c732df47851670d28aeea9a58d9f338d..adb59251481b4f9f6620fe23adefbc9ae6389144 100644 (file)
--- a/servers/slapd/back-dnssrv/bind.c
+++ b/servers/slapd/back-dnssrv/bind.c
@@ -1,7 +1,7 @@
 /* bind.c - DNS SRV backend bind function */
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,35 +14,32 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "back-dnssrv.h"
+#include "external.h"
 
 int
 dnssrv_back_bind(
     Backend            *be,
     Connection         *conn,
     Operation          *op,
-    char               *dn,
-    char               *ndn,
+    struct berval      *dn,
+    struct berval      *ndn,
     int                        method,
-       char            *mech,
     struct berval      *cred,
-       char            **edn
-)
+    struct berval      *edn )
 {
-       Debug( LDAP_DEBUG_TRACE, "DNSSRV: bind %s (%d/%s)\n",
-               dn == NULL ? "" : dn, 
-               method,
-               mech == NULL ? "none" : mech );
+       Debug( LDAP_DEBUG_TRACE, "DNSSRV: bind %s (%d)\n",
+               dn->bv_val == NULL ? "" : dn->bv_val, 
+               method, NULL );
                
        if( method == LDAP_AUTH_SIMPLE && cred != NULL && cred->bv_len ) {
                Statslog( LDAP_DEBUG_STATS,
-                       "conn=%ld op=%d DNSSRV BIND dn=\"%s\" provided passwd\n",
+                       "conn=%lu op=%lu DNSSRV BIND dn=\"%s\" provided passwd\n",
                         op->o_connid, op->o_opid,
-                       dn == NULL ? "" : dn , 0, 0 );
+                       dn->bv_val == NULL ? "" : dn->bv_val , 0, 0 );
 
                Debug( LDAP_DEBUG_TRACE,
                        "DNSSRV: BIND dn=\"%s\" provided cleartext password\n",
-                       dn == NULL ? "" : dn, 0, 0 );
+                       dn->bv_val == NULL ? "" : dn->bv_val, 0, 0 );
 
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
                        NULL, "you shouldn\'t send strangers your password",
@@ -50,7 +47,7 @@ dnssrv_back_bind(
 
        } else {
                Debug( LDAP_DEBUG_TRACE, "DNSSRV: BIND dn=\"%s\"\n",
-                       dn == NULL ? "" : dn, 0, 0 );
+                       dn->bv_val == NULL ? "" : dn->bv_val, 0, 0 );
 
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
                        NULL, "anonymous bind expected",