/* 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"
#include "ldap_pvt.h"
#include "slap.h"
#ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
#endif
#include "lutil.h"
int use_reverse_lookup = 0;
-static char *fp_getline(FILE *fp, int *lineno);
-static void fp_getline_init(int *lineno);
-static int fp_parse_line(int lineno, char *line);
+#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);
static char *strtok_quote(char *line, char *sep);
-static int load_ucdata(char *path);
+static int load_ucdata(char *path);
-#ifdef LDAP_SYNCREPL
-static void add_syncrepl LDAP_P(( Backend *, char **, int ));
-static int parse_syncrepl_line LDAP_P(( char **, int, syncinfo_t *));
-#endif
+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 )
#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 )
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 ) {
}
}
- /* 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
#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 "
}
#endif /* notdef */
- if ( netscape_plugin( be, fname, lineno, cargc, cargv )
+ if ( slapi_int_read_config( be, fname, lineno, cargc, cargv )
!= LDAP_SUCCESS ) {
return( 1 );
}
+ slapi_plugins_used++;
#else /* !defined( LDAP_SLAPI ) */
#ifdef NEW_LOGGING
/* pass anything else to the current backend info/db config routine */
} else {
if ( bi != NULL ) {
- if ( bi->bi_config == 0 ) {
+ if ( bi->bi_config ) {
+ rc = (*bi->bi_config)( bi, fname, lineno, cargc, cargv );
+
+ switch ( rc ) {
+ case 0:
+ break;
+
+ case SLAP_CONF_UNKNOWN:
#ifdef NEW_LOGGING
- LDAP_LOG( CONFIG, INFO,
- "%s: line %d: unknown directive \"%s\" inside "
- "backend info definition (ignored).\n",
- fname, lineno, cargv[0] );
+ LDAP_LOG( CONFIG, INFO,
+ "%s: line %d: unknown directive \"%s\" inside "
+ "backend info definition (ignored).\n",
+ fname, lineno, cargv[0] );
#else
- Debug( LDAP_DEBUG_ANY,
+ Debug( LDAP_DEBUG_ANY,
"%s: line %d: unknown directive \"%s\" inside backend info definition (ignored)\n",
- fname, lineno, cargv[0] );
+ fname, lineno, cargv[0] );
#endif
+ break;
- } else {
- if ( (*bi->bi_config)( bi, fname, lineno, cargc, cargv )
- != 0 )
- {
- return( 1 );
+ default:
+ return 1;
}
}
+
} else if ( be != NULL ) {
- if ( be->be_config == 0 ) {
+ if ( be->be_config ) {
+ rc = (*be->be_config)( be, fname, lineno, cargc, cargv );
+
+ switch ( rc ) {
+ case 0:
+ break;
+
+ case SLAP_CONF_UNKNOWN:
#ifdef NEW_LOGGING
- LDAP_LOG( CONFIG, INFO,
- "%s: line %d: uknown directive \"%s\" inside "
- "backend database definition (ignored).\n",
- fname, lineno, cargv[0] );
+ LDAP_LOG( CONFIG, INFO,
+ "%s: line %d: unknown directive \"%s\" inside "
+ "backend database definition (ignored).\n",
+ fname, lineno, cargv[0] );
#else
- Debug( LDAP_DEBUG_ANY,
+ Debug( LDAP_DEBUG_ANY,
"%s: line %d: unknown directive \"%s\" inside backend database definition (ignored)\n",
- fname, lineno, cargv[0] );
+ fname, lineno, cargv[0] );
#endif
+ break;
- } else {
- if ( (*be->be_config)( be, fname, lineno, cargc, cargv )
- != 0 )
- {
- return( 1 );
+ default:
+ return 1;
}
}
+
} else {
#ifdef NEW_LOGGING
LDAP_LOG( CONFIG, INFO,
acl_destroy( global_acl, NULL );
}
-#ifdef LDAP_SYNCREPL
-static void
+static int
add_syncrepl(
Backend *be,
char **cargv,
)
{
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 ) );
-
- /* set default values; FIXME : add others */
- si->tls = TLS_OFF;
- if ( be->be_rootndn.bv_val )
- ber_dupbv( &si->updatedn, &be->be_rootndn );
- si->bindmethod = LDAP_AUTH_SIMPLE;
- si->lastmod = LASTMOD_NO;
- si->filterstr = "(objectclass=*)";
- if ( be->be_suffix && be->be_suffix[0].bv_val )
- si->base = ch_strdup( be->be_suffix[0].bv_val );
- si->scope = LDAP_SCOPE_SUBTREE;
- si->attrsonly = 0;
- si->attrsexclude = 0;
- si->attrs = (char **) ch_calloc( 1, sizeof( char * ));
- si->attrs[0] = NULL;
- si->type = LDAP_SYNC_REFRESH_ONLY;
- si->interval = 86400;
- si->syncCookie = NULL;
- si->manageDSAit = 0;
- si->tlimit = -1;
- si->slimit = -1;
- si->syncUUID = NULL;
- si->syncUUID_ndn = NULL;
- si->sync_mode = LDAP_SYNC_STATE_MODE;
-
- si->presentlist = NULL;
- LDAP_LIST_INIT( &si->nonpresentlist );
+ si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) );
if ( si == NULL ) {
#ifdef NEW_LOGGING
#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: duplicated 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\"\n",
- si->provideruri == NULL ? "(null)" : si->provideruri, 0, 0 );
+ si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 );
#else
Debug( LDAP_DEBUG_CONFIG,
"Config: ** successfully added syncrepl \"%s\"\n",
- si->provideruri == NULL ? "(null)" : si->provideruri, 0, 0 );
+ si->si_provideruri == NULL ? "(null)" : si->si_provideruri, 0, 0 );
#endif
- be->be_flags |= SLAP_BFLAG_NO_SCHEMA_CHECK;
- si->be = be;
+ 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 "id"
+#define IDSTR "rid"
#define PROVIDERSTR "provider"
#define SUFFIXSTR "suffix"
#define UPDATEDNSTR "updatedn"
#define STARTTLSSTR "starttls"
#define CRITICALSTR "critical"
+#define SCHEMASTR "schemachecking"
#define FILTERSTR "filter"
#define SEARCHBASESTR "searchbase"
#define SCOPESTR "scope"
#define ATTRSONLYSTR "attrsonly"
#define TYPESTR "type"
#define INTERVALSTR "interval"
-#define COOKIESTR "cookie"
#define LASTMODSTR "lastmod"
#define LMREQSTR "req"
#define LMGENSTR "gen"
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 );
+ 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->provideruri = ch_strdup( val );
- si->provideruri_bv = (BerVarray) ch_calloc( 2, sizeof( struct berval ));
- ber_str2bv( si->provideruri, strlen( si->provideruri ), 0, &si->provideruri_bv[0] );
- si->provideruri_bv[1].bv_len = 0;
- si->provideruri_bv[1].bv_val = NULL;
+ 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->tls = TLS_CRITICAL;
+ si->si_tls = SYNCINFO_TLS_CRITICAL;
} else {
- si->tls = TLS_ON;
+ si->si_tls = SYNCINFO_TLS_ON;
}
} else if ( !strncasecmp( cargv[ i ],
- UPDATEDNSTR, sizeof( UPDATEDNSTR ) - 1 ) ) {
- char *str;
+ UPDATEDNSTR, sizeof( UPDATEDNSTR ) - 1 ) )
+ {
struct berval updatedn = {0, NULL};
val = cargv[ i ] + sizeof( UPDATEDNSTR );
- str = ch_strdup( val );
- ber_str2bv( str, strlen(str), 1, &updatedn );
- dnNormalize( 0, NULL, NULL, &updatedn, &si->updatedn, NULL );
- ch_free( str );
- ch_free( updatedn.bv_val );
+ 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;
+ si->si_bindmethod = -1;
}
} else if ( !strncasecmp( cargv[ i ],
BINDDNSTR, sizeof( BINDDNSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( BINDDNSTR );
- si->binddn = ch_strdup( val );
+ si->si_binddn = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
CREDSTR, sizeof( CREDSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( CREDSTR );
- si->passwd = ch_strdup( val );
+ si->si_passwd = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
SASLMECHSTR, sizeof( SASLMECHSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( SASLMECHSTR );
- si->saslmech = ch_strdup( val );
+ si->si_saslmech = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
SECPROPSSTR, sizeof( SECPROPSSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( SECPROPSSTR );
- si->secprops = ch_strdup( val );
+ si->si_secprops = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
REALMSTR, sizeof( REALMSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( REALMSTR );
- si->realm = ch_strdup( val );
+ si->si_realm = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
AUTHCSTR, sizeof( AUTHCSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( AUTHCSTR );
- si->authcId = ch_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 = ch_strdup( val );
+ si->si_authcId = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ],
AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( AUTHZSTR );
- si->authzId = ch_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 );
- }
- si->srvtab = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], LASTMODSTR,
- sizeof( LASTMODSTR ) - 1 ) ) {
- val = cargv[ i ] + sizeof( LASTMODSTR );
- if ( !strcasecmp( val, LMREQSTR )) {
- si->lastmod = LASTMOD_REQ;
- } else if ( !strcasecmp( val, LMGENSTR )) {
- si->lastmod = LASTMOD_GEN;
- } else if ( !strcasecmp( val, LMNOSTR )) {
- si->lastmod = LASTMOD_NO;
+ 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->lastmod = -1;
+ si->si_schemachecking = 1;
}
} else if ( !strncasecmp( cargv[ i ],
- FILTERSTR, sizeof( FILTERSTR ) - 1 ) ) {
+ FILTERSTR, sizeof( FILTERSTR ) - 1 ) )
+ {
val = cargv[ i ] + sizeof( FILTERSTR );
- si->filterstr = ch_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 );
- si->base = ch_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 );
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 ( !strcasecmp( val, "subordinate" ) ||
+ !strcasecmp( val, "children" ))
+ {
+ si->si_scope = LDAP_SCOPE_SUBORDINATE;
} 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 ) ) {
- val = cargv[ i ] + sizeof( ATTRSSTR ) - 1;
- if ( *val == '!' ) {
- si->attrsexclude = 1;
- val++;
- }
- if ( *val++ != '=' )
- continue;
- str2clist( &si->attrs, val, "," );
+ ATTRSSTR, sizeof( ATTRSSTR ) - 1 ) )
+ {
+ val = cargv[ i ] + sizeof( ATTRSSTR );
+ str2clist( &si->si_attrs, val, "," );
} else if ( !strncasecmp( cargv[ i ],
- TYPESTR, sizeof( TYPESTR ) - 1 ) ) {
+ TYPESTR, sizeof( TYPESTR ) - 1 ) )
+ {
val = cargv[ i ] + sizeof( TYPESTR );
- if ( !strncasecmp( val, "refreshOnly", sizeof( "refreshOnly" ) - 1 )) {
- si->type = LDAP_SYNC_REFRESH_ONLY;
- } else if ( !strncasecmp( val, "refreshAndPersist", sizeof( "refreshAndPersist" ) - 1 )) {
- si->type = LDAP_SYNC_REFRESH_AND_PERSIST;
- si->interval = 0;
+ 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 );
- if ( si->type == LDAP_SYNC_REFRESH_AND_PERSIST )
- si->interval = 0;
- else
- 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 \"%ld\"\n",
- (long) 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 );
- } else if ( !strncasecmp( cargv[ i ],
- MANAGEDSAITSTR, sizeof( MANAGEDSAITSTR ) - 1 ) ) {
- val = cargv[ i ] + sizeof( COOKIESTR );
- si->manageDSAit = atoi( val );
+ MANAGEDSAITSTR, sizeof( MANAGEDSAITSTR ) - 1 ) )
+ {
+ val = cargv[ i ] + sizeof( MANAGEDSAITSTR );
+ si->si_manageDSAit = atoi( val );
} else if ( !strncasecmp( cargv[ i ],
- SLIMITSTR, sizeof( SLIMITSTR ) - 1 ) ) {
+ SLIMITSTR, sizeof( SLIMITSTR ) - 1 ) )
+ {
val = cargv[ i ] + sizeof( SLIMITSTR );
- si->slimit = atoi( val );
+ si->si_slimit = atoi( val );
} else if ( !strncasecmp( cargv[ i ],
- TLIMITSTR, sizeof( TLIMITSTR ) - 1 ) ) {
+ TLIMITSTR, sizeof( TLIMITSTR ) - 1 ) )
+ {
val = cargv[ i ] + sizeof( TLIMITSTR );
- si->tlimit = atoi( val );
+ 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 ( 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 );
+}
projects / openldap / blobdiff