diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index bcd9d1bf3552463609486acc8f66c4ab174fcaf9..d6b3e99c0143e4e54740820bb042ce01c4cac243 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -131,8 +131,8 @@ main(int argc, char **argv) if ((newSuperior != NULL) && (version != LDAP_VERSION3)) { - fprintf( stderr,\ - "%s: version conflict!, -s newSuperior requires LDAP v3\n",\ + fprintf( stderr, + "%s: version conflict!, -s newSuperior requires LDAP v3\n", myname); fprintf( stderr, usage, argv[0] ); exit( 1 ); diff --git a/servers/slapd/back-bdb2/modrdn.c b/servers/slapd/back-bdb2/modrdn.c index d3168c1f424408496535324b8cad6b3ea357d12f..e969818c9c66d8275290247e26cbd5df2bb73379 100644 --- a/servers/slapd/back-bdb2/modrdn.c +++ b/servers/slapd/back-bdb2/modrdn.c @@ -57,8 +57,8 @@ bdb2i_back_modrdn_internal( char *np_ndn = NULL; /* newSuperior ndn */ char *new_parent_dn = NULL; /* np_dn, p_dn, or NULL */ - Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n",\ - (newSuperior ? newSuperior : "NULL"),\ + Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n", + (newSuperior ? newSuperior : "NULL"), 0, 0 ); /* get entry with writer lock */ @@ -247,8 +247,8 @@ bdb2i_back_modrdn_internal( } - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: new_rdn_val=%s, new_rdn_type=%s\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: new_rdn_val=%s, new_rdn_type=%s\n", new_rdn_val, new_rdn_type, 0 ); /* Retrieve the old rdn from the entry's dn */ @@ -276,8 +276,8 @@ bdb2i_back_modrdn_internal( if ( strcasecmp( old_rdn_type, new_rdn_type ) != 0 ) { /* Not a big deal but we may say something */ - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n", old_rdn_type, new_rdn_type, 0 ); } @@ -341,8 +341,8 @@ bdb2i_back_modrdn_internal( } - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: removed old_rdn_val=%s\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: removed old_rdn_val=%s\n", old_rdn_val, 0, 0 ); }/* if (deleteoldrdn) */ @@ -368,7 +368,7 @@ bdb2i_back_modrdn_internal( Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DNS DN\n", 0, 0, 0 ); /* XXXV3: not sure of what to do here */ - Debug( LDAP_DEBUG_TRACE,\ + Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: not fully implemented...\n", 0, 0, 0 ); diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c index 381d2b3f1cac6c3c594d2973d2e25875b6359fee..4465ebd9a25ab992d7ae5b4be53c71579cb87616 100644 --- a/servers/slapd/back-ldbm/modrdn.c +++ b/servers/slapd/back-ldbm/modrdn.c @@ -60,8 +60,8 @@ ldbm_back_modrdn( char *np_ndn = NULL; /* newSuperior ndn */ char *new_parent_dn = NULL; /* np_dn, p_dn, or NULL */ - Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n",\ - (newSuperior ? newSuperior : "NULL"),\ + Debug( LDAP_DEBUG_TRACE, "==>ldbm_back_modrdn(newSuperior=%s)\n", + (newSuperior ? newSuperior : "NULL"), 0, 0 ); /* get entry with writer lock */ @@ -265,8 +265,8 @@ ldbm_back_modrdn( } - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: new_rdn_val=%s, new_rdn_type=%s\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: new_rdn_val=%s, new_rdn_type=%s\n", new_rdn_val, new_rdn_type, 0 ); /* Retrieve the old rdn from the entry's dn */ @@ -294,8 +294,8 @@ ldbm_back_modrdn( if ( strcasecmp( old_rdn_type, new_rdn_type ) != 0 ) { /* Not a big deal but we may say something */ - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: old_rdn_type=%s, new_rdn_type=%s!\n", old_rdn_type, new_rdn_type, 0 ); } @@ -359,8 +359,8 @@ ldbm_back_modrdn( } - Debug( LDAP_DEBUG_TRACE,\ - "ldbm_back_modrdn: removed old_rdn_val=%s\n",\ + Debug( LDAP_DEBUG_TRACE, + "ldbm_back_modrdn: removed old_rdn_val=%s\n", old_rdn_val, 0, 0 ); }/* if (deleteoldrdn) */ @@ -386,7 +386,7 @@ ldbm_back_modrdn( Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DNS DN\n", 0, 0, 0 ); /* XXXV3: not sure of what to do here */ - Debug( LDAP_DEBUG_TRACE,\ + Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: not fully implemented...\n", 0, 0, 0 );