X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=cbfc9482ca0ad0b4017b9da8197eba52b976bc05;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=a3c450af9b452d27ebbe993499b16ff96d4a272d;hpb=77b58e69a586a4da5b4b02790c225abf08f0daa0;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index a3c450af9b..cbfc9482ca 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1,8 +1,27 @@
 /* config.c - configuration file handling routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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"
@@ -73,6 +92,10 @@ char   *strtok_quote_ptr;
 
 int use_reverse_lookup = 0;
 
+#ifdef LDAP_SLAPI
+int slapi_plugins_used = 0;
+#endif
+
 static char	*fp_getline(FILE *fp, int *lineno);
 static void	fp_getline_init(int *lineno);
 static int	fp_parse_line(int lineno, char *line);
@@ -80,10 +103,8 @@ static int	fp_parse_line(int lineno, char *line);
 static char	*strtok_quote(char *line, char *sep);
 static int      load_ucdata(char *path);
 
-#ifdef LDAP_SYNCREPL
-static void     add_syncrepl LDAP_P(( Backend *, char **, int ));
+static int     add_syncrepl LDAP_P(( Backend *, char **, int ));
 static int      parse_syncrepl_line LDAP_P(( char **, int, syncinfo_t *));
-#endif
 
 int
 read_config( const char *fname, int depth )
@@ -94,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;
@@ -910,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
@@ -921,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;
@@ -968,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 */
@@ -1622,13 +1662,11 @@ read_config( const char *fname, int depth )
 #endif
 			}
 
-#ifdef SLAP_EXTENDED_SCHEMA
 		} else if ( strcasecmp( cargv[0], "ditcontentrule" ) == 0 ) {
 			char * p;
 			p = strchr(saveline,'(' /*')'*/);
 			rc = parse_cr( fname, lineno, p, cargv );
 			if( rc ) return rc;
-#endif
 
 		/* specify an attribute type */
 		} else if (( strcasecmp( cargv[0], "attributetype" ) == 0 )
@@ -1728,23 +1766,36 @@ read_config( const char *fname, int depth )
 				ldap_syslog += atoi( cargv[1] );
 			}
 
-#ifdef LDAP_SYNCREPL
 		/* list of sync replication information in this backend (slave only) */
 		} else if ( strcasecmp( cargv[0], "syncrepl" ) == 0 ) {
 
-			add_syncrepl( be, cargv, cargc );
+			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
 
@@ -1771,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;
@@ -1861,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
@@ -1897,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, NULL );
+				rc = dnNormalize( 0, NULL, NULL, &dn, &be->be_update_ndn, NULL );
 				if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 					LDAP_LOG( CONFIG, CRIT, 
@@ -2315,7 +2412,7 @@ read_config( const char *fname, int depth )
 #ifdef NEW_LOGGING
 				LDAP_LOG( CONFIG, INFO, 
 					"%s: line %d: plugin line must appear "
-					"inside a database definition.\n",
+					"insid a database definition.\n",
 					fname, lineno, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY, "%s: line %d: plugin "
@@ -2330,6 +2427,7 @@ read_config( const char *fname, int depth )
 					!= LDAP_SUCCESS ) {
 				return( 1 );
 			}
+			slapi_plugins_used++;
 
 #else /* !defined( LDAP_SLAPI ) */
 #ifdef NEW_LOGGING
@@ -2434,7 +2532,7 @@ read_config( const char *fname, int depth )
 	if ( !global_schemadn.bv_val ) {
 		ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1,
 			&global_schemadn );
-		dnNormalize2( NULL, &global_schemadn, &global_schemandn, NULL );
+		dnNormalize( 0, NULL, NULL, &global_schemadn, &global_schemandn, NULL );
 	}
 
 	if ( load_ucdata( NULL ) < 0 ) return 1;
@@ -2668,8 +2766,7 @@ config_destroy( )
 	acl_destroy( global_acl, NULL );
 }
 
-#ifdef LDAP_SYNCREPL
-static void
+static int
 add_syncrepl(
 	Backend *be,
 	char    **cargv,
@@ -2677,8 +2774,11 @@ add_syncrepl(
 )
 {
 	syncinfo_t *si;
+	syncinfo_t *si_entry;
+	int	rc = 0;
+	int duplicated_replica_id = 0;
 
-	si = be->syncinfo = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) );
+	si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) );
 
 	if ( si == NULL ) {
 #ifdef NEW_LOGGING
@@ -2686,49 +2786,144 @@ add_syncrepl(
 #else
 		Debug( LDAP_DEBUG_ANY, "out of memory in add_syncrepl\n", 0, 0, 0 );
 #endif
-		exit( EXIT_FAILURE );
+		return 1;
 	}
 
-	if ( parse_syncrepl_line( cargv, cargc, si ) < 0 ) {
+	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
-		free( si );
-		be->syncinfo = NULL;
+
+		/* 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%d\"\n",
-			si->mastername == NULL ? "(null)" : si->mastername,
-			si->masterport, 0 );
+			"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:%d\"\n",
-			si->mastername == NULL ? "(null)" : si->mastername,
-			si->masterport, 0 );
+			"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;
 	}
-
-	si->be = be;
 }
 
+#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_HOST		0x0002
-#define GOT_DN			0x0004
-#define GOT_METHOD		0x0008
-#define GOT_MECH		0x0010
-#define GOT_FILTER		0x0020
-#define GOT_SEARCHBASE	0x0040
-#define GOT_SCOPE		0x0080
-#define GOT_ATTRS		0x0100
-#define GOT_TYPE		0x0200
-#define GOT_INTERVAL	0x0400
-#define GOT_LASTMOD		0x0800
-
-#define GOT_ALL			0x0FFF
+#define GOT_PROVIDER	0x0002
+#define GOT_METHOD		0x0004
+#define GOT_ALL			0x0007
 
 static int
 parse_syncrepl_line(
@@ -2744,237 +2939,290 @@ parse_syncrepl_line(
 
 	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 );
-			si->id = atoi( val );
-			gots |= GOT_ID;
-		} else if ( !strncasecmp( cargv[ i ], MASTERSTR,
-					sizeof( MASTERSTR ) - 1 )) {
-			val = cargv[ i ] + sizeof( MASTERSTR );
-			si->masteruri = strdup( val );
-			if (( hp = strchr( val, ':' )) != NULL ) {
-				if ( *( hp + 1 ) == '/' ) {
-					if ( *( hp + 2 ) == '/' ) {
-						val = hp + 3;
-					}
-					if (( hp = strchr( hp+1, ':' )) != NULL ) {
-						*hp = '\0';
-						hp++;
-						si->masterport = atoi( hp );
-					}
-				} else {
-					*hp = '\0';
-					hp++;
-					si->masterport = atoi( hp );
-				}
-			}
-			if ( si->masterport <= 0 ) {
-				si->masterport = 0;
+			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->mastername = strdup( val );
-			gots |= GOT_HOST;
-		} else if ( !strncasecmp( cargv[ i ], TLSSTR, sizeof( TLSSTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( TLSSTR );
-			if( !strcasecmp( val, TLSCRITICALSTR ) ) {
-				si->tls = TLS_CRITICAL;
+			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->tls = TLS_ON;
+				si->si_tls = SYNCINFO_TLS_ON;
 			}
 		} else if ( !strncasecmp( cargv[ i ],
-				"binddn", sizeof( BINDDNSTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( BINDDNSTR );
-			si->binddn = strdup( val );
-			gots |= GOT_DN;
+			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 ) ) {
+				sizeof( BINDMETHSTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( BINDMETHSTR );
 			if ( !strcasecmp( val, SIMPLESTR )) {
-				si->bindmethod = LDAP_AUTH_SIMPLE;
+				si->si_bindmethod = LDAP_AUTH_SIMPLE;
 				gots |= GOT_METHOD;
 			} else if ( !strcasecmp( val, SASLSTR )) {
-				si->bindmethod = LDAP_AUTH_SASL;
+#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->bindmethod = -1;
-			}
-		} else if ( !strncasecmp( cargv[ i ], LASTMODSTR,
-				sizeof( LASTMODSTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( LASTMODSTR );
-			if ( !strcasecmp( val, LMREQSTR )) {
-				si->lastmod = LASTMOD_REQ;
-				gots |= GOT_LASTMOD;
-			} else if ( !strcasecmp( val, LMGENSTR )) {
-				si->lastmod = LASTMOD_GEN;
-				gots |= GOT_LASTMOD;
-			} else if ( !strcasecmp( val, LMNOSTR )) {
-				si->lastmod = LASTMOD_NO;
-				gots |= GOT_LASTMOD;
-			} else {
-				si->lastmod = -1;
+				si->si_bindmethod = -1;
 			}
 		} else if ( !strncasecmp( cargv[ i ],
-				SASLMECHSTR, sizeof( SASLMECHSTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( SASLMECHSTR );
-			gots |= GOT_MECH;
-			si->saslmech = strdup( val );
+				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->passwd = strdup( val );
+			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->secprops = strdup( val );
+			si->si_secprops = ch_strdup( val );
 		} else if ( !strncasecmp( cargv[ i ],
 				REALMSTR, sizeof( REALMSTR ) - 1 ) ) {
 			val = cargv[ i ] + sizeof( REALMSTR );
-			si->realm = strdup( val );
+			si->si_realm = ch_strdup( val );
 		} else if ( !strncasecmp( cargv[ i ],
 				AUTHCSTR, sizeof( AUTHCSTR ) - 1 ) ) {
 			val = cargv[ i ] + sizeof( AUTHCSTR );
-			si->authcId = strdup( val );
+			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->authcId = strdup( val );
+			si->si_authcId = ch_strdup( val );
 		} else if ( !strncasecmp( cargv[ i ],
 				AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) {
 			val = cargv[ i ] + sizeof( AUTHZSTR );
-			si->authzId = strdup( val );
+			si->si_authzId = ch_strdup( val );
 		} else if ( !strncasecmp( cargv[ i ],
-				SRVTABSTR, sizeof( SRVTABSTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( SRVTABSTR );
-			if ( si->srvtab != NULL ) {
-				free( si->srvtab );
+				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;
 			}
-			si->srvtab = strdup( val );
 		} else if ( !strncasecmp( cargv[ i ],
-				FILTERSTR, sizeof( FILTERSTR ) - 1 ) ) {
+			FILTERSTR, sizeof( FILTERSTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( FILTERSTR );
-			gots |= GOT_FILTER;
-			si->filterstr = strdup( val );
+			ber_str2bv( val, 0, 1, &si->si_filterstr );
 		} else if ( !strncasecmp( cargv[ i ],
-				SEARCHBASESTR, sizeof( SEARCHBASESTR ) - 1 ) ) {
+			SEARCHBASESTR, sizeof( SEARCHBASESTR ) - 1 ) )
+		{
+			struct berval bv;
 			val = cargv[ i ] + sizeof( SEARCHBASESTR );
-			gots |= GOT_SEARCHBASE;
-			si->base = strdup( val );
+			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 ) ) {
+			SCOPESTR, sizeof( SCOPESTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( SCOPESTR );
-			gots |= GOT_SCOPE;
 			if ( !strncasecmp( val, "base", sizeof( "base" ) - 1 )) {
-				si->scope = LDAP_SCOPE_BASE;
+				si->si_scope = LDAP_SCOPE_BASE;
 			} else if ( !strncasecmp( val, "one", sizeof( "one" ) - 1 )) {
-				si->scope = LDAP_SCOPE_ONELEVEL;
+				si->si_scope = LDAP_SCOPE_ONELEVEL;
 			} else if ( !strncasecmp( val, "sub", sizeof( "sub" ) - 1 )) {
-				si->scope = LDAP_SCOPE_SUBTREE;
+				si->si_scope = LDAP_SCOPE_SUBTREE;
 			} else {
 				fprintf( stderr, "Error: parse_syncrepl_line: "
-								 "unknown scope \"%s\"\n", val);
+					"unknown scope \"%s\"\n", val);
 				return 1;
 			}
 		} else if ( !strncasecmp( cargv[ i ],
-				ATTRSONLYSTR, sizeof( ATTRSONLYSTR ) - 1 ) ) {
-			si->attrsonly = 1;
+			ATTRSONLYSTR, sizeof( ATTRSONLYSTR ) - 1 ) )
+		{
+			si->si_attrsonly = 1;
 		} else if ( !strncasecmp( cargv[ i ],
-				ATTRSSTR, sizeof( ATTRSSTR ) - 1 ) ) {
-			char **tmp;
+			ATTRSSTR, sizeof( ATTRSSTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( ATTRSSTR );
-			for ( ; hp = strchr( val, ' ' ); val = ++hp ) {
-				*hp = '\0';
-				if ( *val != '\0' ) {
-					nr_attr++;
-					tmp = (char **) ch_realloc( si->attrs, nr_attr * sizeof( char * ));
-					if ( tmp == NULL ) {
-#ifdef NEW_LOGGING
-						LDAP_LOG( CONFIG, ERR, "out of memory\n", 0,0,0 );
-#else
-						Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 );
-#endif
-						return -1;
-					}
-					si->attrs = tmp;
-					si->attrs[ nr_attr - 1 ] = strdup( val );
-				}
-			}
-			if ( *val != '\0' ) {
-				nr_attr++;
-				tmp = (char **) ch_realloc( si->attrs, nr_attr * sizeof( char * ));
-				if ( tmp == NULL ) {
-#ifdef NEW_LOGGING
-					LDAP_LOG( CONFIG, ERR, "out of memory\n", 0,0,0 );
-#else
-					Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 );
-#endif
-					return -1;
-				}
-				si->attrs = tmp;
-				si->attrs[ nr_attr - 1 ] = strdup( val );
-			}
-			nr_attr++;
-			tmp = (char **) ch_realloc( si->attrs, nr_attr * sizeof( char * ));
-			if ( tmp == NULL ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( CONFIG, ERR, "out of memory\n", 0,0,0 );
-#else
-				Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 );
-#endif
-				return -1;
-			}
-			si->attrs = tmp;
-			si->attrs[ nr_attr - 1 ] = NULL;
-			gots |= GOT_ATTRS;
+			str2clist( &si->si_attrs, val, "," );
 		} else if ( !strncasecmp( cargv[ i ],
-				TYPESTR, sizeof( TYPESTR ) - 1 ) ) {
+			TYPESTR, sizeof( TYPESTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( TYPESTR );
-			gots |= GOT_TYPE;
-			if ( !strncasecmp( val, "refreshOnly", sizeof( "refreshOnly" ) - 1 )) {
-				si->type = LDAP_SYNC_REFRESH_ONLY;
-			} else if ( !strncasecmp( val, "refreshAndPersist", sizeof( "refreshAndPersist" ) - 1 )) {
-				gots |= GOT_INTERVAL;
-				si->type = LDAP_SYNC_REFRESH_AND_PERSIST;
+			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);
+					"unknown sync type \"%s\"\n", val);
 				return 1;
 			}
 		} else if ( !strncasecmp( cargv[ i ],
-				INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) ) {
+			INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) )
+		{
 			val = cargv[ i ] + sizeof( INTERVALSTR );
-			gots |= GOT_INTERVAL;
-			si->interval = atoi( val );
-			if ( si->interval <= 0 ) {
+			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 \"%d\"\n", si->interval);
+					"invalid interval \"%ld\"\n",
+					(long) si->si_interval);
 				return 1;
 			}
 		} else if ( !strncasecmp( cargv[ i ],
-				COOKIESTR, sizeof( COOKIESTR ) - 1 ) ) {
-			val = cargv[ i ] + sizeof( COOKIESTR );
-			si->syncCookie = ber_str2bv( val, strlen( val ), 1, NULL );
+			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 ] );
+				"unknown keyword \"%s\"\n", cargv[ i ] );
 		}
 	}
 
-	if ( si->bindmethod == LDAP_AUTH_SASL) {
-		if ((gots & GOT_MECH) == 0) {
-			fprintf( stderr, "Error: \"syncrepl\" line needs SASLmech flag " );
-			                 "in slapd config file\n" );
-			return -1;
-		}
-	}
-
-	gots |= GOT_MECH;
-
 	if ( gots != GOT_ALL ) {
-		fprintf( stderr, "Error: Malformed \"syncrepl\" line in slapd config file"
- );
+		fprintf( stderr,
+			"Error: Malformed \"syncrepl\" line in slapd config file" );
 		return -1;
 	}
 
 	return 0;
 }
-#endif /* LDAP_SYNCREPL */
+
+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 );
+}