]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/config.c
ITS#2864 don't use sl_mark/release.
[openldap] / servers / slapd / config.c
index f04c52f4d3e09113306c3a30c1c726b2805565c7..cbfc9482ca0ad0b4017b9da8197eba52b976bc05 100644 (file)
@@ -1,8 +1,27 @@
 /* config.c - configuration file handling routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
 #include <ac/socket.h>
 #include <ac/errno.h>
 
-#include "lutil.h"
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+#include "lutil.h"
 
 #define ARGS_STEP      512
 
@@ -30,7 +52,9 @@ struct slap_limits_set deflimit = {
 
        SLAPD_DEFAULT_SIZELIMIT,        /* backward compatible limits */
        0,
-       -1                              /* no limit on unchecked size */
+       -1,                             /* no limit on unchecked size */
+       0,                              /* page limit */
+       0                               /* hide number of entries left */
 };
 
 AccessControl  *global_acl = NULL;
@@ -52,24 +76,25 @@ char        **cargv;
 struct berval default_search_base = { 0, NULL };
 struct berval default_search_nbase = { 0, NULL };
 unsigned               num_subordinates = 0;
-#ifdef SLAPD_SCHEMA_DN
-struct berval global_schemadn;
-struct berval global_schemandn;
-#endif
+struct berval global_schemadn = { 0, NULL };
+struct berval global_schemandn = { 0, NULL };
 
 ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT;
 ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH;
 
+int    slap_conn_max_pending = SLAP_CONN_MAX_PENDING_DEFAULT;
+int    slap_conn_max_pending_auth = SLAP_CONN_MAX_PENDING_AUTH;
+
 char   *slapd_pid_file  = NULL;
 char   *slapd_args_file = NULL;
 
 char   *strtok_quote_ptr;
 
-#ifdef SLAPD_RLOOKUPS
-int use_reverse_lookup = 1;
-#else /* !SLAPD_RLOOKUPS */
 int use_reverse_lookup = 0;
-#endif /* !SLAPD_RLOOKUPS */
+
+#ifdef LDAP_SLAPI
+int slapi_plugins_used = 0;
+#endif
 
 static char    *fp_getline(FILE *fp, int *lineno);
 static void    fp_getline_init(int *lineno);
@@ -78,6 +103,9 @@ static int   fp_parse_line(int lineno, char *line);
 static char    *strtok_quote(char *line, char *sep);
 static int      load_ucdata(char *path);
 
+static int     add_syncrepl LDAP_P(( Backend *, char **, int ));
+static int      parse_syncrepl_line LDAP_P(( char **, int, syncinfo_t *));
+
 int
 read_config( const char *fname, int depth )
 {
@@ -87,7 +115,8 @@ read_config( const char *fname, int depth )
        int     lineno, i;
        int rc;
        struct berval vals[2];
-
+       char *replicahost;
+       LDAPURLDesc *ludp;
        static int lastmod = 1;
        static BackendInfo *bi = NULL;
        static BackendDB        *be = NULL;
@@ -333,6 +362,80 @@ read_config( const char *fname, int depth )
 
                        sockbuf_max_incoming_auth = max;
 
+               /* set conn pending max */
+               } else if ( strcasecmp( cargv[0], "conn_max_pending" ) == 0 ) {
+                       long max;
+                       if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, CRIT, 
+                                  "%s: line %d: missing max in \"conn_max_pending "
+                                  "<requests>\" line\n", fname, lineno, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                          "%s: line %d: missing max in \"conn_max_pending <requests>\" line\n",
+                                   fname, lineno, 0 );
+#endif
+
+                               return( 1 );
+                       }
+
+                       max = atol( cargv[1] );
+
+                       if( max < 0 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, CRIT, 
+                                          "%s: line %d: invalid max value (%ld) in "
+                                          "\"conn_max_pending <requests>\" line.\n",
+                                          fname, lineno, max );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: invalid max value (%ld) in "
+                                       "\"conn_max_pending <requests>\" line.\n",
+                                   fname, lineno, max );
+#endif
+
+                               return( 1 );
+                       }
+
+                       slap_conn_max_pending = max;
+
+               /* set conn pending max authenticated */
+               } else if ( strcasecmp( cargv[0], "conn_max_pending_auth" ) == 0 ) {
+                       long max;
+                       if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, CRIT, 
+                                  "%s: line %d: missing max in \"conn_max_pending_auth "
+                                  "<requests>\" line\n", fname, lineno, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                          "%s: line %d: missing max in \"conn_max_pending_auth <requests>\" line\n",
+                                   fname, lineno, 0 );
+#endif
+
+                               return( 1 );
+                       }
+
+                       max = atol( cargv[1] );
+
+                       if( max < 0 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, CRIT, 
+                                          "%s: line %d: invalid max value (%ld) in "
+                                          "\"conn_max_pending_auth <requests>\" line.\n",
+                                          fname, lineno, max );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                       "%s: line %d: invalid max value (%ld) in "
+                                       "\"conn_max_pending_auth <requests>\" line.\n",
+                                   fname, lineno, max );
+#endif
+
+                               return( 1 );
+                       }
+
+                       slap_conn_max_pending_auth = max;
+
                /* default search base */
                } else if ( strcasecmp( cargv[0], "defaultSearchBase" ) == 0 ) {
                        if ( cargc < 2 ) {
@@ -405,7 +508,7 @@ read_config( const char *fname, int depth )
 
                                rc = dnPrettyNormal( NULL, &dn,
                                        &default_search_base,
-                                       &default_search_nbase );
+                                       &default_search_nbase, NULL );
 
                                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -496,6 +599,12 @@ read_config( const char *fname, int depth )
 
                        slapd_args_file = ch_strdup( cargv[1] );
 
+               } else if ( strcasecmp( cargv[0], "replica-pidfile" ) == 0 ) {
+                       /* ignore */ ;
+
+               } else if ( strcasecmp( cargv[0], "replica-argsfile" ) == 0 ) {
+                       /* ignore */ ;
+
                /* default password hash */
                } else if ( strcasecmp( cargv[0], "password-hash" ) == 0 ) {
                        if ( cargc < 2 ) {
@@ -561,14 +670,11 @@ read_config( const char *fname, int depth )
 
                        lutil_salt_format( cargv[1] );
 
-#ifdef HAVE_CYRUS_SASL
                /* SASL config options */
                } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) {
                        if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
                                return 1;
-#endif /* HAVE_CYRUS_SASL */
 
-#ifdef SLAPD_SCHEMA_DN
                } else if ( strcasecmp( cargv[0], "schemadn" ) == 0 ) {
                        struct berval dn;
                        if ( cargc < 2 ) {
@@ -586,10 +692,10 @@ read_config( const char *fname, int depth )
                        ber_str2bv( cargv[1], 0, 0, &dn );
                        if ( be ) {
                                rc = dnPrettyNormal( NULL, &dn, &be->be_schemadn,
-                                       &be->be_schemandn );
+                                       &be->be_schemandn, NULL );
                        } else {
                                rc = dnPrettyNormal( NULL, &dn, &global_schemadn,
-                                       &global_schemandn );
+                                       &global_schemandn, NULL );
                        }
                        if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -603,7 +709,7 @@ read_config( const char *fname, int depth )
 #endif
                                return 1;
                        }
-#endif /* SLAPD_SCHEMA_DN */
+
                /* set UCDATA path */
                } else if ( strcasecmp( cargv[0], "ucdata-path" ) == 0 ) {
                        int err;
@@ -667,25 +773,55 @@ read_config( const char *fname, int depth )
                        for ( i = 1; i < cargc; i++ ) {
                                if ( strncasecmp( cargv[i], "size", 4 ) == 0 ) {
                                        rc = parse_limit( cargv[i], lim );
+                                       if ( rc ) {
+#ifdef NEW_LOGGING
+                                               LDAP_LOG( CONFIG, CRIT, 
+                                                       "%s: line %d: unable "
+                                                          "to parse value \"%s\" in \"sizelimit "
+                                                          "<limit>\" line.\n", fname, lineno, cargv[i] );
+#else
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: unable "
+                                                       "to parse value \"%s\" "
+                                                       "in \"sizelimit "
+                                                       "<limit>\" line\n",
+                                                       fname, lineno, cargv[i] );
+#endif
+                                               return( 1 );
+                                       }
+
                                } else {
-                                       lim->lms_s_soft = atoi( cargv[i] );
-                                       lim->lms_s_hard = 0;
-                               }
+                                       if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) {
+                                               lim->lms_s_soft = -1;
+                                       } else {
+                                               char *next;
 
-                               if ( rc ) {
+                                               lim->lms_s_soft = strtol( cargv[i] , &next, 0 );
+                                               if ( next == cargv[i] ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, CRIT, 
-                                               "%s: line %d: unable "
-                                                  "to parse value \"%s\" in \"sizelimit "
-                                                  "<limit>\" line.\n", fname, lineno, cargv[i] );
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: unable to parse limit \"%s\" in \"sizelimit <limit>\" "
+                                                          "line.\n", fname, lineno, cargv[i] );
 #else
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "%s: line %d: unable "
-                                               "to parse value \"%s\" "
-                                               "in \"sizelimit "
-                                               "<limit>\" line\n",
-                                               fname, lineno, cargv[i] );
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: unable to parse limit \"%s\" in \"sizelimit <limit>\" line\n",
+                                                           fname, lineno, cargv[i] );
 #endif
+                                                       return( 1 );
+
+                                               } else if ( next[0] != '\0' ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: trailing chars \"%s\" in \"sizelimit <limit>\" "
+                                                          "line ignored.\n", fname, lineno, next );
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: trailing chars \"%s\" in \"sizelimit <limit>\" line ignored\n",
+                                                           fname, lineno, next );
+#endif
+                                               }
+                                       }
+                                       lim->lms_s_hard = 0;
                                }
                        }
 
@@ -717,25 +853,55 @@ read_config( const char *fname, int depth )
                        for ( i = 1; i < cargc; i++ ) {
                                if ( strncasecmp( cargv[i], "time", 4 ) == 0 ) {
                                        rc = parse_limit( cargv[i], lim );
+                                       if ( rc ) {
+#ifdef NEW_LOGGING
+                                               LDAP_LOG( CONFIG, CRIT, 
+                                                           "%s: line %d: unable to parse value \"%s\" "
+                                                          "in \"timelimit <limit>\" line.\n",
+                                                          fname, lineno, cargv[i] );
+#else
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: unable "
+                                                       "to parse value \"%s\" "
+                                                       "in \"timelimit "
+                                                       "<limit>\" line\n",
+                                                       fname, lineno, cargv[i] );
+#endif
+                                               return( 1 );
+                                       }
+
                                } else {
-                                       lim->lms_t_soft = atoi( cargv[i] );
-                                       lim->lms_t_hard = 0;
-                               }
+                                       if ( strcasecmp( cargv[i], "unlimited" ) == 0 ) {
+                                               lim->lms_t_soft = -1;
+                                       } else {
+                                               char *next;
 
-                               if ( rc ) {
+                                               lim->lms_t_soft = strtol( cargv[i] , &next, 0 );
+                                               if ( next == cargv[i] ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, CRIT, 
-                                                   "%s: line %d: unable to parse value \"%s\" "
-                                                  "in \"timelimit <limit>\" line.\n",
-                                                  fname, lineno, cargv[i] );
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: unable to parse limit \"%s\" in \"timelimit <limit>\" "
+                                                          "line.\n", fname, lineno, cargv[i] );
 #else
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "%s: line %d: unable "
-                                               "to parse value \"%s\" "
-                                               "in \"timelimit "
-                                               "<limit>\" line\n",
-                                               fname, lineno, cargv[i] );
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: unable to parse limit \"%s\" in \"timelimit <limit>\" line\n",
+                                                           fname, lineno, cargv[i] );
 #endif
+                                                       return( 1 );
+
+                                               } else if ( next[0] != '\0' ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, CRIT, 
+                                                          "%s: line %d: trailing chars \"%s\" in \"timelimit <limit>\" "
+                                                          "line ignored.\n", fname, lineno, next );
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                           "%s: line %d: trailing chars \"%s\" in \"timelimit <limit>\" line ignored\n",
+                                                           fname, lineno, next );
+#endif
+                                               }
+                                       }
+                                       lim->lms_t_hard = 0;
                                }
                        }
 
@@ -766,7 +932,7 @@ read_config( const char *fname, int depth )
                                        "subordinate keyword must appear inside a database "
                                        "definition.\n", fname, lineno, 0 );
 #else
-                               Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix line "
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: subordinate keyword "
                                        "must appear inside a database definition.\n",
                                    fname, lineno, 0 );
 #endif
@@ -777,6 +943,24 @@ read_config( const char *fname, int depth )
                                num_subordinates++;
                        }
 
+               /* add an overlay to this backend */
+               } else if ( strcasecmp( cargv[0], "overlay" ) == 0 ) {
+                       if ( be == NULL ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, "%s: line %d: "
+                                       "overlay keyword must appear inside a database "
+                                       "definition.\n", fname, lineno, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: overlay keyword "
+                                       "must appear inside a database definition.\n",
+                                   fname, lineno, 0 );
+#endif
+                               return 1;
+
+                       } else if ( overlay_config( be, cargv[1] )) {
+                               return 1;
+                       }
+
                /* set database suffix */
                } else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) {
                        Backend *tmp_be;
@@ -824,12 +1008,12 @@ read_config( const char *fname, int depth )
                        } else if ( strcasecmp( cargv[1], SLAPD_MONITOR_DN ) == 0 ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG( CONFIG, CRIT, "%s: line %d: \""
-                                       SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", 
-                                       fname, lineno, 0 );
+                                       "%s\" is reserved for monitoring slapd\n", 
+                                       fname, lineno, SLAPD_MONITOR_DN );
 #else
                                Debug( LDAP_DEBUG_ANY, "%s: line %d: \""
-                                       SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n", 
-                                       fname, lineno, 0 );
+                                       "%s\" is reserved for monitoring slapd\n", 
+                                       fname, lineno, SLAPD_MONITOR_DN );
 #endif
                                return( 1 );
 #endif /* SLAPD_MONITOR_DN */
@@ -840,7 +1024,7 @@ read_config( const char *fname, int depth )
                        dn.bv_val = cargv[1];
                        dn.bv_len = strlen( cargv[1] );
 
-                       rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+                       rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL );
                        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG( CONFIG, CRIT, 
@@ -900,141 +1084,6 @@ read_config( const char *fname, int depth )
                        ber_bvarray_add( &be->be_suffix, &pdn );
                        ber_bvarray_add( &be->be_nsuffix, &ndn );
 
-               /* set database suffixAlias */
-               } else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) {
-                       Backend *tmp_be;
-                       struct berval alias, palias, nalias;
-                       struct berval aliased, paliased, naliased;
-
-                       if ( cargc < 2 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: missing alias and aliased_dn in "
-                                       "\"suffixAlias <alias> <aliased_dn>\" line.\n",
-                                       fname, lineno, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: missing alias and aliased_dn in "
-                                       "\"suffixAlias <alias> <aliased_dn>\" line.\n",
-                                       fname, lineno, 0 );
-#endif
-
-                               return( 1 );
-                       } else if ( cargc < 3 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: missing aliased_dn in "
-                                       "\"suffixAlias <alias> <aliased_dn>\" line\n",
-                                       fname, lineno, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: missing aliased_dn in "
-                                       "\"suffixAlias <alias> <aliased_dn>\" line\n",
-                                       fname, lineno, 0 );
-#endif
-                               return( 1 );
-
-                       } else if ( cargc > 3 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: extra cruft in suffixAlias line (ignored)\n",
-                                       fname, lineno, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: extra cruft in suffixAlias line (ignored)\n",
-                                       fname, lineno, 0 );
-#endif
-                       }
-
-                       if ( be == NULL ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, INFO, 
-                                       "%s: line %d: suffix line must appear inside a database "
-                                       "definition.\n", fname, lineno, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: suffixAlias line"
-                                       " must appear inside a database definition.\n",
-                                       fname, lineno, 0 );
-#endif
-                               return 1;
-                       }
-
-                       if ( load_ucdata( NULL ) < 0 ) return 1;
-                       
-                       alias.bv_val = cargv[1];
-                       alias.bv_len = strlen( cargv[1] );
-
-                       rc = dnPrettyNormal( NULL, &alias, &palias, &nalias );
-                       if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: alias DN is invalid.\n", fname, lineno, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: alias DN is invalid\n",
-                                  fname, lineno, 0 );
-#endif
-                               return( 1 );
-                       }
-
-                       tmp_be = select_backend( &nalias, 0, 0 );
-                       free( nalias.bv_val );
-                       if ( tmp_be && tmp_be != be ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, INFO, 
-                                       "%s: line %d: suffixAlias served by a preceeding "
-                                       "backend \"%s\"\n", fname, lineno, 
-                                       tmp_be->be_suffix[0].bv_val );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: suffixAlias served by"
-                                       "  a preceeding backend \"%s\"\n",
-                                       fname, lineno, tmp_be->be_suffix[0].bv_val );
-#endif
-                               free( palias.bv_val );
-                               return -1;
-                       }
-
-                       aliased.bv_val = cargv[2];
-                       aliased.bv_len = strlen( cargv[2] );
-
-                       rc = dnPrettyNormal( NULL, &aliased, &paliased, &naliased );
-                       if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: aliased DN is invalid.\n", fname, lineno,0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: aliased DN is invalid\n",
-                                  fname, lineno, 0 );
-#endif
-                               free( palias.bv_val );
-                               return( 1 );
-                       }
-
-                       tmp_be = select_backend( &naliased, 0, 0 );
-                       free( naliased.bv_val );
-                       if ( tmp_be && tmp_be != be ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( CONFIG, INFO, 
-                                       "%s: line %d: suffixAlias derefs to a different backend "
-                                       "a preceeding backend \"%s\"\n",
-                                       fname, lineno, tmp_be->be_suffix[0].bv_val );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                       "%s: line %d: suffixAlias derefs to differnet backend"
-                                       "  a preceeding backend \"%s\"\n",
-                                       fname, lineno, tmp_be->be_suffix[0].bv_val );
-#endif
-                               free( palias.bv_val );
-                               free( paliased.bv_val );
-                               return -1;
-                       }
-
-                       ber_bvarray_add( &be->be_suffixAlias, &palias ); 
-                       ber_bvarray_add( &be->be_suffixAlias, &paliased );
-
                /* set max deref depth */
                } else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) {
                                        int i;
@@ -1119,7 +1168,7 @@ read_config( const char *fname, int depth )
 
                                rc = dnPrettyNormal( NULL, &dn,
                                        &be->be_rootdn,
-                                       &be->be_rootndn );
+                                       &be->be_rootndn, NULL );
 
                                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -1260,16 +1309,18 @@ read_config( const char *fname, int depth )
                                } else if( strcasecmp( cargv[i], "bind_anon_dn" ) == 0 ) {
                                        allows |= SLAP_ALLOW_BIND_ANON_DN;
 
+                               } else if( strcasecmp( cargv[i], "update_anon" ) == 0 ) {
+                                       allows |= SLAP_ALLOW_UPDATE_ANON;
+
                                } else if( strcasecmp( cargv[i], "none" ) != 0 ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG( CONFIG, CRIT, 
-                                                  "%s: line %d: unknown feature %s in "
-                                                  "\"allow <features>\" line.\n",
-                                                  fname, lineno, cargv[1] );
+                                       LDAP_LOG( CONFIG, CRIT, "%s: line %d: "
+                                               "unknown feature %s in \"allow <features>\" line.\n",
+                                               fname, lineno, cargv[1] );
 #else
-                                       Debug( LDAP_DEBUG_ANY,
-                   "%s: line %d: unknown feature %s in \"allow <features>\" line\n",
-                                           fname, lineno, cargv[i] );
+                                       Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                               "unknown feature %s in \"allow <features>\" line\n",
+                                               fname, lineno, cargv[i] );
 #endif
 
                                        return( 1 );
@@ -1320,9 +1371,6 @@ read_config( const char *fname, int depth )
                                } else if( strcasecmp( cargv[i], "bind_simple" ) == 0 ) {
                                        disallows |= SLAP_DISALLOW_BIND_SIMPLE;
 
-                               } else if( strcasecmp( cargv[i], "bind_simple_unprotected" ) == 0 ) {
-                                       disallows |= SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED;
-
                                } else if( strcasecmp( cargv[i], "bind_krbv4" ) == 0 ) {
                                        disallows |= SLAP_DISALLOW_BIND_KRBV4;
 
@@ -1483,6 +1531,12 @@ read_config( const char *fname, int depth )
                                        set->sss_update_sasl =
                                                atoi( &cargv[i][sizeof("update_sasl")] );
 
+                               } else if( strncasecmp( cargv[i], "simple_bind=",
+                                       sizeof("simple_bind") ) == 0 )
+                               {
+                                       set->sss_simple_bind =
+                                               atoi( &cargv[i][sizeof("simple_bind")] );
+
                                } else {
 #ifdef NEW_LOGGING
                                        LDAP_LOG( CONFIG, CRIT, 
@@ -1529,7 +1583,8 @@ read_config( const char *fname, int depth )
 
                        vals[0].bv_val = cargv[1];
                        vals[0].bv_len = strlen( vals[0].bv_val );
-                       value_add( &default_referral, vals );
+                       if( value_add( &default_referral, vals ) )
+                               return LDAP_OTHER;
 
 #ifdef NEW_LOGGING
                 } else if ( strcasecmp( cargv[0], "logfile" ) == 0 ) {
@@ -1577,9 +1632,21 @@ read_config( const char *fname, int depth )
 
                /* specify an objectclass */
                } else if ( strcasecmp( cargv[0], "objectclass" ) == 0 ) {
-                       if ( *cargv[1] == '(' ) {
+                       if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, 
+                                       "%s: line %d: illegal objectclass format.\n",
+                                       fname, lineno , 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                      "%s: line %d: illegal objectclass format.\n",
+                                      fname, lineno, 0 );
+#endif
+                               return( 1 );
+
+                       } else if ( *cargv[1] == '('  /*')'*/) {
                                char * p;
-                               p = strchr(saveline,'(');
+                               p = strchr(saveline,'(' /*')'*/);
                                rc = parse_oc( fname, lineno, p, cargv );
                                if( rc ) return rc;
 
@@ -1595,13 +1662,31 @@ read_config( const char *fname, int depth )
 #endif
                        }
 
+               } else if ( strcasecmp( cargv[0], "ditcontentrule" ) == 0 ) {
+                       char * p;
+                       p = strchr(saveline,'(' /*')'*/);
+                       rc = parse_cr( fname, lineno, p, cargv );
+                       if( rc ) return rc;
+
                /* specify an attribute type */
                } else if (( strcasecmp( cargv[0], "attributetype" ) == 0 )
                        || ( strcasecmp( cargv[0], "attribute" ) == 0 ))
                {
-                       if ( *cargv[1] == '(' ) {
+                       if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, "%s: line %d: "
+                                       "illegal attribute type format.\n",
+                                       fname, lineno , 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                       "illegal attribute type format.\n",
+                                       fname, lineno, 0 );
+#endif
+                               return( 1 );
+
+                       } else if ( *cargv[1] == '(' /*')'*/) {
                                char * p;
-                               p = strchr(saveline,'(');
+                               p = strchr(saveline,'(' /*')'*/);
                                rc = parse_at( fname, lineno, p, cargv );
                                if( rc ) return rc;
 
@@ -1618,6 +1703,13 @@ read_config( const char *fname, int depth )
 
                        }
 
+               /* define attribute option(s) */
+               } else if ( strcasecmp( cargv[0], "attributeoptions" ) == 0 ) {
+                       ad_define_option( NULL, NULL, 0 );
+                       for ( i = 1; i < cargc; i++ )
+                               if ( ad_define_option( cargv[i], fname, lineno ) != 0 )
+                                       return 1;
+
                /* turn on/off schema checking */
                } else if ( strcasecmp( cargv[0], "schemacheck" ) == 0 ) {
                        if ( cargc < 2 ) {
@@ -1674,16 +1766,36 @@ read_config( const char *fname, int depth )
                                ldap_syslog += atoi( cargv[1] );
                        }
 
+               /* list of sync replication information in this backend (slave only) */
+               } else if ( strcasecmp( cargv[0], "syncrepl" ) == 0 ) {
+
+                       if ( be == NULL ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, 
+                                           "%s: line %d: syncrepl line must appear inside "
+                                           "a database definition.\n", fname, lineno, 0);
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                           "%s: line %d: syncrepl line must appear inside "
+                                           "a database definition.\n", fname, lineno, 0);
+#endif
+                               return 1;
+                       } else {
+                               if ( add_syncrepl( be, cargv, cargc )) {
+                                       return 1;
+                               }
+                       }
+
                /* list of replicas of the data in this backend (master only) */
                } else if ( strcasecmp( cargv[0], "replica" ) == 0 ) {
                        if ( cargc < 2 ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG( CONFIG, CRIT, 
-                                       "%s: line %d: missing host in \"replica "
+                                       "%s: line %d: missing host or uri in \"replica "
                                        " <host[:port]\" line\n", fname, lineno , 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
-           "%s: line %d: missing host in \"replica <host[:port]>\" line\n",
+           "%s: line %d: missing host or uri in \"replica <host[:port]>\" line\n",
                                    fname, lineno, 0 );
 #endif
 
@@ -1710,16 +1822,62 @@ read_config( const char *fname, int depth )
                                                nr = add_replica_info( be, 
                                                        cargv[i] + 5 );
                                                break;
+                                       } else if (strncasecmp( cargv[i], "uri=", 4 )
+                                           == 0 ) {
+                                           if ( ldap_url_parse( cargv[ i ] + 4, &ludp )
+                                               != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, INFO, 
+                                                       "%s: line %d: replica line contains invalid "
+                                                       "uri definition.\n", fname, lineno, 0);
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: replica line contains invalid "
+                                                       "uri definition.\n", fname, lineno, 0);
+#endif
+                                                       return 1;
+                                               }
+                                               if (ludp->lud_host == NULL ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, INFO, 
+                                                       "%s: line %d: replica line contains invalid "
+                                                       "uri definition - missing hostname.\n", 
+                                                       fname, lineno, 0);
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                       "%s: line %d: replica line contains invalid "
+                                                       "uri definition - missing hostname.\n", fname, lineno, 0);
+#endif
+                                                       return 1;
+                                               }
+                                       replicahost = ch_malloc( strlen( cargv[ i ] ) );
+                                               if ( replicahost == NULL ) {
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( CONFIG, ERR, 
+                                                       "out of memory in read_config\n", 0, 0,0 );
+#else
+                                                       Debug( LDAP_DEBUG_ANY, 
+                                                       "out of memory in read_config\n", 0, 0, 0 );
+#endif
+                                                       ldap_free_urldesc( ludp );                              
+                                                       exit( EXIT_FAILURE );
+                                               }
+                                               sprintf(replicahost, "%s:%d", 
+                                                       ludp->lud_host, ludp->lud_port);
+                                               nr = add_replica_info( be, replicahost );
+                                               ldap_free_urldesc( ludp );                              
+                                               ch_free(replicahost);
+                                               break;
                                        }
                                }
                                if ( i == cargc ) {
 #ifdef NEW_LOGGING
                                        LDAP_LOG( CONFIG, INFO, 
-                                               "%s: line %d: missing host in \"replica\" line\n", 
+                                               "%s: line %d: missing host or uri in \"replica\" line\n", 
                                                fname, lineno , 0 );
 #else
                                        Debug( LDAP_DEBUG_ANY,
-                   "%s: line %d: missing host in \"replica\" line\n",
+                   "%s: line %d: missing host or uri in \"replica\" line\n",
                                            fname, lineno, 0 );
 #endif
                                        return 1;
@@ -1800,7 +1958,7 @@ read_config( const char *fname, int depth )
                                }
                        }
 
-               /* dn of master entity allowed to write to replica */
+               /* dn of slave entity allowed to write to replica */
                } else if ( strcasecmp( cargv[0], "updatedn" ) == 0 ) {
                        if ( cargc < 2 ) {
 #ifdef NEW_LOGGING
@@ -1836,7 +1994,7 @@ read_config( const char *fname, int depth )
                                dn.bv_val = cargv[1];
                                dn.bv_len = strlen( cargv[1] );
 
-                               rc = dnNormalize2( NULL, &dn, &be->be_update_ndn );
+                               rc = dnNormalize( 0, NULL, NULL, &dn, &be->be_update_ndn, NULL );
                                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                                        LDAP_LOG( CONFIG, CRIT, 
@@ -1905,7 +2063,8 @@ read_config( const char *fname, int depth )
 
                        vals[0].bv_val = cargv[1];
                        vals[0].bv_len = strlen( vals[0].bv_val );
-                       value_add( &be->be_update_refs, vals );
+                       if( value_add( &be->be_update_refs, vals ) )
+                               return LDAP_OTHER;
 
                /* replication log file to which changes are appended */
                } else if ( strcasecmp( cargv[0], "replogfile" ) == 0 ) {
@@ -2239,6 +2398,75 @@ read_config( const char *fname, int depth )
 #endif
 #endif /* !SLAPD_RLOOKUPS */
 
+               /* Netscape plugins */
+               } else if ( strcasecmp( cargv[0], "plugin" ) == 0 ) {
+#if defined( LDAP_SLAPI )
+
+#ifdef notdef /* allow global plugins, too */
+                       /*
+                        * a "plugin" line must be inside a database
+                        * definition, since we implement pre-,post- 
+                        * and extended operation plugins
+                        */
+                       if ( be == NULL ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, 
+                                       "%s: line %d: plugin line must appear "
+                                       "insid a database definition.\n",
+                                       fname, lineno, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: plugin "
+                                   "line must appear inside a database "
+                                   "definition\n", fname, lineno, 0 );
+#endif
+                               return( 1 );
+                       }
+#endif /* notdef */
+
+                       if ( netscape_plugin( be, fname, lineno, cargc, cargv ) 
+                                       != LDAP_SUCCESS ) {
+                               return( 1 );
+                       }
+                       slapi_plugins_used++;
+
+#else /* !defined( LDAP_SLAPI ) */
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CONFIG, INFO, 
+                               "%s: line %d: SLAPI not supported.\n",
+                               fname, lineno, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY, "%s: line %d: SLAPI "
+                           "not supported.\n", fname, lineno, 0 );
+#endif
+                       return( 1 );
+                       
+#endif /* !defined( LDAP_SLAPI ) */
+
+               /* Netscape plugins */
+               } else if ( strcasecmp( cargv[0], "pluginlog" ) == 0 ) {
+#if defined( LDAP_SLAPI )
+                       if ( cargc < 2 ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( CONFIG, INFO, 
+                                       "%s: line %d: missing file name "
+                                       "in pluginlog <filename> line.\n",
+                                       fname, lineno, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY, 
+                                       "%s: line %d: missing file name "
+                                       "in pluginlog <filename> line.\n",
+                                       fname, lineno, 0 );
+#endif
+                               return( 1 );
+                       }
+
+                       if ( slapi_log_file != NULL ) {
+                               ch_free( slapi_log_file );
+                       }
+
+                       slapi_log_file = ch_strdup( cargv[1] );
+#endif /* !defined( LDAP_SLAPI ) */
+
                /* pass anything else to the current backend info/db config routine */
                } else {
                        if ( bi != NULL ) {
@@ -2301,13 +2529,11 @@ read_config( const char *fname, int depth )
 
        if ( depth == 0 ) ch_free( cargv );
 
-#ifdef SLAPD_SCHEMA_DN
        if ( !global_schemadn.bv_val ) {
                ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1,
                        &global_schemadn );
-               dnNormalize2( NULL, &global_schemadn, &global_schemandn );
+               dnNormalize( 0, NULL, NULL, &global_schemadn, &global_schemandn, NULL );
        }
-#endif
 
        if ( load_ucdata( NULL ) < 0 ) return 1;
        return( 0 );
@@ -2528,14 +2754,475 @@ void
 config_destroy( )
 {
        ucdata_unload( UCDATA_ALL );
-#ifdef SLAPD_SCHEMA_DN
        free( global_schemandn.bv_val );
        free( global_schemadn.bv_val );
-#endif
        free( line );
        if ( slapd_args_file )
                free ( slapd_args_file );
        if ( slapd_pid_file )
                free ( slapd_pid_file );
+       if ( default_passwd_hash )
+               free( default_passwd_hash );
        acl_destroy( global_acl, NULL );
 }
+
+static int
+add_syncrepl(
+       Backend *be,
+       char    **cargv,
+       int     cargc
+)
+{
+       syncinfo_t *si;
+       syncinfo_t *si_entry;
+       int     rc = 0;
+       int duplicated_replica_id = 0;
+
+       si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) );
+
+       if ( si == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( CONFIG, ERR, "out of memory in add_syncrepl\n", 0, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "out of memory in add_syncrepl\n", 0, 0, 0 );
+#endif
+               return 1;
+       }
+
+       si->si_tls = SYNCINFO_TLS_OFF;
+       if ( be->be_rootndn.bv_val ) {
+               ber_dupbv( &si->si_updatedn, &be->be_rootndn );
+       }
+       si->si_bindmethod = LDAP_AUTH_SIMPLE;
+       si->si_schemachecking = 0;
+       ber_str2bv( "(objectclass=*)", sizeof("(objectclass=*)")-1, 0,
+               &si->si_filterstr );
+       si->si_base.bv_val = NULL;
+       si->si_scope = LDAP_SCOPE_SUBTREE;
+       si->si_attrsonly = 0;
+       si->si_attrs = (char **) ch_calloc( 1, sizeof( char * ));
+       si->si_attrs[0] = NULL;
+       si->si_type = LDAP_SYNC_REFRESH_ONLY;
+       si->si_interval = 86400;
+       si->si_syncCookie.ctxcsn = NULL;
+       si->si_syncCookie.octet_str = NULL;
+       si->si_syncCookie.sid = -1;
+       si->si_manageDSAit = 0;
+       si->si_tlimit = -1;
+       si->si_slimit = -1;
+       si->si_syncUUID_ndn.bv_val = NULL;
+       si->si_syncUUID_ndn.bv_len = 0;
+
+       si->si_presentlist = NULL;
+       LDAP_LIST_INIT( &si->si_nonpresentlist );
+
+       rc = parse_syncrepl_line( cargv, cargc, si );
+
+       LDAP_STAILQ_FOREACH( si_entry, &be->be_syncinfo, si_next ) {
+               if ( si->si_rid == si_entry->si_rid ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( CONFIG, ERR,
+                                       "add_syncrepl: duplicaetd replica id\n", 0, 0,0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                                       "add_syncrepl: duplicated replica id\n",0, 0, 0 );
+#endif
+                       duplicated_replica_id = 1;
+                       break;
+               }
+       }
+
+       if ( rc < 0 || duplicated_replica_id ) {
+               syncinfo_t *si_entry;
+               /* Something bad happened - back out */
+#ifdef NEW_LOGGING
+               LDAP_LOG( CONFIG, ERR, "failed to add syncinfo\n", 0, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "failed to add syncinfo\n", 0, 0, 0 );
+#endif
+
+               /* If error, remove all syncinfo */
+               LDAP_STAILQ_FOREACH( si_entry, &be->be_syncinfo, si_next ) {
+                       if ( si_entry->si_updatedn.bv_val ) {
+                               ch_free( si->si_updatedn.bv_val );
+                       }
+                       if ( si_entry->si_filterstr.bv_val ) {
+                               ch_free( si->si_filterstr.bv_val );
+                       }
+                       if ( si_entry->si_attrs ) {
+                               int i = 0;
+                               while ( si_entry->si_attrs[i] != NULL ) {
+                                       ch_free( si_entry->si_attrs[i] );
+                                       i++;
+                               }
+                               ch_free( si_entry->si_attrs );
+                       }
+               }
+
+               while ( !LDAP_STAILQ_EMPTY( &be->be_syncinfo )) {
+                       si_entry = LDAP_STAILQ_FIRST( &be->be_syncinfo );
+                       LDAP_STAILQ_REMOVE_HEAD( &be->be_syncinfo, si_next );
+                       ch_free( si_entry );
+               }
+               LDAP_STAILQ_INIT( &be->be_syncinfo );
+               return 1;
+       } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( CONFIG, RESULTS,
+                       "add_syncrepl: Config: ** successfully added syncrepl \"%s\"\n",
+                       si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_CONFIG,
+                       "Config: ** successfully added syncrepl \"%s\"\n",
+                       si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 );
+#endif
+               if ( !si->si_schemachecking ) {
+                       be->be_flags |= SLAP_BFLAG_NO_SCHEMA_CHECK;
+               }
+               si->si_be = be;
+               LDAP_STAILQ_INSERT_TAIL( &be->be_syncinfo, si, si_next );
+               return 0;
+       }
+}
+
+#define IDSTR                  "rid"
+#define PROVIDERSTR            "provider"
+#define SUFFIXSTR              "suffix"
+#define UPDATEDNSTR            "updatedn"
+#define BINDMETHSTR            "bindmethod"
+#define SIMPLESTR              "simple"
+#define SASLSTR                        "sasl"
+#define BINDDNSTR              "binddn"
+#define CREDSTR                        "credentials"
+#define OLDAUTHCSTR            "bindprincipal"
+#define AUTHCSTR               "authcID"
+#define AUTHZSTR               "authzID"
+#define SRVTABSTR              "srvtab"
+#define SASLMECHSTR            "saslmech"
+#define REALMSTR               "realm"
+#define SECPROPSSTR            "secprops"
+#define STARTTLSSTR            "starttls"
+#define CRITICALSTR            "critical"
+
+#define SCHEMASTR              "schemachecking"
+#define FILTERSTR              "filter"
+#define SEARCHBASESTR  "searchbase"
+#define SCOPESTR               "scope"
+#define ATTRSSTR               "attrs"
+#define ATTRSONLYSTR   "attrsonly"
+#define TYPESTR                        "type"
+#define INTERVALSTR            "interval"
+#define LASTMODSTR             "lastmod"
+#define LMREQSTR               "req"
+#define LMGENSTR               "gen"
+#define LMNOSTR                        "no"
+#define MANAGEDSAITSTR "manageDSAit"
+#define SLIMITSTR              "sizelimit"
+#define TLIMITSTR              "timelimit"
+
+#define GOT_ID                 0x0001
+#define GOT_PROVIDER   0x0002
+#define GOT_METHOD             0x0004
+#define GOT_ALL                        0x0007
+
+static int
+parse_syncrepl_line(
+       char            **cargv,
+       int             cargc,
+       syncinfo_t      *si
+)
+{
+       int     gots = 0;
+       int     i, j;
+       char    *hp, *val;
+       int     nr_attr = 0;
+
+       for ( i = 1; i < cargc; i++ ) {
+               if ( !strncasecmp( cargv[ i ], IDSTR, sizeof( IDSTR ) - 1 )) {
+                       int tmp;
+                       /* '\0' string terminator accounts for '=' */
+                       val = cargv[ i ] + sizeof( IDSTR );
+                       tmp= atoi( val );
+                       if ( tmp >= 1000 || tmp < 0 ) {
+                               fprintf( stderr, "Error: parse_syncrepl_line: "
+                                        "syncrepl id %d is out of range [0..999]\n", tmp );
+                               return -1;
+                       }
+                       si->si_rid = tmp;
+                       gots |= GOT_ID;
+               } else if ( !strncasecmp( cargv[ i ], PROVIDERSTR,
+                                       sizeof( PROVIDERSTR ) - 1 )) {
+                       val = cargv[ i ] + sizeof( PROVIDERSTR );
+                       si->si_provideruri = ch_strdup( val );
+                       si->si_provideruri_bv = (BerVarray)
+                               ch_calloc( 2, sizeof( struct berval ));
+                       ber_str2bv( si->si_provideruri, strlen( si->si_provideruri ),
+                               0, &si->si_provideruri_bv[0] );
+                       si->si_provideruri_bv[1].bv_len = 0;
+                       si->si_provideruri_bv[1].bv_val = NULL;
+                       gots |= GOT_PROVIDER;
+               } else if ( !strncasecmp( cargv[ i ], STARTTLSSTR,
+                       sizeof(STARTTLSSTR) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( STARTTLSSTR );
+                       if( !strcasecmp( val, CRITICALSTR ) ) {
+                               si->si_tls = SYNCINFO_TLS_CRITICAL;
+                       } else {
+                               si->si_tls = SYNCINFO_TLS_ON;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       UPDATEDNSTR, sizeof( UPDATEDNSTR ) - 1 ) )
+               {
+                       struct berval updatedn = {0, NULL};
+                       val = cargv[ i ] + sizeof( UPDATEDNSTR );
+                       ber_str2bv( val, 0, 0, &updatedn );
+                       ch_free( si->si_updatedn.bv_val );
+                       dnNormalize( 0, NULL, NULL, &updatedn, &si->si_updatedn, NULL );
+               } else if ( !strncasecmp( cargv[ i ], BINDMETHSTR,
+                               sizeof( BINDMETHSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( BINDMETHSTR );
+                       if ( !strcasecmp( val, SIMPLESTR )) {
+                               si->si_bindmethod = LDAP_AUTH_SIMPLE;
+                               gots |= GOT_METHOD;
+                       } else if ( !strcasecmp( val, SASLSTR )) {
+#ifdef HAVE_CYRUS_SASL
+                               si->si_bindmethod = LDAP_AUTH_SASL;
+                               gots |= GOT_METHOD;
+#else /* HAVE_CYRUS_SASL */
+                               fprintf( stderr, "Error: parse_syncrepl_line: "
+                                       "not compiled with SASL support\n" );
+                               return 1;
+#endif /* HAVE_CYRUS_SASL */
+                       } else {
+                               si->si_bindmethod = -1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                               BINDDNSTR, sizeof( BINDDNSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( BINDDNSTR );
+                       si->si_binddn = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               CREDSTR, sizeof( CREDSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( CREDSTR );
+                       si->si_passwd = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               SASLMECHSTR, sizeof( SASLMECHSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( SASLMECHSTR );
+                       si->si_saslmech = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               SECPROPSSTR, sizeof( SECPROPSSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( SECPROPSSTR );
+                       si->si_secprops = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               REALMSTR, sizeof( REALMSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( REALMSTR );
+                       si->si_realm = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               AUTHCSTR, sizeof( AUTHCSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( AUTHCSTR );
+                       si->si_authcId = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               OLDAUTHCSTR, sizeof( OLDAUTHCSTR ) - 1 ) ) {
+                       /* Old authcID is provided for some backwards compatibility */
+                       val = cargv[ i ] + sizeof( OLDAUTHCSTR );
+                       si->si_authcId = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) {
+                       val = cargv[ i ] + sizeof( AUTHZSTR );
+                       si->si_authzId = ch_strdup( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                               SCHEMASTR, sizeof( SCHEMASTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( SCHEMASTR );
+                       if ( !strncasecmp( val, "on", sizeof( "on" ) - 1 )) {
+                               si->si_schemachecking = 1;
+                       } else if ( !strncasecmp( val, "off", sizeof( "off" ) - 1 ) ) {
+                               si->si_schemachecking = 0;
+                       } else {
+                               si->si_schemachecking = 1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       FILTERSTR, sizeof( FILTERSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( FILTERSTR );
+                       ber_str2bv( val, 0, 1, &si->si_filterstr );
+               } else if ( !strncasecmp( cargv[ i ],
+                       SEARCHBASESTR, sizeof( SEARCHBASESTR ) - 1 ) )
+               {
+                       struct berval bv;
+                       val = cargv[ i ] + sizeof( SEARCHBASESTR );
+                       if ( si->si_base.bv_val ) {
+                               ch_free( si->si_base.bv_val );
+                       }
+                       ber_str2bv( val, 0, 0, &bv );
+                       if ( dnNormalize( 0, NULL, NULL, &bv, &si->si_base, NULL )) {
+                               fprintf( stderr, "Invalid base DN \"%s\"\n", val );
+                               return 1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       SCOPESTR, sizeof( SCOPESTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( SCOPESTR );
+                       if ( !strncasecmp( val, "base", sizeof( "base" ) - 1 )) {
+                               si->si_scope = LDAP_SCOPE_BASE;
+                       } else if ( !strncasecmp( val, "one", sizeof( "one" ) - 1 )) {
+                               si->si_scope = LDAP_SCOPE_ONELEVEL;
+                       } else if ( !strncasecmp( val, "sub", sizeof( "sub" ) - 1 )) {
+                               si->si_scope = LDAP_SCOPE_SUBTREE;
+                       } else {
+                               fprintf( stderr, "Error: parse_syncrepl_line: "
+                                       "unknown scope \"%s\"\n", val);
+                               return 1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       ATTRSONLYSTR, sizeof( ATTRSONLYSTR ) - 1 ) )
+               {
+                       si->si_attrsonly = 1;
+               } else if ( !strncasecmp( cargv[ i ],
+                       ATTRSSTR, sizeof( ATTRSSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( ATTRSSTR );
+                       str2clist( &si->si_attrs, val, "," );
+               } else if ( !strncasecmp( cargv[ i ],
+                       TYPESTR, sizeof( TYPESTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( TYPESTR );
+                       if ( !strncasecmp( val, "refreshOnly", sizeof("refreshOnly")-1 )) {
+                               si->si_type = LDAP_SYNC_REFRESH_ONLY;
+                       } else if ( !strncasecmp( val, "refreshAndPersist",
+                               sizeof("refreshAndPersist")-1 ))
+                       {
+                               si->si_type = LDAP_SYNC_REFRESH_AND_PERSIST;
+                               si->si_interval = 60;
+                       } else {
+                               fprintf( stderr, "Error: parse_syncrepl_line: "
+                                       "unknown sync type \"%s\"\n", val);
+                               return 1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( INTERVALSTR );
+                       if ( si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST ) {
+                               si->si_interval = 0;
+                       } else {
+                               char *hstr;
+                               char *mstr;
+                               char *dstr;
+                               char *sstr;
+                               int dd, hh, mm, ss;
+                               dstr = val;
+                               hstr = strchr( dstr, ':' );
+                               if ( hstr == NULL ) {
+                                       fprintf( stderr, "Error: parse_syncrepl_line: "
+                                               "invalid interval \"%s\"\n", val );
+                                       return 1;
+                               }
+                               *hstr++ = '\0';
+                               mstr = strchr( hstr, ':' );
+                               if ( mstr == NULL ) {
+                                       fprintf( stderr, "Error: parse_syncrepl_line: "
+                                               "invalid interval \"%s\"\n", val );
+                                       return 1;
+                               }
+                               *mstr++ = '\0';
+                               sstr = strchr( mstr, ':' );
+                               if ( sstr == NULL ) {
+                                       fprintf( stderr, "Error: parse_syncrepl_line: "
+                                               "invalid interval \"%s\"\n", val );
+                                       return 1;
+                               }
+                               *sstr++ = '\0';
+
+                               dd = atoi( dstr );
+                               hh = atoi( hstr );
+                               mm = atoi( mstr );
+                               ss = atoi( sstr );
+                               if (( hh > 24 ) || ( hh < 0 ) ||
+                                       ( mm > 60 ) || ( mm < 0 ) ||
+                                       ( ss > 60 ) || ( ss < 0 ) || ( dd < 0 )) {
+                                       fprintf( stderr, "Error: parse_syncrepl_line: "
+                                               "invalid interval \"%s\"\n", val );
+                                       return 1;
+                               }
+                               si->si_interval = (( dd * 24 + hh ) * 60 + mm ) * 60 + ss;
+                       }
+                       if ( si->si_interval < 0 ) {
+                               fprintf( stderr, "Error: parse_syncrepl_line: "
+                                       "invalid interval \"%ld\"\n",
+                                       (long) si->si_interval);
+                               return 1;
+                       }
+               } else if ( !strncasecmp( cargv[ i ],
+                       MANAGEDSAITSTR, sizeof( MANAGEDSAITSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( MANAGEDSAITSTR );
+                       si->si_manageDSAit = atoi( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                       SLIMITSTR, sizeof( SLIMITSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( SLIMITSTR );
+                       si->si_slimit = atoi( val );
+               } else if ( !strncasecmp( cargv[ i ],
+                       TLIMITSTR, sizeof( TLIMITSTR ) - 1 ) )
+               {
+                       val = cargv[ i ] + sizeof( TLIMITSTR );
+                       si->si_tlimit = atoi( val );
+               } else {
+                       fprintf( stderr, "Error: parse_syncrepl_line: "
+                               "unknown keyword \"%s\"\n", cargv[ i ] );
+               }
+       }
+
+       if ( gots != GOT_ALL ) {
+               fprintf( stderr,
+                       "Error: Malformed \"syncrepl\" line in slapd config file" );
+               return -1;
+       }
+
+       return 0;
+}
+
+char **
+str2clist( char ***out, char *in, const char *brkstr )
+{
+       char    *str;
+       char    *s;
+       char    *lasts;
+       int     i, j;
+       const char *text;
+       char    **new;
+
+       /* find last element in list */
+       for (i = 0; *out && *out[i]; i++);
+
+       /* protect the input string from strtok */
+       str = ch_strdup( in );
+
+       if ( *str == '\0' ) {
+               free( str );
+               return( *out );
+       }
+
+       /* Count words in string */
+       j=1;
+       for ( s = str; *s; s++ ) {
+               if ( strchr( brkstr, *s ) != NULL ) {
+                       j++;
+               }
+       }
+
+       *out = ch_realloc( *out, ( i + j + 1 ) * sizeof( char * ) );
+       new = *out + i;
+       for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
+               s != NULL;
+               s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
+       {
+               *new = ch_strdup( s );
+               new++;
+       }
+
+       *new = NULL;
+       free( str );
+       return( *out );
+}