]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/config.c
Add LDAPsubentry (without OID).
[openldap] / servers / slapd / config.c
index 306b6d9b83cbbbda4c19667efaea74abd585d889..47b081a2860b1d172716fb1f8f403ef79f7824fb 100644 (file)
@@ -1,14 +1,21 @@
 /* config.c - configuration file handling routines */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
 
 #include <ac/string.h>
 #include <ac/ctype.h>
 #include <ac/socket.h>
 
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 #include "slap.h"
 
 #define MAXARGS        100
  */
 int            defsize = SLAPD_DEFAULT_SIZELIMIT;
 int            deftime = SLAPD_DEFAULT_TIMELIMIT;
-struct acl     *global_acl = NULL;
+AccessControl  *global_acl = NULL;
 int            global_default_access = ACL_READ;
 char           *replogfile;
-int            global_lastmod;
+int            global_lastmod = ON;
+int            global_idletimeout = 0;
+char   *global_realm = NULL;
 char           *ldap_srvtab = "";
 
 char   *slapd_pid_file  = NULL;
@@ -37,14 +46,22 @@ int
 read_config( char *fname )
 {
        FILE    *fp;
-       char    *line, *savefname;
+       char    *line, *savefname, *saveline;
        int     cargc, savelineno;
        char    *cargv[MAXARGS];
        int     lineno, i;
+#ifdef HAVE_TLS
+       int rc;
+#endif
+       struct berval *vals[2];
+       struct berval val;
 
        static BackendInfo *bi = NULL;
        static BackendDB        *be = NULL;
 
+       vals[0] = &val;
+       vals[1] = NULL;
+
        if ( (fp = fopen( fname, "r" )) == NULL ) {
                ldap_syslog = 1;
                Debug( LDAP_DEBUG_ANY,
@@ -56,6 +73,13 @@ read_config( char *fname )
 
        Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 );
 
+       if ( schema_init( ) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                   "error initializing the schema\n",
+                   0, 0, 0 );
+               return( 1 );
+       }
+
        fp_getline_init( &lineno );
 
        while ( (line = fp_getline( fp, &lineno )) != NULL ) {
@@ -66,6 +90,9 @@ read_config( char *fname )
 
                Debug( LDAP_DEBUG_CONFIG, "line %d (%s)\n", lineno, line, 0 );
 
+               /* fp_parse_line is destructive, we save a copy */
+               saveline = ch_strdup( line );
+
                if ( fp_parse_line( line, &cargc, cargv ) != 0 ) {
                        return( 1 );
                }
@@ -106,7 +133,7 @@ read_config( char *fname )
                        be = backend_db_init( cargv[1] );
 
                /* assign a default depth limit for alias deref */
-               be->be_maxDerefDepth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
+               be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
 
                /* get pid file name */
                } else if ( strcasecmp( cargv[0], "pidfile" ) == 0 ) {
@@ -130,7 +157,28 @@ read_config( char *fname )
 
                        slapd_args_file = ch_strdup( cargv[1] );
 
-               /* set size limit */
+               /* set DIGEST realm */
+               } else if ( strcasecmp( cargv[0], "digest-realm" ) == 0 ) {
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+           "%s: line %d: missing realm in \"digest-realm <realm>\" line\n",
+                                   fname, lineno, 0 );
+                               return( 1 );
+                       }
+                       if ( be != NULL ) {
+                               be->be_realm = ch_strdup( cargv[1] );
+
+                       } else if ( global_realm != NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: already set global realm!\n",
+                                       fname, lineno, 0 );
+                               return 1;
+
+                       } else {
+                               global_realm = ch_strdup( cargv[1] );
+                       }
+
+               /* set time limit */
                } else if ( strcasecmp( cargv[0], "sizelimit" ) == 0 ) {
                        if ( cargc < 2 ) {
                                Debug( LDAP_DEBUG_ANY,
@@ -160,6 +208,7 @@ read_config( char *fname )
 
                /* set database suffix */
                } else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) {
+                       Backend *tmp_be;
                        if ( cargc < 2 ) {
                                Debug( LDAP_DEBUG_ANY,
                    "%s: line %d: missing dn in \"suffix <dn>\" line\n",
@@ -174,60 +223,80 @@ read_config( char *fname )
                                Debug( LDAP_DEBUG_ANY,
 "%s: line %d: suffix line must appear inside a database definition (ignored)\n",
                                    fname, lineno, 0 );
+                       } else if ( ( tmp_be = select_backend( cargv[1] ) ) == be ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: suffix already served by this backend (ignored)\n",
+                                   fname, lineno, 0 );
+                       } else if ( tmp_be  != NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: suffix already served by a preceeding backend \"%s\" (ignored)\n",
+                                   fname, lineno, tmp_be->be_suffix[0] );
                        } else {
                                char *dn = ch_strdup( cargv[1] );
-                               (void) dn_normalize_case( dn );
+                               (void) dn_normalize( dn );
                                charray_add( &be->be_suffix, dn );
+                               (void) str2upper( dn );
+                               charray_add( &be->be_nsuffix, dn );
+                               free( dn );
                        }
 
-                /* set database suffixAlias */
-                } else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) {
-                        if ( cargc < 2 ) {
-                                Debug( LDAP_DEBUG_ANY,
-                    "%s: line %d: missing alias and aliased_dn in \"suffixAlias <alias> <aliased_dn>\" line\n",
-                                    fname, lineno, 0 );
-                                return( 1 );
-                        } else if ( cargc < 3 ) {
-                                Debug( LDAP_DEBUG_ANY,
-                    "%s: line %d: missing aliased_dn in \"suffixAlias <alias> <aliased_dn>\" line\n",
-                                    fname, lineno, 0 );
-                                return( 1 );
-                        } else if ( cargc > 3 ) {
-                                Debug( LDAP_DEBUG_ANY,
-    "%s: line %d: extra cruft in suffixAlias line (ignored)\n",
-                                    fname, lineno, 0 );
-                        }
-                        if ( be == NULL ) {
-                                Debug( LDAP_DEBUG_ANY,
-"%s: line %d: suffixAlias line must appear inside a database definition (ignored)\n",
-                                    fname, lineno, 0 );
-                        } else {
-                                char *alias, *aliased_dn;
-
-                                                               alias = ch_strdup( cargv[1] );
-                                (void) dn_normalize( alias );
-
-                                aliased_dn = ch_strdup( cargv[2] );
-                                (void) dn_normalize( aliased_dn );
-
-
-                                                               if ( strcasecmp( alias, aliased_dn) == 0 ) {
-                                       Debug( LDAP_DEBUG_ANY,
-"%s: line %d: suffixAlias %s is not different from aliased dn (ignored)\n",
-                                    fname, lineno, alias );
-                                                               } else {
-                                       (void) dn_normalize_case( alias );
-                                       (void) dn_normalize_case( aliased_dn );
-                                       charray_add( &be->be_suffixAlias, alias );
-                                       charray_add( &be->be_suffixAlias, aliased_dn );
-                                                               }
-
-                                                               free(alias);
-                                                               free(aliased_dn);
-                        }
+               /* set database suffixAlias */
+               } else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) {
+                       Backend *tmp_be;
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: missing alias and aliased_dn in \"suffixAlias <alias> <aliased_dn>\" line\n",
+                                       fname, lineno, 0 );
+                               return( 1 );
+                       } else if ( cargc < 3 ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: missing aliased_dn in \"suffixAlias <alias> <aliased_dn>\" line\n",
+                               fname, lineno, 0 );
+                               return( 1 );
+                       } else if ( cargc > 3 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: extra cruft in suffixAlias line (ignored)\n",
+                               fname, lineno, 0 );
+                       }
+
+                       if ( be == NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: suffixAlias line"
+                                       " must appear inside a database definition (ignored)\n",
+                                       fname, lineno, 0 );
+                       } else if ( (tmp_be = select_backend( cargv[1] )) != NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: suffixAlias served by"
+                                       "  a preceeding backend \"%s\" (ignored)\n",
+                                       fname, lineno, tmp_be->be_suffix[0] );
+
+                       } else if ( (tmp_be = select_backend( cargv[2] )) != NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: suffixAlias derefs to differnet backend"
+                                       "  a preceeding backend \"%s\" (ignored)\n",
+                                       fname, lineno, tmp_be->be_suffix[0] );
+
+                       } else {
+                               char *alias, *aliased_dn;
+
+                               alias = ch_strdup( cargv[1] );
+                               (void) dn_normalize( alias );
+
+                               aliased_dn = ch_strdup( cargv[2] );
+                               (void) dn_normalize( aliased_dn );
+
+                               (void) dn_normalize_case( alias );
+                               (void) dn_normalize_case( aliased_dn );
+                               charray_add( &be->be_suffixAlias, alias );
+                               charray_add( &be->be_suffixAlias, aliased_dn );
+
+                               free(alias);
+                               free(aliased_dn);
+                       }
 
                /* set max deref depth */
                } else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) {
+                                       int i;
                        if ( cargc < 2 ) {
                                Debug( LDAP_DEBUG_ANY,
                    "%s: line %d: missing depth in \"maxDerefDepth <depth>\" line\n",
@@ -238,9 +307,14 @@ read_config( char *fname )
                                Debug( LDAP_DEBUG_ANY,
 "%s: line %d: depth line must appear inside a database definition (ignored)\n",
                                    fname, lineno, 0 );
+                       } else if ((i = atoi(cargv[1])) < 0) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: depth must be positive (ignored)\n",
+                                   fname, lineno, 0 );
+
                        } else {
-                           be->be_maxDerefDepth = atoi (cargv[1]);
-                       }
+                           be->be_max_deref_depth = i;
+                                          }
 
 
                /* set magic "root" dn for this database */
@@ -257,7 +331,16 @@ read_config( char *fname )
                                    fname, lineno, 0 );
                        } else {
                                be->be_root_dn = ch_strdup( cargv[1] );
-                               be->be_root_ndn = dn_normalize_case( ch_strdup( cargv[1] ) );
+                               be->be_root_ndn = ch_strdup( cargv[1] );
+
+                               if( dn_normalize_case( be->be_root_ndn ) == NULL ) {
+                                       free( be->be_root_dn );
+                                       free( be->be_root_ndn );
+                                       Debug( LDAP_DEBUG_ANY,
+"%s: line %d: rootdn DN is invalid\n",
+                                          fname, lineno, 0 );
+                                       return( 1 );
+                               }
                        }
 
                /* set super-secret magic database password */
@@ -304,19 +387,60 @@ read_config( char *fname )
                                    fname, lineno, 0 );
                                return( 1 );
                        }
-                       default_referral = (char *) ch_malloc( strlen( cargv[1] )
-                           + sizeof("Referral:\n") + 1 );
-                       strcpy( default_referral, "Referral:\n" );
-                       strcat( default_referral, cargv[1] );
 
+                       vals[0]->bv_val = cargv[1];
+                       vals[0]->bv_len = strlen( vals[0]->bv_val );
+                       value_add( &default_referral, vals );
+
+               /* specify locale */
+               } else if ( strcasecmp( cargv[0], "locale" ) == 0 ) {
+#ifdef HAVE_LOCALE_H
+                       char *locale;
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+       "%s: line %d: missing locale in \"locale <name | on | off>\" line\n",
+                                      fname, lineno, 0 );
+                               return( 1 );
+                       }
+
+                       locale = (strcasecmp(   cargv[1], "on"  ) == 0 ? ""
+                                 : strcasecmp( cargv[1], "off" ) == 0 ? "C"
+                                 : ch_strdup( cargv[1] )                    );
+
+                       if ( setlocale( LC_CTYPE, locale ) == 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                      (*locale
+                                       ? "%s: line %d: bad locale \"%s\"\n"
+                                       : "%s: line %d: bad locale\n"),
+                                      fname, lineno, locale );
+                               return( 1 );
+                       }
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                              "%s: line %d: \"locale\" unsupported\n",
+                              fname, lineno, 0 );
+                       return( 1 );
+#endif
                /* specify an objectclass */
                } else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) {
-                       parse_oc( be, fname, lineno, cargc, cargv );
+                       if ( *cargv[1] == '(' ) {
+                               char * p;
+                               p = strchr(saveline,'(');
+                               parse_oc( fname, lineno, p );
+                       } else {
+                               parse_oc_old( be, fname, lineno, cargc, cargv );
+                       }
 
                /* specify an attribute */
                } else if ( strcasecmp( cargv[0], "attribute" ) == 0 ) {
-                       attr_syntax_config( fname, lineno, cargc - 1,
-                           &cargv[1] );
+                       if ( *cargv[1] == '(' ) {
+                               char * p;
+                               p = strchr(saveline,'(');
+                               parse_at( fname, lineno, p );
+                       } else {
+                               attr_syntax_config( fname, lineno, cargc - 1,
+                                   &cargv[1] );
+                       }
 
                /* turn on/off schema checking */
                } else if ( strcasecmp( cargv[0], "schemacheck" ) == 0 ) {
@@ -326,10 +450,10 @@ read_config( char *fname )
                                    fname, lineno, 0 );
                                return( 1 );
                        }
-                       if ( strcasecmp( cargv[1], "on" ) == 0 ) {
-                               global_schemacheck = 1;
-                       } else {
+                       if ( strcasecmp( cargv[1], "off" ) == 0 ) {
                                global_schemacheck = 0;
+                       } else {
+                               global_schemacheck = 1;
                        }
 
                /* specify access control info */
@@ -345,18 +469,21 @@ read_config( char *fname )
                                return( 1 );
                        }
                        if ( be == NULL ) {
-                               if ( (global_default_access =
-                                   str2access( cargv[1] )) == -1 ) {
+                               if ( ACL_IS_INVALID(ACL_SET(global_default_access,
+                                               str2access(cargv[1]))) )
+                               {
                                        Debug( LDAP_DEBUG_ANY,
-"%s: line %d: bad access \"%s\" expecting [self]{none|compare|read|write}\n",
+"%s: line %d: bad access \"%s\" expecting [self]{none|auth|compare|search|read|write}\n",
                                            fname, lineno, cargv[1] );
                                        return( 1 );
                                }
                        } else {
-                               if ( (be->be_dfltaccess =
-                                   str2access( cargv[1] )) == -1 ) {
+                               if ( ACL_IS_INVALID(ACL_SET(be->be_dfltaccess,
+                                               str2access(cargv[1]))) )
+                               {
                                        Debug( LDAP_DEBUG_ANY,
-"%s: line %d: bad access \"%s\" expecting [self]{none|compare|read|write}\n",
+                                               "%s: line %d: bad access \"%s\", "
+                                               "expecting [self]{none|auth|compare|search|read|write}\n",
                                            fname, lineno, cargv[1] );
                                        return( 1 );
                                }
@@ -389,7 +516,7 @@ read_config( char *fname )
                                        if ( strncasecmp( cargv[i], "host=", 5 )
                                            == 0 ) {
                                                charray_add( &be->be_replica,
-                                                   ch_strdup( cargv[i] + 5 ) );
+                                                            cargv[i] + 5 );
                                                break;
                                        }
                                }
@@ -414,7 +541,33 @@ read_config( char *fname )
                                    fname, lineno, 0 );
                        } else {
                                be->be_update_ndn = ch_strdup( cargv[1] );
-                               (void) dn_normalize_case( be->be_update_ndn );
+                               if( dn_normalize_case( be->be_update_ndn ) == NULL ) {
+                                       Debug( LDAP_DEBUG_ANY,
+"%s: line %d: updatedn DN is invalid\n",
+                                           fname, lineno, 0 );
+                                       return 1;
+                               }
+                       }
+
+               } else if ( strcasecmp( cargv[0], "updateref" ) == 0 ) {
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                   "%s: line %d: missing dn in \"updateref <ldapurl>\" line\n",
+                                   fname, lineno, 0 );
+                               return( 1 );
+                       }
+                       if ( be == NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: updateref line must appear inside a database definition (ignored)\n",
+                                   fname, lineno, 0 );
+                       } else if ( be->be_update_ndn == NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+"%s: line %d: updateref line must after updatedn (ignored)\n",
+                                   fname, lineno, 0 );
+                       } else {
+                               vals[0]->bv_val = cargv[1];
+                               vals[0]->bv_len = strlen( vals[0]->bv_val );
+                               value_add( &be->be_update_refs, vals );
                        }
 
                /* replication log file to which changes are appended */
@@ -451,6 +604,27 @@ read_config( char *fname )
                                        global_lastmod = OFF;
                        }
 
+               /* set idle timeout value */
+               } else if ( strcasecmp( cargv[0], "idletimeout" ) == 0 ) {
+                       int i;
+                       if ( cargc < 2 ) {
+                               Debug( LDAP_DEBUG_ANY,
+           "%s: line %d: missing timeout value in \"idletimeout <seconds>\" line\n",
+                                   fname, lineno, 0 );
+                               return( 1 );
+                       }
+
+                       i = atoi( cargv[1] );
+
+                       if( i < 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+           "%s: line %d: timeout value (%d) invalid \"idletimeout <seconds>\" line\n",
+                                   fname, lineno, i );
+                               return( 1 );
+                       }
+
+                       global_idletimeout = i;
+
                /* include another config file */
                } else if ( strcasecmp( cargv[0], "include" ) == 0 ) {
                        if ( cargc < 2 ) {
@@ -479,10 +653,78 @@ read_config( char *fname )
                        }
                        ldap_srvtab = ch_strdup( cargv[1] );
 
+#ifdef SLAPD_MODULES
+                } else if (strcasecmp( cargv[0], "loadmodule") == 0 ) {
+                   if ( cargc < 2 ) {
+                      Debug( LDAP_DEBUG_ANY,
+                             "%s: line %d: missing filename in \"loadmodule <filename>\" line\n",
+                             fname, lineno, 0 );
+                      exit( EXIT_FAILURE );
+                   }
+                   if (load_module(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) {
+                      Debug( LDAP_DEBUG_ANY,
+                             "%s: line %d: failed to load or initialize module %s\n",
+                             fname, lineno, cargv[1]);
+                      exit( EXIT_FAILURE );
+                   }
+                  
+#endif /*SLAPD_MODULES*/
+
+#ifdef HAVE_TLS
+               } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_PROTOCOL,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+               } else if ( !strcasecmp( cargv[0], "TLSCipherSuite" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_CIPHER_SUITE,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+               } else if ( !strcasecmp( cargv[0], "TLSCertificateFile" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_CERTFILE,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+               } else if ( !strcasecmp( cargv[0], "TLSCertificateKeyFile" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_KEYFILE,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+               } else if ( !strcasecmp( cargv[0], "TLSCACertificatePath" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_CACERTDIR,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+               } else if ( !strcasecmp( cargv[0], "TLSCACertificateFile" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_CACERTFILE,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+               } else if ( !strcasecmp( cargv[0], "TLSVerifyClient" ) ) {
+                       rc = ldap_pvt_tls_set_option( NULL,
+                                                     LDAP_OPT_X_TLS_REQUIRE_CERT,
+                                                     cargv[1] );
+                       if ( rc )
+                               return rc;
+
+#endif
+
                /* pass anything else to the current backend info/db config routine */
                } else {
                        if ( bi != NULL ) {
-                               if (bi->bi_config == NULL) {
+                               if ( bi->bi_config == 0 ) {
                                        Debug( LDAP_DEBUG_ANY,
 "%s: line %d: unknown directive \"%s\" inside backend info definition (ignored)\n",
                                                fname, lineno, cargv[0] );
@@ -494,7 +736,7 @@ read_config( char *fname )
                                        }
                                }
                        } else if ( be != NULL ) {
-                               if ( be->be_config == NULL ) {
+                               if ( be->be_config == 0 ) {
                                        Debug( LDAP_DEBUG_ANY,
 "%s: line %d: unknown directive \"%s\" inside backend database definition (ignored)\n",
                                        fname, lineno, cargv[0] );
@@ -511,8 +753,10 @@ read_config( char *fname )
                                    fname, lineno, cargv[0] );
                        }
                }
+               free( saveline );
        }
        fclose( fp );
+       return( 0 );
 }
 
 static int
@@ -570,7 +814,10 @@ strtok_quote( char *line, char *sep )
                        break;
 
                case '\\':
-                       SAFEMEMCPY( next, next + 1, strlen( next + 1 ) + 1 );
+                       if ( next[1] )
+                               SAFEMEMCPY( next,
+                                           next + 1, strlen( next + 1 ) + 1 );
+                       next++;         /* dont parse the escaped character */
                        break;
 
                default:
@@ -622,7 +869,7 @@ fp_getline( FILE *fp, int *lineno )
                if ( (p = strchr( buf, '\n' )) != NULL ) {
                        *p = '\0';
                }
-               if ( ! isspace( buf[0] ) ) {
+               if ( ! isspace( (unsigned char) buf[0] ) ) {
                        return( line );
                }