fix error messages

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index c5d33d9a68eda947415d37e94168e10e687b2128..37e67d673e5a66e81fb3bf40b2b378cf3ca91ad3 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -109,9 +109,9 @@ do_ldap(
                                        re->re_dn, 0 );
 #else
                                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 (%d)\n",
+                                       re->re_dn,
+                                       *errmsg ? *errmsg : ldap_err2string( lderr ), lderr );
 #endif
                        }
                        break;
@@ -126,9 +126,9 @@ do_ldap(
                                        re->re_dn, 0 );
 #else
                                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 (%d)\n",
+                                       re->re_dn,
+                                       *errmsg ? *errmsg : ldap_err2string( lderr ), lderr );
 #endif
                        }
                        break;
@@ -143,9 +143,9 @@ do_ldap(
                                        re->re_dn, 0 );
 #else
                                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 (%d)\n",
+                                       re->re_dn,
+                                       *errmsg ? *errmsg : ldap_err2string( lderr ), lderr );
 #endif
                        }
                        break;
@@ -160,9 +160,9 @@ do_ldap(
                                        re->re_dn, 0 );
 #else
                                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 (%d)\n",
+                                       re->re_dn,
+                                       *errmsg ? *errmsg : ldap_err2string( lderr ), lderr );
 #endif
                        }
                        break;
@@ -174,7 +174,7 @@ do_ldap(
                                re->re_changetype, re->re_dn, 0 );
 #else
                        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 );
 #endif
                        return DO_LDAP_ERR_FATAL;
@@ -253,8 +253,8 @@ op_ldap_add(
 #endif
        rc = ldap_add_s( ri->ri_ldp, re->re_dn, ldmarr );
 
-       ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &lderr);
-       ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_STRING, errmsg);
+       ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &lderr );
+       ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_STRING, errmsg );
        *errfree = 1;
 
     } else {