upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ldap_rename parameter order (ITS#387)

Browse source
This commit is contained in:
Kurt Zeilenga 1999-12-04 17:19:11 +00:00
parent 6ec31e98ac
commit 5d5588836f
4 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/tools/ldapmodrdn.c
View file

@ -38,12 +38,12 @@ static int ldapport = 0;
static int not, verbose, contoper; static int not, verbose, contoper;
static LDAP *ld; static LDAP *ld;
static int domodrdn LDAP_P(( static int domodrdn(
LDAP *ld, LDAP *ld,
char *dn, char *dn,
char *rdn, char *rdn,
int remove, /* flag: remove old RDN */ char *newSuperior,
char *newSuperior)); int remove ); /* flag: remove old RDN */
int int
main(int argc, char **argv) main(int argc, char **argv)
@ -252,7 +252,7 @@ main(int argc, char **argv)
rc = 0; rc = 0;
if (havedn) if (havedn)
rc = domodrdn(ld, entrydn, rdn, remove, newSuperior); rc = domodrdn( ld, entrydn, rdn, newSuperior, remove );
else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) { else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
if ( *buf != '\0' ) { /* blank lines optional, skip */ if ( *buf != '\0' ) { /* blank lines optional, skip */
buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */ buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */
@ -262,7 +262,7 @@ main(int argc, char **argv)
perror( "strdup" ); perror( "strdup" );
return( EXIT_FAILURE ); return( EXIT_FAILURE );
} }
rc = domodrdn(ld, entrydn, rdn, remove, newSuperior); rc = domodrdn(ld, entrydn, rdn, newSuperior, remove );
havedn = 0; havedn = 0;
} else if ( !havedn ) { /* don't have DN yet */ } else if ( !havedn ) { /* don't have DN yet */
if (( entrydn = strdup( buf )) == NULL ) { if (( entrydn = strdup( buf )) == NULL ) {
@ -284,8 +284,8 @@ static int domodrdn(
LDAP *ld, LDAP *ld,
char *dn, char *dn,
char *rdn, char *rdn,
int remove, /* flag: remove old RDN */ char *newSuperior,
char *newSuperior) int remove ) /* flag: remove old RDN */
{ {
int i; int i;
@ -299,7 +299,7 @@ static int domodrdn(
} }
if ( !not ) { if ( !not ) {
i = ldap_rename2_s( ld, dn, rdn, remove, newSuperior ); i = ldap_rename2_s( ld, dn, rdn, newSuperior, remove );
if ( i != LDAP_SUCCESS ) { if ( i != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_rename2_s" ); ldap_perror( ld, "ldap_rename2_s" );
} else if ( verbose ) { } else if ( verbose ) {

12
include/ldap.h
View file

@ -884,8 +884,8 @@ ldap_rename LDAP_P((
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn,
LDAP_CONST char *newSuperior, LDAP_CONST char *newSuperior,
int deleteoldrdn,
LDAPControl **sctrls, LDAPControl **sctrls,
LDAPControl **cctrls, LDAPControl **cctrls,
int *msgidp )); int *msgidp ));
@ -895,8 +895,8 @@ ldap_rename_s LDAP_P((
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn,
LDAP_CONST char *newSuperior, LDAP_CONST char *newSuperior,
int deleteoldrdn,
LDAPControl **sctrls, LDAPControl **sctrls,
LDAPControl **cctrls )); LDAPControl **cctrls ));
@ -926,16 +926,16 @@ ldap_rename2 LDAP_P((
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn, LDAP_CONST char *newSuperior,
LDAP_CONST char *newSuperior )); int deleteoldrdn ));
LIBLDAP_F( int ) LIBLDAP_F( int )
ldap_rename2_s LDAP_P(( ldap_rename2_s LDAP_P((
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn, LDAP_CONST char *newSuperior,
LDAP_CONST char *newSuperior)); int deleteoldrdn ));
LIBLDAP_F( int ) LIBLDAP_F( int )
ldap_modrdn LDAP_P(( ldap_modrdn LDAP_P((

31
libraries/libldap/modrdn.c
View file

@ -59,8 +59,8 @@ ldap_rename(
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn,
LDAP_CONST char *newSuperior, LDAP_CONST char *newSuperior,
int deleteoldrdn,
LDAPControl **sctrls, LDAPControl **sctrls,
LDAPControl **cctrls, LDAPControl **cctrls,
int *msgidp ) int *msgidp )
@ -141,16 +141,16 @@ ldap_rename2(
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn, LDAP_CONST char *newSuperior,
LDAP_CONST char *newSuperior ) int deleteoldrdn )
{ {
int msgid; int msgid;
int rc; int rc;
Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
rc = ldap_rename( ld, dn, newrdn, deleteoldrdn, newSuperior, rc = ldap_rename( ld, dn, newrdn, newSuperior,
NULL, NULL, &msgid ); deleteoldrdn, NULL, NULL, &msgid );
return rc == LDAP_SUCCESS ? msgid : -1; return rc == LDAP_SUCCESS ? msgid : -1;
} }
@ -173,13 +173,13 @@ ldap_modrdn2( LDAP *ld,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn ) int deleteoldrdn )
{ {
return ldap_rename2( ld, dn, newrdn, deleteoldrdn, NULL ); return ldap_rename2( ld, dn, newrdn, NULL, deleteoldrdn );
} }
int int
ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn ) ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
{ {
return( ldap_rename2( ld, dn, newrdn, 1, NULL ) ); return( ldap_rename2( ld, dn, newrdn, NULL, 1 ) );
} }
@ -188,8 +188,8 @@ ldap_rename_s(
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn,
LDAP_CONST char *newSuperior, LDAP_CONST char *newSuperior,
int deleteoldrdn,
LDAPControl **sctrls, LDAPControl **sctrls,
LDAPControl **cctrls ) LDAPControl **cctrls )
{ {
@ -197,8 +197,8 @@ ldap_rename_s(
int msgid; int msgid;
LDAPMessage *res; LDAPMessage *res;
rc = ldap_rename( ld, dn, newrdn, deleteoldrdn, rc = ldap_rename( ld, dn, newrdn, newSuperior,
newSuperior, sctrls, cctrls, &msgid ); deleteoldrdn, sctrls, cctrls, &msgid );
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
return rc; return rc;
@ -218,21 +218,22 @@ ldap_rename2_s(
LDAP *ld, LDAP *ld,
LDAP_CONST char *dn, LDAP_CONST char *dn,
LDAP_CONST char *newrdn, LDAP_CONST char *newrdn,
int deleteoldrdn, LDAP_CONST char *newSuperior,
LDAP_CONST char *newSuperior ) int deleteoldrdn )
{ {
return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, newSuperior, NULL, NULL ); return ldap_rename_s( ld, dn, newrdn, newSuperior,
deleteoldrdn, NULL, NULL );
} }
int int
ldap_modrdn2_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn ) ldap_modrdn2_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )
{ {
return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, NULL, NULL, NULL ); return ldap_rename_s( ld, dn, newrdn, NULL, deleteoldrdn, NULL, NULL );
} }
int int
ldap_modrdn_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn ) ldap_modrdn_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
{ {
return ldap_rename_s( ld, dn, newrdn, 1, NULL, NULL, NULL ); return ldap_rename_s( ld, dn, newrdn, NULL, 1, NULL, NULL );
} }

2
servers/slurpd/ldap_op.c
View file

@ -471,7 +471,7 @@ op_ldap_modrdn(
#endif /* LDAP_DEBUG */ #endif /* LDAP_DEBUG */
/* Do the modrdn */ /* Do the modrdn */
rc = ldap_rename2_s( ri->ri_ldp, re->re_dn, mi->mi_val, drdnflag, newsup ); rc = ldap_rename2_s( ri->ri_ldp, re->re_dn, mi->mi_val, newsup, drdnflag );
ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &lderr); ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &lderr);
return( lderr ); return( lderr );