Update PF_INET6 and PF_UNIX detection, both default to auto

[openldap] / libraries / libldap / modrdn.c

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index f9b435aa05b2fdd805c47a969801423bc88394e8..29108a3f38d12ae98343a644aec956d95fe09f53 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -58,8 +59,8 @@ ldap_rename(
        LDAP *ld,
        LDAP_CONST char *dn,
        LDAP_CONST char *newrdn,
-       int deleteoldrdn,
        LDAP_CONST char *newSuperior,
+       int deleteoldrdn,
        LDAPControl **sctrls,
        LDAPControl **cctrls,
        int *msgidp )
@@ -70,31 +71,27 @@ ldap_rename(
        Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( LDAP_NO_MEMORY );
        }
 
        if( newSuperior != NULL ) {
                /* must be version 3 (or greater) */
-               if ( ld->ld_version == 0 ) {
-                       ld->ld_version = LDAP_VERSION3;
-               }
-
                if ( ld->ld_version < LDAP_VERSION3 ) {
                        ld->ld_errno = LDAP_NOT_SUPPORTED;
                        ber_free( ber, 1 );
                        return( ld->ld_errno );
                }
 
-               rc = ber_printf( ber, "{it{ssbts}", /* leave '}' for later */ 
+               rc = ber_printf( ber, "{it{ssbts}", /* '}' */ 
                        ++ld->ld_msgid, LDAP_REQ_MODDN,
-                       dn, newrdn, deleteoldrdn,
+                       dn, newrdn, (ber_int_t) deleteoldrdn,
                        LDAP_TAG_NEWSUPERIOR, newSuperior );
 
        } else {
-               rc = ber_printf( ber, "{it{ssb}", /* leave '}' for later */ 
+               rc = ber_printf( ber, "{it{ssb}", /* '}' */ 
                        ++ld->ld_msgid, LDAP_REQ_MODDN,
-                       dn, newrdn, deleteoldrdn );
+                       dn, newrdn, (ber_int_t) deleteoldrdn );
        }
 
        if ( rc < 0 ) {
@@ -109,8 +106,7 @@ ldap_rename(
                return ld->ld_errno;
        }
 
-       /* close the '{' */
-       rc = ber_printf( ber, "}" );
+       rc = ber_printf( ber, /*{*/ "}" );
        if ( rc < 0 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
@@ -145,16 +141,16 @@ ldap_rename2(
        LDAP *ld,
        LDAP_CONST char *dn,
        LDAP_CONST char *newrdn,
-       int deleteoldrdn,
-       LDAP_CONST char *newSuperior )
+       LDAP_CONST char *newSuperior,
+       int deleteoldrdn )
 {
        int msgid;
        int rc;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
 
-       rc = ldap_rename( ld, dn, newrdn, deleteoldrdn, newSuperior,
-               NULL, NULL, &msgid );
+       rc = ldap_rename( ld, dn, newrdn, newSuperior,
+               deleteoldrdn, NULL, NULL, &msgid );
 
        return rc == LDAP_SUCCESS ? msgid : -1;
 }
@@ -177,13 +173,13 @@ ldap_modrdn2( LDAP *ld,
        LDAP_CONST char *newrdn,
        int deleteoldrdn )
 {
-       return ldap_rename2( ld, dn, newrdn, deleteoldrdn, NULL );
+       return ldap_rename2( ld, dn, newrdn, NULL, deleteoldrdn );
 }
 
 int
 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 ) );
 }
 
 
@@ -192,8 +188,8 @@ ldap_rename_s(
        LDAP *ld,
        LDAP_CONST char *dn,
        LDAP_CONST char *newrdn,
-       int deleteoldrdn,
        LDAP_CONST char *newSuperior,
+       int deleteoldrdn,
        LDAPControl **sctrls,
        LDAPControl **cctrls )
 {
@@ -201,8 +197,8 @@ ldap_rename_s(
        int msgid;
        LDAPMessage *res;
 
-       rc = ldap_rename( ld, dn, newrdn, deleteoldrdn,
-               newSuperior, sctrls, cctrls, &msgid );
+       rc = ldap_rename( ld, dn, newrdn, newSuperior,
+               deleteoldrdn, sctrls, cctrls, &msgid );
 
        if( rc != LDAP_SUCCESS ) {
                return rc;
@@ -222,21 +218,22 @@ ldap_rename2_s(
        LDAP *ld,
        LDAP_CONST char *dn,
        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
 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
 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 );
 }