fix small issues with dynacl and ACI in general

[openldap] / servers / slurpd / ldap_op.c

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 7312056a661cdf8c50dbda56a606870b8bd56224..b33a74a49a7dce79310d88a7ab29a08e4d14a8c4 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * Portions Copyright 2003 Mark Benson.
  * All rights reserved.
  *
@@ -103,9 +103,9 @@ do_ldap(
                        lderr = op_ldap_add( ri, re, errmsg, errfree );
                        if ( lderr != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "Error: ldap_add_s failed adding \"%s\": %s\n",
-                                       *errmsg ? *errmsg : ldap_err2string( lderr ),
-                                       re->re_dn, 0 );
+                                       "Error: ldap_add_s failed adding DN \"%s\": %s\n",
+                                       re->re_dn, *errmsg && (*errmsg)[0] ?
+                                       *errmsg : ldap_err2string( lderr ), 0 );
                        }
                        break;
 
@@ -113,9 +113,9 @@ do_ldap(
                        lderr = op_ldap_modify( ri, re, errmsg, errfree );
                        if ( lderr != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "Error: ldap_modify_s failed modifying \"%s\": %s\n",
-                                       *errmsg ? *errmsg : ldap_err2string( lderr ),
-                                       re->re_dn, 0 );
+                                       "Error: ldap_modify_s failed modifying DN \"%s\": %s\n",
+                                       re->re_dn, *errmsg && (*errmsg)[0] ?
+                                       *errmsg : ldap_err2string( lderr ), 0 );
                        }
                        break;
 
@@ -123,9 +123,9 @@ do_ldap(
                        lderr = op_ldap_delete( ri, re, errmsg, errfree );
                        if ( lderr != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "Error: ldap_delete_s failed deleting \"%s\": %s\n",
-                                       *errmsg ? *errmsg : ldap_err2string( lderr ),
-                                       re->re_dn, 0 );
+                                       "Error: ldap_delete_s failed deleting DN \"%s\": %s\n",
+                                       re->re_dn, *errmsg && (*errmsg)[0] ?
+                                       *errmsg : ldap_err2string( lderr ), 0 );
                        }
                        break;
 
@@ -133,15 +133,15 @@ do_ldap(
                        lderr = op_ldap_modrdn( ri, re, errmsg, errfree );
                        if ( lderr != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
-                                       "Error: ldap_modrdn_s failed modifying %s: %s\n",
-                                       *errmsg ? *errmsg : ldap_err2string( lderr ),
-                                       re->re_dn, 0 );
+                                       "Error: ldap_modrdn_s failed modifying DN \"%s\": %s\n",
+                                       re->re_dn, *errmsg && (*errmsg)[0] ?
+                                       *errmsg : ldap_err2string( lderr ), 0 );
                        }
                        break;
 
                default:
                        Debug( LDAP_DEBUG_ANY,
-                               "Error: do_ldap: bad op \"%d\", dn = \"%s\"\n",
+                               "Error: do_ldap: bad op \"%d\", DN \"%s\"\n",
                                re->re_changetype, re->re_dn, 0 );
                        return DO_LDAP_ERR_FATAL;
                }
@@ -321,7 +321,7 @@ op_ldap_modify(
                continue;
            }
 
-           assert( ldm );
+           assert( ldm != NULL );
 
            /*
             * We should have an attribute: value pair here.
@@ -505,7 +505,7 @@ op_ldap_modrdn(
     }
 #endif /* LDAP_DEBUG */
 
-    assert( newrdn );
+    assert( newrdn != NULL );
 
     /* Do the modrdn */
     rc = ldap_rename2_s( ri->ri_ldp, re->re_dn, newrdn, newsup, drdnflag );
@@ -711,7 +711,7 @@ retry:
     }
 
        {       /* set version 3 */
-               int err, version = 3;
+               int err, version = LDAP_VERSION3;
                err = ldap_set_option(ri->ri_ldp,
                        LDAP_OPT_PROTOCOL_VERSION, &version);