Rework test suite to use run script.

[openldap] / servers / slurpd / ldap_op.c

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 38882a1b42226351b564a2174a60d21276f683c3..a5308058dc5767d0b5a236a85e2cc34cf00c216c 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -331,6 +331,16 @@ op_ldap_modify(
            nvals = 0;
            nops++;
            break;
+       case T_MODOPINCREMENT:
+           state = T_MODOPINCREMENT;
+           ldmarr = ( LDAPMod ** )
+                   ch_realloc(ldmarr, (( nops + 2 ) * ( sizeof( LDAPMod * ))));
+           ldmarr[ nops ] = ldm = alloc_ldapmod();
+           ldm->mod_op = LDAP_MOD_INCREMENT | LDAP_MOD_BVALUES;
+           ldm->mod_type = value;
+           nvals = 0;
+           nops++;
+           break;
        default:
            if ( state == AWAITING_OP ) {
 #ifdef NEW_LOGGING
@@ -696,6 +706,9 @@ char *type )
     if ( !strcmp( type, T_MODOPDELETESTR )) {
        return( T_MODOPDELETE );
     }
+    if ( !strcmp( type, T_MODOPINCREMENTSTR )) {
+       return( T_MODOPINCREMENT );
+    }
     return( T_ERR );
 }
 
@@ -762,6 +775,7 @@ do_bind(
        return( BIND_ERR_BADRI );
     }
 
+retry:
     if ( ri->ri_ldp != NULL ) {
        ldrc = ldap_unbind( ri->ri_ldp );
        if ( ldrc != LDAP_SUCCESS ) {
@@ -776,7 +790,31 @@ do_bind(
        }
        ri->ri_ldp = NULL;
     }
+    
+       if ( ri->ri_uri != NULL ) { /* new URI style */
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, ARGS, 
+                       "do_bind: Initializing session to %s\n", 
+                   ri->ri_uri, 0, 0);
+#else
+           Debug( LDAP_DEBUG_ARGS, "Initializing session to %s\n",
+                   ri->ri_uri, 0, 0 );
+#endif
 
+               ldrc = ldap_initialize( &(ri->ri_ldp), ri->ri_uri);
+
+               if (ldrc != LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, ERR, 
+                       "do_bind: ldap_initalize (0, %s) failed: %s\n",
+                       ri->ri_uri, ldap_err2string(ldrc), 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "Error: ldap_initialize(0, %s) failed: %s\n",
+                       ri->ri_uri, ldap_err2string(ldrc), 0 );
+#endif
+               return( BIND_ERR_OPEN );                
+               }
+       } else { /* old HOST style */
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ARGS, 
                "do_bind: Initializing session to %s:%d\n", 
@@ -797,6 +835,7 @@ do_bind(
                        ri->ri_hostname, ri->ri_port, sys_errlist[ errno ] );
 #endif
                return( BIND_ERR_OPEN );
+    }
     }
 
        {       /* set version 3 */
@@ -847,8 +886,7 @@ do_bind(
        ldap_set_option(ri->ri_ldp, LDAP_OPT_RESTART, LDAP_OPT_ON);
 
        if( ri->ri_tls ) {
-               int err;
-               err = ldap_start_tls_s(ri->ri_ldp, NULL, NULL);
+               int err = ldap_start_tls_s(ri->ri_ldp, NULL, NULL);
 
                if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -864,15 +902,18 @@ do_bind(
 #endif
 
                        if( ri->ri_tls == TLS_CRITICAL ) {
+                               *lderr = err;
                                ldap_unbind( ri->ri_ldp );
                                ri->ri_ldp = NULL;
                                return BIND_ERR_TLS_FAILED;
                        }
+                       ri->ri_tls = TLS_OFF;
+                       goto retry;
                }
        }
 
     switch ( ri->ri_bind_method ) {
-    case AUTH_SIMPLE:
+    case LDAP_AUTH_SIMPLE:
        /*
         * Bind with a plaintext password.
         */
@@ -903,7 +944,7 @@ do_bind(
        }
        break;
 
-       case AUTH_SASL:
+       case LDAP_AUTH_SASL:
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ARGS, 
                "do_bind: bind to %s as %s via %s (SASL)\n", 
@@ -919,9 +960,8 @@ do_bind(
 
 #ifdef HAVE_CYRUS_SASL
        if( ri->ri_secprops != NULL ) {
-               int err;
-               err = ldap_set_option(ri->ri_ldp, LDAP_OPT_X_SASL_SECPROPS,
-                       ri->ri_secprops);
+               int err = ldap_set_option(ri->ri_ldp,
+                       LDAP_OPT_X_SASL_SECPROPS, ri->ri_secprops);
 
                if( err != LDAP_OPT_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -940,13 +980,14 @@ do_bind(
        }
 
        {
-               char *passwd = ri->ri_password ? ber_strdup( ri->ri_password ) : NULL;
                void *defaults = lutil_sasl_defaults( ri->ri_ldp, ri->ri_saslmech,
-                   ri->ri_realm, ri->ri_authcId, passwd, ri->ri_authzId );
+                   ri->ri_realm, ri->ri_authcId, ri->ri_password, ri->ri_authzId );
 
                ldrc = ldap_sasl_interactive_bind_s( ri->ri_ldp, ri->ri_bind_dn,
                    ri->ri_saslmech, NULL, NULL,
                    LDAP_SASL_QUIET, lutil_sasl_interact, defaults );
+
+               lutil_sasl_freedefs( defaults );
                if ( ldrc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG ( OPERATION, ERR, "do_bind: "
@@ -961,9 +1002,6 @@ do_bind(
                        ri->ri_ldp = NULL;
                        return( BIND_ERR_SASL_FAILED );
                }
-
-               ber_memfree( passwd );
-               ber_memfree( defaults );
        }
        break;
 #else