]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/config.c
ITS#5339
[openldap] / servers / slapd / config.c
index d6655a78a01eda9113da6bec7324067e48a03e77..368fb9cef62c883dc787c326587b274d98285cb2 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,7 @@ int           global_gentlehup = 0;
 int            global_idletimeout = 0;
 char   *global_host = NULL;
 char   *global_realm = NULL;
+char   *sasl_host = NULL;
 char           **default_passwd_hash = NULL;
 struct berval default_search_base = BER_BVNULL;
 struct berval default_search_nbase = BER_BVNULL;
@@ -124,6 +125,7 @@ ConfigTable *config_find_keyword(ConfigTable *Conf, ConfigArgs *c) {
 
 int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
        int rc, arg_user, arg_type, arg_syn, iarg;
+       unsigned uiarg;
        long larg;
        ber_len_t barg;
        
@@ -227,6 +229,16 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                                        return(ARG_BAD_CONF);
                                }
                                break;
+                       case ARG_UINT:
+                               if ( lutil_atoux( &uiarg, c->argv[1], 0 ) != 0 ) {
+                                       snprintf( c->cr_msg, sizeof( c->cr_msg ),
+                                               "<%s> unable to parse \"%s\" as unsigned int",
+                                               c->argv[0], c->argv[1] );
+                                       Debug(LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, "%s: %s\n",
+                                               c->log, c->cr_msg, 0);
+                                       return(ARG_BAD_CONF);
+                               }
+                               break;
                        case ARG_LONG:
                                if ( lutil_atolx( &larg, c->argv[1], 0 ) != 0 ) {
                                        snprintf( c->cr_msg, sizeof( c->cr_msg ),
@@ -283,6 +295,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                switch(arg_type) {
                        case ARG_ON_OFF:
                        case ARG_INT:           c->value_int = iarg;            break;
+                       case ARG_UINT:          c->value_uint = uiarg;          break;
                        case ARG_LONG:          c->value_long = larg;           break;
                        case ARG_BER_LEN_T:     c->value_ber_t = barg;          break;
                }
@@ -333,6 +346,7 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) {
                switch(arg_type & ARGS_TYPES) {
                        case ARG_ON_OFF:
                        case ARG_INT:           *(int*)ptr = c->value_int;                      break;
+                       case ARG_UINT:          *(unsigned*)ptr = c->value_uint;                        break;
                        case ARG_LONG:          *(long*)ptr = c->value_long;                    break;
                        case ARG_BER_LEN_T:     *(ber_len_t*)ptr = c->value_ber_t;                      break;
                        case ARG_STRING: {
@@ -419,6 +433,7 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c)
                switch(cf->arg_type & ARGS_TYPES) {
                case ARG_ON_OFF:
                case ARG_INT:   c->value_int = *(int *)ptr; break;
+               case ARG_UINT:  c->value_uint = *(unsigned *)ptr; break;
                case ARG_LONG:  c->value_long = *(long *)ptr; break;
                case ARG_BER_LEN_T:     c->value_ber_t = *(ber_len_t *)ptr; break;
                case ARG_STRING:
@@ -434,6 +449,7 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c)
                bv.bv_val = c->log;
                switch(cf->arg_type & ARGS_TYPES) {
                case ARG_INT: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%d", c->value_int); break;
+               case ARG_UINT: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%u", c->value_uint); break;
                case ARG_LONG: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%ld", c->value_long); break;
                case ARG_BER_LEN_T: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%ld", c->value_ber_t); break;
                case ARG_ON_OFF: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%s",
@@ -480,9 +496,6 @@ init_config_attrs(ConfigTable *ct) {
                        fprintf( stderr, "init_config_attrs: register_at failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ct[i].ad->ad_type->sat_flags |= SLAP_AT_HIDE;
-#endif
        }
 
        return 0;
@@ -498,9 +511,6 @@ init_config_ocs( ConfigOCs *ocs ) {
                        fprintf( stderr, "init_config_ocs: register_oc failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ocs[i].co_oc->soc_flags |= SLAP_OC_HIDE;
-#endif
        }
        return 0;
 }
@@ -827,6 +837,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
        rc = 0;
 
 done:
+       if ( cf ) {
+               cf->be = c->be;
+               cf->bi = c->bi;
+       }
        ch_free(c->tline);
        fclose(fp);
        ch_free(c->argv);
@@ -987,6 +1001,140 @@ enum_to_verb(slap_verbmasks *v, slap_mask_t m, struct berval *bv) {
        return -1;
 }
 
+/* register a new verbmask */
+static int
+slap_verbmask_register( slap_verbmasks *vm_, slap_verbmasks **vmp, struct berval *bv, int mask )
+{
+       slap_verbmasks  *vm = *vmp;
+       int             i;
+
+       /* check for duplicate word */
+       /* NOTE: we accept duplicate codes; the first occurrence will be used
+        * when mapping from mask to verb */
+       i = verb_to_mask( bv->bv_val, vm );
+       if ( !BER_BVISNULL( &vm[ i ].word ) ) {
+               return -1;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &vm[ i ].word ); i++ )
+               ;
+
+       if ( vm == vm_ ) {
+               /* first time: duplicate array */
+               vm = ch_calloc( i + 2, sizeof( slap_verbmasks ) );
+               for ( i = 0; !BER_BVISNULL( &vm_[ i ].word ); i++ )
+               {
+                       ber_dupbv( &vm[ i ].word, &vm_[ i ].word );
+                       *((slap_mask_t*)&vm[ i ].mask) = vm_[ i ].mask;
+               }
+
+       } else {
+               vm = ch_realloc( vm, (i + 2) * sizeof( slap_verbmasks ) );
+       }
+
+       ber_dupbv( &vm[ i ].word, bv );
+       *((slap_mask_t*)&vm[ i ].mask) = mask;
+
+       BER_BVZERO( &vm[ i+1 ].word );
+
+       *vmp = vm;
+
+       return i;
+}
+
+static slap_verbmasks slap_ldap_response_code_[] = {
+       { BER_BVC("success"),                           LDAP_SUCCESS },
+
+       { BER_BVC("operationsError"),                   LDAP_OPERATIONS_ERROR },
+       { BER_BVC("protocolError"),                     LDAP_PROTOCOL_ERROR },
+       { BER_BVC("timelimitExceeded"),                 LDAP_TIMELIMIT_EXCEEDED },
+       { BER_BVC("sizelimitExceeded"),                 LDAP_SIZELIMIT_EXCEEDED },
+       { BER_BVC("compareFalse"),                      LDAP_COMPARE_FALSE },
+       { BER_BVC("compareTrue"),                       LDAP_COMPARE_TRUE },
+
+       { BER_BVC("authMethodNotSupported"),            LDAP_AUTH_METHOD_NOT_SUPPORTED },
+       { BER_BVC("strongAuthNotSupported"),            LDAP_STRONG_AUTH_NOT_SUPPORTED },
+       { BER_BVC("strongAuthRequired"),                LDAP_STRONG_AUTH_REQUIRED },
+       { BER_BVC("strongerAuthRequired"),              LDAP_STRONGER_AUTH_REQUIRED },
+#if 0 /* not LDAPv3 */
+       { BER_BVC("partialResults"),                    LDAP_PARTIAL_RESULTS },
+#endif
+
+       { BER_BVC("referral"),                          LDAP_REFERRAL },
+       { BER_BVC("adminlimitExceeded"),                LDAP_ADMINLIMIT_EXCEEDED },
+       { BER_BVC("unavailableCriticalExtension"),      LDAP_UNAVAILABLE_CRITICAL_EXTENSION },
+       { BER_BVC("confidentialityRequired"),           LDAP_CONFIDENTIALITY_REQUIRED },
+       { BER_BVC("saslBindInProgress"),                LDAP_SASL_BIND_IN_PROGRESS },
+
+       { BER_BVC("noSuchAttribute"),                   LDAP_NO_SUCH_ATTRIBUTE },
+       { BER_BVC("undefinedType"),                     LDAP_UNDEFINED_TYPE },
+       { BER_BVC("inappropriateMatching"),             LDAP_INAPPROPRIATE_MATCHING },
+       { BER_BVC("constraintViolation"),               LDAP_CONSTRAINT_VIOLATION },
+       { BER_BVC("typeOrValueExists"),                 LDAP_TYPE_OR_VALUE_EXISTS },
+       { BER_BVC("invalidSyntax"),                     LDAP_INVALID_SYNTAX },
+
+       { BER_BVC("noSuchObject"),                      LDAP_NO_SUCH_OBJECT },
+       { BER_BVC("aliasProblem"),                      LDAP_ALIAS_PROBLEM },
+       { BER_BVC("invalidDnSyntax"),                   LDAP_INVALID_DN_SYNTAX },
+#if 0 /* not LDAPv3 */
+       { BER_BVC("isLeaf"),                            LDAP_IS_LEAF },
+#endif
+       { BER_BVC("aliasDerefProblem"),                 LDAP_ALIAS_DEREF_PROBLEM },
+
+       { BER_BVC("proxyAuthzFailure"),                 LDAP_X_PROXY_AUTHZ_FAILURE },
+       { BER_BVC("inappropriateAuth"),                 LDAP_INAPPROPRIATE_AUTH },
+       { BER_BVC("invalidCredentials"),                LDAP_INVALID_CREDENTIALS },
+       { BER_BVC("insufficientAccess"),                LDAP_INSUFFICIENT_ACCESS },
+
+       { BER_BVC("busy"),                              LDAP_BUSY },
+       { BER_BVC("unavailable"),                       LDAP_UNAVAILABLE },
+       { BER_BVC("unwillingToPerform"),                LDAP_UNWILLING_TO_PERFORM },
+       { BER_BVC("loopDetect"),                        LDAP_LOOP_DETECT },
+
+       { BER_BVC("namingViolation"),                   LDAP_NAMING_VIOLATION },
+       { BER_BVC("objectClassViolation"),              LDAP_OBJECT_CLASS_VIOLATION },
+       { BER_BVC("notAllowedOnNonleaf"),               LDAP_NOT_ALLOWED_ON_NONLEAF },
+       { BER_BVC("notAllowedOnRdn"),                   LDAP_NOT_ALLOWED_ON_RDN },
+       { BER_BVC("alreadyExists"),                     LDAP_ALREADY_EXISTS },
+       { BER_BVC("noObjectClassMods"),                 LDAP_NO_OBJECT_CLASS_MODS },
+       { BER_BVC("resultsTooLarge"),                   LDAP_RESULTS_TOO_LARGE },
+       { BER_BVC("affectsMultipleDsas"),               LDAP_AFFECTS_MULTIPLE_DSAS },
+
+       { BER_BVC("other"),                             LDAP_OTHER },
+
+       /* extension-specific */
+
+       { BER_BVC("cupResourcesExhausted"),             LDAP_CUP_RESOURCES_EXHAUSTED },
+       { BER_BVC("cupSecurityViolation"),              LDAP_CUP_SECURITY_VIOLATION },
+       { BER_BVC("cupInvalidData"),                    LDAP_CUP_INVALID_DATA },
+       { BER_BVC("cupUnsupportedScheme"),              LDAP_CUP_UNSUPPORTED_SCHEME },
+       { BER_BVC("cupReloadRequired"),                 LDAP_CUP_RELOAD_REQUIRED },
+
+       { BER_BVC("cancelled"),                         LDAP_CANCELLED },
+       { BER_BVC("noSuchOperation"),                   LDAP_NO_SUCH_OPERATION },
+       { BER_BVC("tooLate"),                           LDAP_TOO_LATE },
+       { BER_BVC("cannotCancel"),                      LDAP_CANNOT_CANCEL },
+
+       { BER_BVC("assertionFailed"),                   LDAP_ASSERTION_FAILED },
+
+       { BER_BVC("proxiedAuthorizationDenied"),        LDAP_PROXIED_AUTHORIZATION_DENIED },
+
+       { BER_BVC("syncRefreshRequired"),               LDAP_SYNC_REFRESH_REQUIRED },
+
+       { BER_BVC("noOperation"),                       LDAP_X_NO_OPERATION },
+
+       { BER_BVNULL,                           0 }
+};
+
+slap_verbmasks *slap_ldap_response_code = slap_ldap_response_code_;
+
+int
+slap_ldap_response_code_register( struct berval *bv, int err )
+{
+       return slap_verbmask_register( slap_ldap_response_code_,
+               &slap_ldap_response_code, bv, err );
+}
+
 #ifdef HAVE_TLS
 static slap_verbmasks tlskey[] = {
        { BER_BVC("no"),        SB_TLS_OFF },
@@ -1248,19 +1396,18 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0
 int
 slap_tls_get_config( LDAP *ld, int opt, char **val )
 {
+#ifdef HAVE_TLS
        slap_verbmasks *keys;
        int i, ival;
 
        *val = NULL;
        switch( opt ) {
-#ifdef HAVE_TLS
        case LDAP_OPT_X_TLS_CRLCHECK:
                keys = crlkeys;
                break;
        case LDAP_OPT_X_TLS_REQUIRE_CERT:
                keys = vfykeys;
                break;
-#endif
        default:
                return -1;
        }
@@ -1271,6 +1418,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val )
                        return 0;
                }
        }
+#endif
        return -1;
 }