cleanup

[openldap] / servers / slapd / back-ldap / config.c

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 8efa614bea99b5b6c42095eefd4348018883c236..215555372c24f6edbda7989e3b562ef5313fc2f3 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2006 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -83,7 +83,7 @@ static ConfigTable ldapcfg[] = {
                        "SYNTAX OMsDirectoryString "
                        "SINGLE-VALUE )",
                NULL, NULL },
-       { "tls", "what", 2, 2, 0,
+       { "tls", "what", 2, 0, 0,
                ARG_MAGIC|LDAP_BACK_CFG_TLS,
                ldap_back_cf_gen, "( OLcfgDbAt:3.1 "
                        "NAME 'olcDbStartTLS' "
@@ -352,6 +352,7 @@ static slap_verbmasks tls_mode[] = {
        { BER_BVC( "try-propagate" ),   LDAP_BACK_F_PROPAGATE_TLS },
        { BER_BVC( "start" ),           LDAP_BACK_F_TLS_USE_MASK },
        { BER_BVC( "try-start" ),       LDAP_BACK_F_USE_TLS },
+       { BER_BVC( "ldaps" ),           LDAP_BACK_F_TLS_LDAPS },
        { BER_BVC( "none" ),            LDAP_BACK_F_NONE },
        { BER_BVNULL,                   0 }
 };
@@ -551,7 +552,6 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
        int             rc;
 
        if ( strcmp( c->argv[ 1 ], "*" ) == 0
-               || strcmp( c->argv[ 1 ], ".*" ) == 0
                || strcmp( c->argv[ 1 ], "dn:*" ) == 0
                || strcasecmp( c->argv[ 1 ], "dn.regex:.*" ) == 0 )
        {
@@ -712,6 +712,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
                        return 1;
                }
        }
+       bindconf_tls_defaults( &si->si_bc );
 
        return 0;
 }
@@ -776,10 +777,25 @@ ldap_back_cf_gen( ConfigArgs *c )
                        }
                        break;
 
-               case LDAP_BACK_CFG_TLS:
+               case LDAP_BACK_CFG_TLS: {
+                       struct berval bc = BER_BVNULL, bv2;
                        enum_to_verb( tls_mode, ( li->li_flags & LDAP_BACK_F_TLS_MASK ), &bv );
                        assert( !BER_BVISNULL( &bv ) );
-                       value_add_one( &c->rvalue_vals, &bv );
+                       bindconf_tls_unparse( &li->li_tls, &bc );
+
+                       if ( !BER_BVISEMPTY( &bc )) {
+                               bv2.bv_len = bv.bv_len + bc.bv_len + 1;
+                               bv2.bv_val = ch_malloc( bv2.bv_len + 1 );
+                               strcpy( bv2.bv_val, bv.bv_val );
+                               bv2.bv_val[bv.bv_len] = ' ';
+                               strcpy( &bv2.bv_val[bv.bv_len + 1], bc.bv_val );
+                               ber_bvarray_add( &c->rvalue_vals, &bv2 );
+
+                       } else {
+                               value_add_one( &c->rvalue_vals, &bv );
+                       }
+                       ber_memfree( bc.bv_val );
+                       }
                        break;
 
                case LDAP_BACK_CFG_ACL_AUTHCDN:
@@ -1379,6 +1395,13 @@ done_url:;
                }
                li->li_flags &= ~LDAP_BACK_F_TLS_MASK;
                li->li_flags |= tls_mode[i].mask;
+               if ( c->argc > 2 ) {
+                       for ( i=2; i<c->argc; i++ ) {
+                               if ( bindconf_tls_parse( c->argv[i], &li->li_tls ))
+                                       return 1;
+                       }
+                       bindconf_tls_defaults( &li->li_tls );
+               }
                break;
 
        case LDAP_BACK_CFG_ACL_AUTHCDN:
@@ -1437,6 +1460,7 @@ done_url:;
                                return 1;
                        }
                }
+               bindconf_tls_defaults( &li->li_acl );
                break;
 
        case LDAP_BACK_CFG_IDASSERT_MODE:
@@ -1622,7 +1646,7 @@ done_url:;
                        && mask == LDAP_BACK_F_T_F_DISCOVER
                        && !LDAP_BACK_T_F( li ) )
                {
-                       slap_bindconf   sb = { 0 };
+                       slap_bindconf   sb = { BER_BVNULL };
                        int             rc;
 
                        if ( li->li_uri == NULL ) {
@@ -1794,7 +1818,7 @@ done_url:;
                        && mask == LDAP_BACK_F_CANCEL_EXOP_DISCOVER
                        && !LDAP_BACK_CANCEL( li ) )
                {
-                       slap_bindconf   sb = { 0 };
+                       slap_bindconf   sb = { BER_BVNULL };
                        int             rc;
 
                        if ( li->li_uri == NULL ) {
@@ -1982,7 +2006,7 @@ retry:
                }
 
                if ( lc != NULL ) {
-                       ldap_back_release_conn( &op2, rs, lc );
+                       ldap_back_release_conn( (ldapinfo_t *)op2.o_bd->be_private, lc );
                }
 
        } else {