int use_reverse_lookup = 0;
+/* These do nothing in slapd, they're kept only to make them
+ * editable in back-config
+ */
+static char *replica_pidFile, *replica_argsFile;
+static int replicationInterval;
+
+static char *passwd_salt;
+static char *logfileName;
+
#ifdef LDAP_SLAPI
int slapi_plugins_used = 0;
#endif
static int fp_parse_line(ConfigArgs *c);
static char *strtok_quote(char *line, char *sep);
-#if 0
-static int load_ucdata(char *path);
-#endif
-/* state info for back-config */
-static ConfigFile cf_prv, *cfn = &cf_prv;
int read_config_file(const char *fname, int depth, ConfigArgs *cf);
static int add_syncrepl LDAP_P(( Backend *, char **, int ));
static int parse_syncrepl_line LDAP_P(( char **, int, syncinfo_t *));
+static void syncrepl_unparse LDAP_P (( syncinfo_t *, struct berval *));
+
+/* All of these table entries and handlers really belong
+ * in back-config, only the parser/table engine belongs here.
+ */
+/* state info for back-config */
+static ConfigFile cf_prv, *cfn = &cf_prv;
-int config_generic(ConfigArgs *c);
-int config_search_base(ConfigArgs *c);
-int config_passwd_hash(ConfigArgs *c);
-int config_schema_dn(ConfigArgs *c);
-int config_sizelimit(ConfigArgs *c);
-int config_timelimit(ConfigArgs *c);
-int config_limits(ConfigArgs *c);
-int config_overlay(ConfigArgs *c);
-int config_suffix(ConfigArgs *c);
-int config_deref_depth(ConfigArgs *c);
-int config_rootdn(ConfigArgs *c);
-int config_rootpw(ConfigArgs *c);
-int config_restrict(ConfigArgs *c);
-int config_allows(ConfigArgs *c);
-int config_disallows(ConfigArgs *c);
-int config_requires(ConfigArgs *c);
-int config_security(ConfigArgs *c);
-int config_referral(ConfigArgs *c);
-int config_loglevel(ConfigArgs *c);
-int config_syncrepl(ConfigArgs *c);
-int config_replica(ConfigArgs *c);
-int config_updatedn(ConfigArgs *c);
-int config_updateref(ConfigArgs *c);
-int config_include(ConfigArgs *c);
+static int config_fname(ConfigArgs *c);
+static int config_generic(ConfigArgs *c);
+static int config_search_base(ConfigArgs *c);
+static int config_passwd_hash(ConfigArgs *c);
+static int config_schema_dn(ConfigArgs *c);
+static int config_sizelimit(ConfigArgs *c);
+static int config_timelimit(ConfigArgs *c);
+static int config_limits(ConfigArgs *c);
+static int config_overlay(ConfigArgs *c);
+static int config_suffix(ConfigArgs *c);
+static int config_deref_depth(ConfigArgs *c);
+static int config_rootdn(ConfigArgs *c);
+static int config_rootpw(ConfigArgs *c);
+static int config_restrict(ConfigArgs *c);
+static int config_allows(ConfigArgs *c);
+static int config_disallows(ConfigArgs *c);
+static int config_requires(ConfigArgs *c);
+static int config_security(ConfigArgs *c);
+static int config_referral(ConfigArgs *c);
+static int config_loglevel(ConfigArgs *c);
+static int config_syncrepl(ConfigArgs *c);
+static int config_replica(ConfigArgs *c);
+static int config_updatedn(ConfigArgs *c);
+static int config_updateref(ConfigArgs *c);
+static int config_include(ConfigArgs *c);
#ifdef HAVE_TLS
-int config_tls_option(ConfigArgs *c);
-int config_tls_verify(ConfigArgs *c);
+static int config_tls_option(ConfigArgs *c);
+static int config_tls_config(ConfigArgs *c);
#endif
-#ifdef LDAP_SLAPI
-int config_plugin(ConfigArgs *c);
-#endif
-int config_pluginlog(ConfigArgs *c);
enum {
CFG_ACL = 1,
CFG_LASTMOD,
CFG_AZPOLICY,
CFG_AZREGEXP,
- CFG_SASLSECP
+ CFG_SASLSECP,
+ CFG_SSTR_IF_MAX,
+ CFG_SSTR_IF_MIN,
};
typedef struct {
/* alphabetical ordering */
-ConfigTable SystemConfiguration[] = {
- { "access", NULL, 0, 0, 0, ARG_MAGIC|CFG_ACL,
+static ConfigTable SystemConfiguration[] = {
+ /* This attr is read-only */
+ { "", "", 0, 0, 0, ARG_MAGIC,
+ &config_fname, "( OLcfgAt:78 NAME 'olcConfigFile' "
+ "DESC 'File for slapd configuration directives' "
+ "EQUALITY caseIgnoreMatch "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "access", NULL, 0, 0, 0, ARG_MAY_DB|ARG_MAGIC|CFG_ACL,
&config_generic, "( OLcfgAt:1 NAME 'olcAccess' "
"DESC 'Access Control List' "
"EQUALITY caseIgnoreMatch "
&config_generic, "( OLcfgAt:5 NAME 'olcAttributeOptions' "
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "authid-rewrite", NULL, 2, 0, 0,
#ifdef SLAP_AUTH_REWRITE
- { "auth-rewrite", NULL, 2, 2, 14, ARG_MAGIC|CFG_REWRITE,
- &config_generic, "( OLcfgAt:6 NAME 'olcAuthRewrite' "
+ ARG_MAGIC|CFG_REWRITE, &config_generic,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:6 NAME 'olcAuthIDRewrite' "
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
-#endif
- { "authz-policy", "policy", 2, 2, 0, ARG_MAGIC|CFG_AZPOLICY,
+ { "authz-policy", "policy", 2, 2, 0, ARG_STRING|ARG_MAGIC|CFG_AZPOLICY,
&config_generic, "( OLcfgAt:7 NAME 'olcAuthzPolicy' "
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
"DESC 'A type of backend' "
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "concurrency", "level", 2, 2, 0, ARG_LONG|ARG_NONZERO|ARG_MAGIC|CFG_CONCUR,
+ { "concurrency", "level", 2, 2, 0, ARG_INT|ARG_NONZERO|ARG_MAGIC|CFG_CONCUR,
&config_generic, "( OLcfgAt:10 NAME 'olcConcurrency' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "conn_max_pending", "max", 2, 2, 0, ARG_LONG,
&config_generic, "( OLcfgAt:13 NAME 'olcDatabase' "
"DESC 'The backend type for a database instance' "
"SUP olcBackend )", NULL, NULL },
- { "defaultSearchBase", "dn", 2, 2, 0, ARG_DN|ARG_MAGIC,
+ { "defaultSearchBase", "dn", 2, 2, 0, ARG_PRE_BI|ARG_PRE_DB|ARG_DN|ARG_MAGIC,
&config_search_base, "( OLcfgAt:14 NAME 'olcDefaultSearchBase' "
"SYNTAX OMsDN )", NULL, NULL },
{ "disallows", "features", 2, 0, 8, ARG_PRE_DB|ARG_MAGIC,
/* use standard schema */
{ "ditcontentrule", NULL, 0, 0, 0, ARG_MAGIC|CFG_DIT,
&config_generic, NULL, NULL, NULL },
+ { "gentlehup", "on|off", 2, 2, 0,
#ifdef SIGHUP
- { "gentlehup", "on|off", 2, 2, 0, ARG_ON_OFF,
- &global_gentlehup, "( OLcfgAt:17 NAME 'olcGentleHUP' "
- "SYNTAX OMsBoolean )", NULL, NULL },
+ ARG_ON_OFF, &global_gentlehup,
#else
- { "gentlehup", NULL, 2, 2, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
+ ARG_IGNORED, NULL,
#endif
+ "( OLcfgAt:17 NAME 'olcGentleHUP' "
+ "SYNTAX OMsBoolean )", NULL, NULL },
{ "idletimeout", "timeout", 2, 2, 0, ARG_INT,
&global_idletimeout, "( OLcfgAt:18 NAME 'olcIdleTimeout' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "include", "file", 2, 2, 0, ARG_MAGIC,
&config_include, "( OLcfgAt:19 NAME 'olcInclude' "
"SUP labeledURI )", NULL, NULL },
- { "index_substr_if_minlen", "min", 2, 2, 0, ARG_INT|ARG_NONZERO,
- &index_substr_if_minlen, "( OLcfgAt:20 NAME 'olcIndexSubstrIfMinLen' "
+ { "index_substr_if_minlen", "min", 2, 2, 0, ARG_INT|ARG_NONZERO|ARG_MAGIC|CFG_SSTR_IF_MIN,
+ &config_generic, "( OLcfgAt:20 NAME 'olcIndexSubstrIfMinLen' "
"SYNTAX OMsInteger )", NULL, NULL },
- { "index_substr_if_maxlen", "max", 2, 2, 0, ARG_INT|ARG_NONZERO|ARG_SPECIAL,
- &index_substr_if_maxlen, "( OLcfgAt:21 NAME 'olcIndexSubstrIfMaxLen' "
+ { "index_substr_if_maxlen", "max", 2, 2, 0, ARG_INT|ARG_NONZERO|ARG_MAGIC|CFG_SSTR_IF_MAX,
+ &config_generic, "( OLcfgAt:21 NAME 'olcIndexSubstrIfMaxLen' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "index_substr_any_len", "len", 2, 2, 0, ARG_INT|ARG_NONZERO,
&index_substr_any_len, "( OLcfgAt:22 NAME 'olcIndexSubstrAnyLen' "
{ "localSSF", "ssf", 2, 2, 0, ARG_LONG,
&local_ssf, "( OLcfgAt:26 NAME 'olcLocalSSF' "
"SYNTAX OMsInteger )", NULL, NULL },
- { "logfile", "file", 2, 2, 0, ARG_MAGIC|CFG_LOGFILE,
+ { "logfile", "file", 2, 2, 0, ARG_STRING|ARG_MAGIC|CFG_LOGFILE,
&config_generic, "( OLcfgAt:27 NAME 'olcLogFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "loglevel", "level", 2, 0, 0, ARG_MAGIC,
{ "maxDerefDepth", "depth", 2, 2, 0, ARG_DB|ARG_INT|ARG_MAGIC|CFG_DEPTH,
&config_generic, "( OLcfgAt:29 NAME 'olcMaxDerefDepth' "
"SYNTAX OMsInteger )", NULL, NULL },
+ { "moduleload", "file", 2, 0, 0,
#ifdef SLAPD_MODULES
- { "moduleload", "file", 2, 0, 0, ARG_MAGIC|CFG_MODLOAD,
- &config_generic, "( OLcfgAt:30 NAME 'olcModuleLoad' "
- "SYNTAX OMsDirectoryString )", NULL, NULL },
- { "modulepath", "path", 2, 2, 0, ARG_MAGIC|CFG_MODPATH,
- &config_generic, "( OLcfgAt:31 NAME 'olcModulePath' "
+ ARG_MAGIC|CFG_MODLOAD, &config_generic,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:30 NAME 'olcModuleLoad' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "modulepath", "path", 2, 2, 0,
+#ifdef SLAPD_MODULES
+ ARG_MAGIC|CFG_MODPATH, &config_generic,
+#else
+ ARG_IGNORED, NULL,
#endif
+ "( OLcfgAt:31 NAME 'olcModulePath' "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
/* use standard schema */
{ "objectclass", "objectclass", 2, 0, 0, ARG_PAREN|ARG_MAGIC|CFG_OC,
&config_generic, NULL, NULL, NULL },
{ "overlay", "overlay", 2, 2, 0, ARG_MAGIC,
&config_overlay, "( OLcfgAt:34 NAME 'olcOverlay' "
"SUP olcDatabase )", NULL, NULL },
- { "password-crypt-salt-format", "salt", 2, 2, 0, ARG_MAGIC|CFG_SALT,
+ { "password-crypt-salt-format", "salt", 2, 2, 0, ARG_STRING|ARG_MAGIC|CFG_SALT,
&config_generic, "( OLcfgAt:35 NAME 'olcPasswordCryptSaltFormat' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "password-hash", "hash", 2, 2, 0, ARG_MAGIC,
{ "pidfile", "file", 2, 2, 0, ARG_STRING,
&slapd_pid_file, "( OLcfgAt:37 NAME 'olcPidFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "plugin", NULL, 0, 0, 0,
#ifdef LDAP_SLAPI
- { "plugin", NULL, 0, 0, 0, ARG_MAGIC|CFG_PLUGIN,
- &config_generic, "( OLcfgAt:38 NAME 'olcPlugin' "
- "SYNTAX OMsDirectoryString )", NULL, NULL },
- { "pluginlog", "filename", 2, 2, 0, ARG_STRING,
- &slapi_log_file, "( OLcfgAt:39 NAME 'olcPluginLogFile' "
+ ARG_MAGIC|CFG_PLUGIN, &config_generic,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:38 NAME 'olcPlugin' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "pluginlog", "filename", 2, 2, 0,
+#ifdef LDAP_SLAPI
+ ARG_STRING, &slapi_log_file,
#else
- { "plugin", NULL, 0, 0, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
- { "pluginlog", NULL, 0, 0, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
+ ARG_IGNORED, NULL,
#endif
- { "readonly", "on|off", 2, 2, 0, ARG_ON_OFF|ARG_MAGIC|CFG_RO,
+ "( OLcfgAt:39 NAME 'olcPluginLogFile' "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "readonly", "on|off", 2, 2, 0, ARG_MAY_DB|ARG_ON_OFF|ARG_MAGIC|CFG_RO,
&config_generic, "( OLcfgAt:40 NAME 'olcReadOnly' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "referral", "url", 2, 2, 0, ARG_MAGIC,
{ "replica", "host or uri", 2, 0, 0, ARG_DB|ARG_MAGIC,
&config_replica, "( OLcfgAt:42 NAME 'olcReplica' "
"SUP labeledURI )", NULL, NULL },
- { "replica-pidfile", NULL, 0, 0, 0, ARG_IGNORED,
- NULL, "( OLcfgAt:43 NAME 'olcReplicaPidFile' "
+ { "replica-argsfile", NULL, 0, 0, 0, ARG_STRING,
+ &replica_argsFile, "( OLcfgAt:43 NAME 'olcReplicaArgsFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "replica-argsfile", NULL, 0, 0, 0, ARG_IGNORED,
- NULL, "( OLcfgAt:44 NAME 'olcReplicaArgsFile' "
+ { "replica-pidfile", NULL, 0, 0, 0, ARG_STRING,
+ &replica_pidFile, "( OLcfgAt:44 NAME 'olcReplicaPidFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "replicationInterval", NULL, 0, 0, 0, ARG_IGNORED,
- NULL, "( OLcfgAt:45 NAME 'olcReplicationInterval' "
+ { "replicationInterval", NULL, 0, 0, 0, ARG_INT,
+ &replicationInterval, "( OLcfgAt:45 NAME 'olcReplicationInterval' "
"SYNTAX OMsInteger )", NULL, NULL },
- { "replogfile", "filename", 2, 2, 0, ARG_MAGIC|ARG_STRING|CFG_REPLOG,
+ { "replogfile", "filename", 2, 2, 0, ARG_MAY_DB|ARG_MAGIC|ARG_STRING|CFG_REPLOG,
&config_generic, "( OLcfgAt:46 NAME 'olcReplogFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "require", "features", 2, 0, 7, ARG_MAGIC,
+ { "require", "features", 2, 0, 7, ARG_MAY_DB|ARG_MAGIC,
&config_requires, "( OLcfgAt:47 NAME 'olcRequires' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "restrict", "op_list", 2, 0, 0, ARG_MAGIC,
+ { "restrict", "op_list", 2, 0, 0, ARG_MAY_DB|ARG_MAGIC,
&config_restrict, "( OLcfgAt:48 NAME 'olcRestrict' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "reverse-lookup", "on|off", 2, 2, 0,
#ifdef SLAPD_RLOOKUPS
- { "reverse-lookup", "on|off", 2, 2, 0, ARG_ON_OFF,
- &use_reverse_lookup, "( OLcfgAt:49 NAME 'olcReverseLookup' "
- "SYNTAX OMsBoolean )", NULL, NULL },
+ ARG_ON_OFF, &use_reverse_lookup,
#else
- { "reverse-lookup", NULL, 2, 2, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
+ ARG_IGNORED, NULL,
#endif
+ "( OLcfgAt:49 NAME 'olcReverseLookup' "
+ "SYNTAX OMsBoolean )", NULL, NULL },
{ "rootdn", "dn", 2, 2, 0, ARG_DB|ARG_DN|ARG_MAGIC,
&config_rootdn, "( OLcfgAt:50 NAME 'olcRootDN' "
"SYNTAX OMsDN )", NULL, NULL },
{ "rootDSE", "file", 2, 2, 0, ARG_MAGIC|CFG_ROOTDSE,
&config_generic, "( OLcfgAt:51 NAME 'olcRootDSE' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "rootpw", "password", 2, 2, 0, ARG_DB|ARG_MAGIC,
+ { "rootpw", "password", 2, 2, 0, ARG_STRING|ARG_DB|ARG_MAGIC,
&config_rootpw, "( OLcfgAt:52 NAME 'olcRootPW' "
"SYNTAX OMsOctetString )", NULL, NULL },
{ "sasl-authz-policy", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZPOLICY,
&config_generic, NULL, NULL, NULL },
+ { "sasl-host", "host", 2, 2, 0,
#ifdef HAVE_CYRUS_SASL
- { "sasl-host", "host", 2, 2, 0, ARG_STRING|ARG_UNIQUE,
- &global_host, "( OLcfgAt:53 NAME 'olcSaslHost' "
+ ARG_STRING|ARG_UNIQUE, &global_host,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:53 NAME 'olcSaslHost' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "sasl-realm", "realm", 2, 2, 0, ARG_STRING|ARG_UNIQUE,
- &global_realm, "( OLcfgAt:54 NAME 'olcSaslRealm' "
+ { "sasl-realm", "realm", 2, 2, 0,
+#ifdef HAVE_CYRUS_SASL
+ ARG_STRING|ARG_UNIQUE, &global_realm,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:54 NAME 'olcSaslRealm' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "sasl-regexp", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZREGEXP,
+ { "sasl-regexp", NULL, 3, 3, 0, ARG_MAGIC|CFG_AZREGEXP,
&config_generic, NULL, NULL, NULL },
- { "sasl-secprops", "properties", 2, 2, 0, ARG_MAGIC|CFG_SASLSECP,
- &config_generic, "( OLcfgAt:56 NAME 'olcSaslSecProps' "
- "SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "sasl-secprops", "properties", 2, 2, 0,
+#ifdef HAVE_CYRUS_SASL
+ ARG_MAGIC|CFG_SASLSECP, &config_generic,
#else
- { "sasl-host", NULL, 2, 2, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
- { "sasl-realm", NULL, 2, 2, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
- { "sasl-regexp", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZREGEXP,
- &config_generic, NULL, NULL, NULL },
- { "sasl-secprops", NULL, 2, 2, 0, ARG_IGNORED,
- NULL, NULL, NULL, NULL },
+ ARG_IGNORED, NULL,
#endif
- { "saslRegexp", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZREGEXP,
+ "( OLcfgAt:56 NAME 'olcSaslSecProps' "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "saslRegexp", NULL, 3, 3, 0, ARG_MAGIC|CFG_AZREGEXP,
&config_generic, NULL, NULL, NULL },
{ "schemacheck", "on|off", 2, 2, 0, ARG_ON_OFF|ARG_MAGIC|CFG_CHECK,
&config_generic, "( OLcfgAt:57 NAME 'olcSchemaCheck' "
"SYNTAX OMsBoolean )", NULL, NULL },
- { "schemadn", "dn", 2, 2, 0, ARG_DN|ARG_MAGIC,
+ { "schemadn", "dn", 2, 2, 0, ARG_MAY_DB|ARG_DN|ARG_MAGIC,
&config_schema_dn, "( OLcfgAt:58 NAME 'olcSchemaDN' "
"SYNTAX OMsDN )", NULL, NULL },
- { "security", "factors", 2, 0, 0, ARG_MAGIC,
+ { "security", "factors", 2, 0, 0, ARG_MAY_DB|ARG_MAGIC,
&config_security, "( OLcfgAt:59 NAME 'olcSecurity' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "sizelimit", "limit", 2, 2, 0, ARG_MAGIC|CFG_SIZE,
+ { "sizelimit", "limit", 2, 2, 0, ARG_MAY_DB|ARG_MAGIC|CFG_SIZE,
&config_sizelimit, "( OLcfgAt:60 NAME 'olcSizeLimit' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "sockbuf_max_incoming", "max", 2, 2, 0, ARG_LONG,
&sockbuf_max_incoming, "( OLcfgAt:61 NAME 'olcSockbufMaxIncoming' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "sockbuf_max_incoming_auth", "max", 2, 2, 0, ARG_LONG,
- &sockbuf_max_incoming_auth, "( OLcfgAt:62 NAME 'olcSuckbufMaxIncomingAuth' "
+ &sockbuf_max_incoming_auth, "( OLcfgAt:62 NAME 'olcSockbufMaxIncomingAuth' "
"SYNTAX OMsInteger )", NULL, NULL },
+ { "srvtab", "file", 2, 2, 0,
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
- { "srvtab", "file", 2, 2, 0, ARG_STRING,
- &ldap_srvtab, "( OLcfgAt:63 NAME 'olcSrvtab' "
- "SYNTAX OMsDirectoryString )", NULL, NULL },
+ ARG_STRING, &ldap_srvtab,
+#else
+ ARG_IGNORED, NULL,
#endif
+ "( OLcfgAt:63 NAME 'olcSrvtab' "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
{ "suffix", "suffix", 2, 2, 0, ARG_DB|ARG_DN|ARG_MAGIC,
&config_suffix, "( OLcfgAt:64 NAME 'olcSuffix' "
"SYNTAX OMsDN )", NULL, NULL },
{ "threads", "count", 2, 2, 0, ARG_INT|ARG_MAGIC|CFG_THREADS,
&config_generic, "( OLcfgAt:66 NAME 'olcThreads' "
"SYNTAX OMsInteger )", NULL, NULL },
- { "timelimit", "limit", 2, 2, 0, ARG_MAGIC|CFG_TIME,
+ { "timelimit", "limit", 2, 2, 0, ARG_MAY_DB|ARG_MAGIC|CFG_TIME,
&config_timelimit, "( OLcfgAt:67 NAME 'olcTimeLimit' "
"SYNTAX OMsInteger )", NULL, NULL },
+ { "TLSCACertificateFile", NULL, 0, 0, 0,
#ifdef HAVE_TLS
- { "TLSCACertificateFile", NULL, 0, 0, 0, CFG_TLS_CA_FILE|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:68 NAME 'olcTLSCACertificateFile' "
- "SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSCACertificatePath", NULL, 0, 0, 0, CFG_TLS_CA_PATH|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:69 NAME 'olcTLSCACertificatePath' "
+ CFG_TLS_CA_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:68 NAME 'olcTLSCACertificateFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSCertificateFile", NULL, 0, 0, 0, CFG_TLS_CERT_FILE|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:70 NAME 'olcTLSCertificateFile' "
+ { "TLSCACertificatePath", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_CA_PATH|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:69 NAME 'olcTLSCACertificatePath' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSCertificateKeyFile", NULL, 0, 0, 0, CFG_TLS_CERT_KEY|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:71 NAME 'olcTLSCertificateKeyFile' "
+ { "TLSCertificateFile", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_CERT_FILE|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:70 NAME 'olcTLSCertificateFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSCipherSuite", NULL, 0, 0, 0, CFG_TLS_CIPHER|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:72 NAME 'olcTLSCipherSuite' "
+ { "TLSCertificateKeyFile", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_CERT_KEY|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:71 NAME 'olcTLSCertificateKeyFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSCRLCheck", NULL, 0, 0, 0, CFG_TLS_CRLCHECK|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:73 NAME 'olcTLSCRLCheck' "
+ { "TLSCipherSuite", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_CIPHER|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:72 NAME 'olcTLSCipherSuite' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSRandFile", NULL, 0, 0, 0, CFG_TLS_RAND|ARG_MAGIC,
- &config_tls_option, "( OLcfgAt:74 NAME 'olcTLSRandFile' "
+ { "TLSCRLCheck", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_CRLCHECK|ARG_STRING|ARG_MAGIC, &config_tls_config,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:73 NAME 'olcTLSCRLCheck' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
- { "TLSVerifyClient", NULL, 0, 0, 0, CFG_TLS_VERIFY|ARG_MAGIC,
- &config_tls_verify, "( OLcfgAt:75 NAME 'olcTLSVerifyClient' "
+ { "TLSRandFile", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_RAND|ARG_STRING|ARG_MAGIC, &config_tls_option,
+#else
+ ARG_IGNORED, NULL,
+#endif
+ "( OLcfgAt:74 NAME 'olcTLSRandFile' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
+ { "TLSVerifyClient", NULL, 0, 0, 0,
+#ifdef HAVE_TLS
+ CFG_TLS_VERIFY|ARG_STRING|ARG_MAGIC, &config_tls_config,
+#else
+ ARG_IGNORED, NULL,
#endif
+ "( OLcfgAt:75 NAME 'olcTLSVerifyClient' "
+ "SYNTAX OMsDirectoryString )", NULL, NULL },
{ "ucdata-path", "path", 2, 2, 0, ARG_IGNORED,
NULL, NULL, NULL, NULL },
{ "updatedn", "dn", 2, 2, 0, ARG_DB|ARG_MAGIC,
c->log, Conf[i].name, 0);
return(ARG_BAD_CONF);
}
- if((arg_type & ARG_PRE_DB) && c->be) {
+ if((arg_type & ARG_PRE_BI) && c->bi) {
+ Debug(LDAP_DEBUG_CONFIG, "%s: keyword <%s> must appear before any backend %sdeclaration\n",
+ c->log, Conf[i].name, ((arg_type & ARG_PRE_DB)
+ ? "or database " : "") );
+ return(ARG_BAD_CONF);
+ }
+ if((arg_type & ARG_PRE_DB) && c->be && c->be != frontendDB) {
Debug(LDAP_DEBUG_CONFIG, "%s: keyword <%s> must appear before any database declaration\n",
c->log, Conf[i].name, 0);
return(ARG_BAD_CONF);
return(ARG_BAD_CONF);
}
c->type = arg_user = (arg_type & ARGS_USERLAND);
- c->value_int = c->value_long = c->value_ber_t = 0;
- c->value_string = NULL;
- BER_BVZERO( &c->value_dn );
- BER_BVZERO( &c->value_ndn );
+ memset(&c->values, 0, sizeof(c->values));
if(arg_type & ARGS_NUMERIC) {
int j;
iarg = 0; larg = 0; barg = 0;
case ARG_LONG: larg = atol(c->argv[1]); break;
case ARG_BER_LEN_T: barg = (ber_len_t)atol(c->argv[1]); break;
case ARG_ON_OFF:
- if(!strcasecmp(c->argv[1], "on")) {
+ if(!strcasecmp(c->argv[1], "on") ||
+ !strcasecmp(c->argv[1], "true")) {
iarg = 1;
- } else if(!strcasecmp(c->argv[1], "off")) {
+ } else if(!strcasecmp(c->argv[1], "off") ||
+ !strcasecmp(c->argv[1], "false")) {
iarg = 0;
} else {
Debug(LDAP_DEBUG_CONFIG, "%s: ignoring ", c->log, 0, 0);
break;
}
j = (arg_type & ARG_NONZERO) ? 1 : 0;
- rc = (Conf == SystemConfiguration) ? ((arg_type & ARG_SPECIAL) && (larg < index_substr_if_maxlen)) : 0;
- if(iarg < j || larg < j || barg < j || rc) {
+ if(iarg < j || larg < j || barg < j ) {
larg = larg ? larg : (barg ? barg : iarg);
Debug(LDAP_DEBUG_CONFIG, "%s: " , c->log, 0, 0);
Debug(LDAP_DEBUG_CONFIG, "invalid %s value (%ld) in <%s> line\n", Conf[i].what, larg, Conf[i].name);
return(ARG_BAD_CONF);
}
- c->value_int = iarg;
- c->value_long = larg;
- c->value_ber_t = barg;
- }
- if(arg_type & ARG_STRING) c->value_string = ch_strdup(c->argv[1]);
- if(arg_type & ARG_DN) {
+ switch(arg_type & ARGS_NUMERIC) {
+ case ARG_ON_OFF:
+ case ARG_INT: c->value_int = iarg; break;
+ case ARG_LONG: c->value_long = larg; break;
+ case ARG_BER_LEN_T: c->value_ber_t = barg; break;
+ }
+ } else if(arg_type & ARG_STRING) {
+ c->value_string = ch_strdup(c->argv[1]);
+ } else if(arg_type & ARG_DN) {
struct berval bv;
ber_str2bv( c->argv[1], 0, 0, &bv );
rc = dnPrettyNormal( NULL, &bv, &c->value_dn, &c->value_ndn, NULL );
return(arg_user);
}
+int
+config_get_vals(ConfigTable *cf, ConfigArgs *c)
+{
+ int rc = 0;
+ struct berval bv;
+
+ if ( cf->arg_type & ARG_IGNORED ) {
+ return 1;
+ }
+
+ memset(&c->values, 0, sizeof(c->values));
+ c->rvalue_vals = NULL;
+ c->rvalue_nvals = NULL;
+ c->emit = 1;
+ c->type = cf->arg_type & ARGS_USERLAND;
+
+ if ( cf->arg_type & ARG_MAGIC ) {
+ rc = (*((ConfigDriver*)cf->arg_item))(c);
+ if ( rc ) return rc;
+ } else {
+ switch(cf->arg_type & ARGS_POINTER) {
+ case ARG_ON_OFF:
+ case ARG_INT: c->value_int = *(int *)cf->arg_item; break;
+ case ARG_LONG: c->value_long = *(long *)cf->arg_item; break;
+ case ARG_BER_LEN_T: c->value_ber_t = *(ber_len_t *)cf->arg_item; break;
+ case ARG_STRING:
+ if ( *(char **)cf->arg_item )
+ c->value_string = ch_strdup(*(char **)cf->arg_item);
+ break;
+ }
+ }
+ if ( cf->arg_type & ARGS_POINTER) {
+ bv.bv_val = c->log;
+ switch(cf->arg_type & ARGS_POINTER) {
+ case ARG_INT: bv.bv_len = sprintf(bv.bv_val, "%d", c->value_int); break;
+ case ARG_LONG: bv.bv_len = sprintf(bv.bv_val, "%l", c->value_long); break;
+ case ARG_BER_LEN_T: bv.bv_len =sprintf(bv.bv_val, "%l",c->value_ber_t); break;
+ case ARG_ON_OFF: bv.bv_len = sprintf(bv.bv_val, "%s",
+ c->value_int ? "TRUE" : "FALSE"); break;
+ case ARG_STRING:
+ if ( c->value_string && c->value_string[0]) {
+ ber_str2bv( c->value_string, 0, 0, &bv);
+ } else {
+ return 1;
+ }
+ break;
+ }
+ if (( cf->arg_type & ARGS_POINTER ) == ARG_STRING )
+ ber_bvarray_add(&c->rvalue_vals, &bv);
+ else
+ value_add_one(&c->rvalue_vals, &bv);
+ }
+ return rc;
+}
+
int
init_config_attrs(ConfigTable *ct) {
LDAPAttributeType *at;
ct[i].attribute, err );
return code;
}
+ ldap_memfree( at );
}
+
+ return 0;
}
int
}
i = init_config_attrs(SystemConfiguration);
if ( i ) return i;
-
-
config_back_init( &cf_prv, SystemConfiguration );
return read_config_file(fname, depth, NULL);
}
return(1);
}
-int
+static int
config_generic(ConfigArgs *c) {
- char *p = strchr(c->line,'(' /*')'*/);
+ char *p;
int i;
+ if ( c->emit ) {
+ int rc = 0;
+ switch(c->type) {
+ case CFG_CONCUR:
+ c->value_int = ldap_pvt_thread_get_concurrency();
+ break;
+ case CFG_THREADS:
+ c->value_int = connection_pool_max;
+ break;
+ case CFG_SALT:
+ if ( passwd_salt )
+ c->value_string = ch_strdup( passwd_salt );
+ else
+ rc = 1;
+ break;
+ case CFG_LIMITS: /* FIXME */
+ rc = 1;
+ break;
+ case CFG_RO:
+ c->value_int = (c->be->be_restrictops & SLAP_RESTRICT_OP_WRITES) != 0;
+ break;
+ case CFG_AZPOLICY:
+ c->value_string = ch_strdup( slap_sasl_getpolicy());
+ break;
+ case CFG_AZREGEXP:
+ rc = 1;
+ break;
+#ifdef HAVE_CYRUS_SASL
+ case CFG_SASLSECP: /* FIXME */
+ rc = 1;
+ break;
+#endif
+ case CFG_DEPTH:
+ c->value_int = c->be->be_max_deref_depth;
+ break;
+ case CFG_OID: /* FIXME */
+ rc = 1;
+ break;
+ case CFG_CHECK:
+ c->value_int = global_schemacheck;
+ break;
+ case CFG_ACL: {
+ AccessControl *a;
+ char *src, *dst, ibuf[11];
+ struct berval bv, abv;
+ for (i=0, a=c->be->be_acl; a; i++,a=a->acl_next) {
+ abv.bv_len = sprintf( ibuf, "{%x}", i );
+ acl_unparse( a, &bv );
+ abv.bv_val = ch_malloc( abv.bv_len + bv.bv_len + 1 );
+ AC_MEMCPY( abv.bv_val, ibuf, abv.bv_len );
+ /* Turn TAB / EOL into plain space */
+ for (src=bv.bv_val,dst=abv.bv_val+abv.bv_len; *src; src++) {
+ if (isspace(*src)) *dst++ = ' ';
+ else *dst++ = *src;
+ }
+ *dst = '\0';
+ if (dst[-1] == ' ') {
+ dst--;
+ *dst = '\0';
+ }
+ abv.bv_len = dst - abv.bv_val;
+ ber_bvarray_add( &c->rvalue_vals, &abv );
+ }
+ rc = (!i);
+ break;
+ }
+ case CFG_REPLOG:
+ if ( c->be->be_replogfile )
+ c->value_string = ch_strdup( c->be->be_replogfile );
+ break;
+ case CFG_ROOTDSE: {
+ ConfigFile *cf = (ConfigFile *)c->line;
+ if ( cf->c_dseFiles ) {
+ value_add( &c->rvalue_vals, cf->c_dseFiles );
+ } else {
+ rc = 1;
+ }
+ }
+ break;
+ case CFG_LOGFILE:
+ if ( logfileName )
+ c->value_string = ch_strdup( logfileName );
+ else
+ rc = 1;
+ break;
+ case CFG_LASTMOD:
+ c->value_int = (SLAP_NOLASTMOD(c->be) == 0);
+ break;
+ case CFG_SSTR_IF_MAX:
+ c->value_int = index_substr_if_maxlen;
+ break;
+ case CFG_SSTR_IF_MIN:
+ c->value_int = index_substr_if_minlen;
+ break;
+#ifdef SLAPD_MODULES
+ case CFG_MODLOAD: /* FIXME */
+ case CFG_MODPATH:
+ rc = 1;
+ break;
+#endif
+#ifdef LDAP_SLAPI
+ case CFG_PLUGIN: /* FIXME */
+ rc = 1;
+ break;
+#endif
+#ifdef SLAP_AUTH_REWRITE
+ case CFG_REWRITE: /* FIXME */
+ rc = 1;
+ break;
+#endif
+ default:
+ rc = 1;
+ }
+ return rc;
+ }
+
+ p = strchr(c->line,'(' /*')'*/);
switch(c->type) {
case CFG_BACKEND:
if(!(c->bi = backend_info(c->argv[1]))) {
case CFG_DATABASE:
c->bi = NULL;
+ /* FIXME - config should probably be the
+ * last backend, not the first.
+ */
if ( !strcasecmp( c->argv[1], "config" )) {
c->be = backendDB;
} else if(!(c->be = backend_db_init(c->argv[1]))) {
break;
case CFG_CONCUR:
- ldap_pvt_thread_set_concurrency(c->value_long);
+ ldap_pvt_thread_set_concurrency(c->value_int);
break;
case CFG_THREADS:
break;
case CFG_SALT:
- lutil_salt_format(c->argv[1]);
+ if ( passwd_salt ) ch_free( passwd_salt );
+ passwd_salt = c->value_string;
+ lutil_salt_format(passwd_salt);
break;
case CFG_LIMITS:
break;
case CFG_AZPOLICY:
+ ch_free(c->value_string);
if (slap_sasl_setpolicy( c->argv[1] )) {
Debug(LDAP_DEBUG_ANY, "%s: unable to parse value \"%s\" in"
" \"authz-policy <policy>\"\n",
return(1);
}
break;
+ }
#endif
case CFG_DEPTH:
break;
case CFG_LOGFILE: {
- FILE *logfile = fopen(c->argv[1], "w");
- if(logfile) lutil_debug_file(logfile);
- break;
- }
+ FILE *logfile;
+ if ( logfileName ) ch_free( logfileName );
+ logfileName = c->value_string;
+ logfile = fopen(logfileName, "w");
+ if(logfile) lutil_debug_file(logfile);
+ } break;
case CFG_LASTMOD:
if(SLAP_NOLASTMODCMD(c->be)) {
SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_NOLASTMOD;
break;
+ case CFG_SSTR_IF_MAX:
+ if (c->value_int < index_substr_if_minlen) {
+ Debug(LDAP_DEBUG_ANY, "%s: "
+ "invalid max value (%d)\n",
+ c->log, c->value_int, 0 );
+ return(1);
+ }
+ index_substr_if_maxlen = c->value_int;
+ break;
+
+ case CFG_SSTR_IF_MIN:
+ if (c->value_int > index_substr_if_maxlen) {
+ Debug(LDAP_DEBUG_ANY, "%s: "
+ "invalid min value (%d)\n",
+ c->log, c->value_int, 0 );
+ return(1);
+ }
+ index_substr_if_minlen = c->value_int;
+ break;
+
#ifdef SLAPD_MODULES
case CFG_MODLOAD:
if(module_load(c->argv[1], c->argc - 2, (c->argc > 2) ? c->argv + 2 : NULL))
}
-int
+static int
+config_fname(ConfigArgs *c) {
+ if(c->emit && c->line) {
+ ConfigFile *cf = (ConfigFile *)c->line;
+ value_add_one( &c->rvalue_vals, &cf->c_file );
+ return 0;
+ }
+ return(1);
+}
+
+static int
config_search_base(ConfigArgs *c) {
struct berval dn;
- int rc;
+
+ if(c->emit) {
+ int rc = 1;
+ if (!BER_BVISEMPTY(&default_search_base)) {
+ value_add_one(&c->rvalue_vals, &default_search_base);
+ value_add_one(&c->rvalue_nvals, &default_search_nbase);
+ rc = 0;
+ }
+ return rc;
+ }
+
if(c->bi || c->be != frontendDB) {
Debug(LDAP_DEBUG_ANY, "%s: defaultSearchBase line must appear "
"prior to any backend or database definition\n",
return(0);
}
-int
+static int
config_passwd_hash(ConfigArgs *c) {
int i;
+ if (c->emit) {
+ struct berval bv;
+ for (i=0; default_passwd_hash && default_passwd_hash[i]; i++) {
+ ber_str2bv(default_passwd_hash[i], 0, 0, &bv);
+ value_add_one(&c->rvalue_vals, &bv);
+ }
+ return i ? 0 : 1;
+ }
if(default_passwd_hash) {
Debug(LDAP_DEBUG_ANY, "%s: "
"already set default password_hash\n",
return(0);
}
-int
+static int
config_schema_dn(ConfigArgs *c) {
struct berval dn;
int rc;
+ if ( c->emit ) {
+ value_add_one(&c->rvalue_vals, &c->be->be_schemadn);
+ value_add_one(&c->rvalue_nvals, &c->be->be_schemandn);
+ return 0;
+ }
c->be->be_schemadn = c->value_dn;
c->be->be_schemandn = c->value_ndn;
return(0);
}
-int
+static int
config_sizelimit(ConfigArgs *c) {
int i, rc = 0;
char *next;
struct slap_limits_set *lim = &c->be->be_def_limit;
+ if (c->emit) { /* FIXME */
+ return 1;
+ }
for(i = 1; i < c->argc; i++) {
if(!strncasecmp(c->argv[i], "size", 4)) {
rc = limits_parse_one(c->argv[i], lim);
return(0);
}
-int
+static int
config_timelimit(ConfigArgs *c) {
int i, rc = 0;
char *next;
struct slap_limits_set *lim = &c->be->be_def_limit;
+ if (c->emit) {
+ return 1; /* FIXME */
+ }
for(i = 1; i < c->argc; i++) {
if(!strncasecmp(c->argv[i], "time", 4)) {
rc = limits_parse_one(c->argv[i], lim);
return(0);
}
-int
+static int
config_overlay(ConfigArgs *c) {
+ if (c->emit) {
+ return 1;
+ }
if(c->argv[1][0] == '-' && overlay_config(c->be, &c->argv[1][1])) {
/* log error */
Debug(LDAP_DEBUG_ANY, "%s: (optional) %s overlay \"%s\" configuration failed (ignored)\n",
return(0);
}
-int
+static int
config_suffix(ConfigArgs *c) {
Backend *tbe;
struct berval pdn, ndn;
int rc;
+ if (c->emit) {
+ if ( !BER_BVISNULL( &c->be->be_suffix[0] )) {
+ value_add( &c->rvalue_vals, c->be->be_suffix );
+ value_add( &c->rvalue_nvals, c->be->be_nsuffix );
+ return 0;
+ } else {
+ return 1;
+ }
+ }
#ifdef SLAPD_MONITOR_DN
if(!strcasecmp(c->argv[1], SLAPD_MONITOR_DN)) {
Debug(LDAP_DEBUG_ANY, "%s: "
return(0);
}
-int
+static int
config_rootdn(ConfigArgs *c) {
+ if (c->emit) {
+ if ( !BER_BVISNULL( &c->be->be_rootdn )) {
+ value_add_one(&c->rvalue_vals, &c->be->be_rootdn);
+ value_add_one(&c->rvalue_nvals, &c->be->be_rootndn);
+ return 0;
+ } else {
+ return 1;
+ }
+ }
c->be->be_rootdn = c->value_dn;
c->be->be_rootndn = c->value_ndn;
return(0);
}
-int
+static int
config_rootpw(ConfigArgs *c) {
- Backend *tbe = select_backend(&c->be->be_rootndn, 0, 0);
+ Backend *tbe;
+ if (c->emit) {
+ if (!BER_BVISEMPTY(&c->be->be_rootpw)) {
+ c->value_string=ch_strdup("*");
+ return 0;
+ }
+ return 1;
+ }
+
+ tbe = select_backend(&c->be->be_rootndn, 0, 0);
if(tbe != c->be) {
Debug(LDAP_DEBUG_ANY, "%s: "
"rootpw can only be set when rootdn is under suffix\n",
c->log, 0, 0);
return(1);
}
- ber_str2bv(c->argv[1], 0, 1, &c->be->be_rootpw);
+ ber_str2bv(c->value_string, 0, 0, &c->be->be_rootpw);
return(0);
}
for(i = 1; i < c->argc; i++) {
j = verb_to_mask(c, v, i);
if(!v[j].word) return(1);
+ while (!v[j].mask) j--;
*m |= v[j].mask;
}
return(0);
}
int
+mask_to_verbs(ConfigArgs *c, struct verb_mask_list *v, slap_mask_t m) {
+ int i, j;
+ struct berval bv;
+
+ if (!m) return 1;
+ for (i=0; v[i].word; i++) {
+ if (!v[i].mask) continue;
+ if (( m & v[i].mask ) == v[i].mask ) {
+ ber_str2bv( v[i].word, 0, 0, &bv );
+ value_add_one( &c->rvalue_vals, &bv );
+ }
+ }
+ return 0;
+}
+
+static int
config_restrict(ConfigArgs *c) {
slap_mask_t restrictops = 0;
- int i, j;
- struct verb_mask_list restrictable_exops[] = {
- { LDAP_EXOP_START_TLS, SLAP_RESTRICT_EXOP_START_TLS },
- { LDAP_EXOP_MODIFY_PASSWD, SLAP_RESTRICT_EXOP_MODIFY_PASSWD },
- { LDAP_EXOP_X_WHO_AM_I, SLAP_RESTRICT_EXOP_WHOAMI },
- { LDAP_EXOP_X_CANCEL, SLAP_RESTRICT_EXOP_CANCEL },
- { NULL, 0 }
- };
+ int i;
struct verb_mask_list restrictable_ops[] = {
{ "bind", SLAP_RESTRICT_OP_BIND },
{ "add", SLAP_RESTRICT_OP_ADD },
{ "modify", SLAP_RESTRICT_OP_MODIFY },
- { "modrdn", SLAP_RESTRICT_OP_RENAME },
{ "rename", SLAP_RESTRICT_OP_RENAME },
+ { "modrdn", 0 },
{ "delete", SLAP_RESTRICT_OP_DELETE },
{ "search", SLAP_RESTRICT_OP_SEARCH },
- { "compare", SLAP_RESTRICT_OP_COMPARE },
+ { "compare", SLAP_RESTRICT_OP_COMPARE },
{ "read", SLAP_RESTRICT_OP_READS },
{ "write", SLAP_RESTRICT_OP_WRITES },
+ { "extended", SLAP_RESTRICT_OP_EXTENDED },
+ { "extended=" LDAP_EXOP_START_TLS, SLAP_RESTRICT_EXOP_START_TLS },
+ { "extended=" LDAP_EXOP_MODIFY_PASSWD, SLAP_RESTRICT_EXOP_MODIFY_PASSWD },
+ { "extended=" LDAP_EXOP_X_WHO_AM_I, SLAP_RESTRICT_EXOP_WHOAMI },
+ { "extended=" LDAP_EXOP_X_CANCEL, SLAP_RESTRICT_EXOP_CANCEL },
{ NULL, 0 }
};
- for(i = 1; i < c->argc; i++) {
- j = verb_to_mask(c, restrictable_ops, i);
- if(restrictable_ops[j].word) {
- restrictops |= restrictable_ops[j].mask;
- continue;
- } else if(!strncasecmp(c->argv[i], "extended", STRLENOF("extended"))) {
- char *e = c->argv[i] + STRLENOF("extended");
- if(e[0] == '=') {
- int k = verb_to_mask(c, restrictable_exops, e[1]);
- if(restrictable_exops[k].word) {
- restrictops |= restrictable_exops[k].mask;
- continue;
- } else break;
- } else if(!e[0]) {
- restrictops &= ~SLAP_RESTRICT_EXOP_MASK;
- restrictops |= SLAP_RESTRICT_OP_EXTENDED;
- } else break;
- }
+ if (c->emit) {
+ return mask_to_verbs( c, restrictable_ops, c->be->be_restrictops );
}
- if(i < c->argc) {
- c->be->be_restrictops |= restrictops;
- return(0);
+ i = verbs_to_mask( c, restrictable_ops, &restrictops );
+ if ( i ) {
+ Debug(LDAP_DEBUG_ANY, "%s: "
+ "unknown operation %s in \"restrict <features>\" line\n",
+ c->log, c->argv[i], 0);
+ return(1);
}
- Debug(LDAP_DEBUG_ANY, "%s: "
- "unknown operation %s in \"restrict <features>\" line\n",
- c->log, c->argv[i], 0);
- return(1);
+ if ( restrictops & SLAP_RESTRICT_OP_EXTENDED )
+ restrictops &= ~SLAP_RESTRICT_EXOP_MASK;
+ c->be->be_restrictops |= restrictops;
+ return(0);
}
-int
+static int
config_allows(ConfigArgs *c) {
slap_mask_t allows = 0;
int i;
{ "update_anon", SLAP_ALLOW_UPDATE_ANON },
{ NULL, 0 }
};
+ if (c->emit) {
+ return mask_to_verbs( c, allowable_ops, global_allows );
+ }
i = verbs_to_mask(c, allowable_ops, &allows);
if ( i ) {
Debug(LDAP_DEBUG_ANY, "%s: "
return(0);
}
-int
+static int
config_disallows(ConfigArgs *c) {
slap_mask_t disallows = 0;
int i;
{ "tls_authc", SLAP_DISALLOW_TLS_AUTHC },
{ NULL, 0 }
};
+ if (c->emit) {
+ return mask_to_verbs( c, disallowable_ops, global_disallows );
+ }
i = verbs_to_mask(c, disallowable_ops, &disallows);
if ( i ) {
Debug(LDAP_DEBUG_ANY, "%s: "
return(0);
}
-int
+static int
config_requires(ConfigArgs *c) {
slap_mask_t requires = 0;
int i;
{ "strong", SLAP_REQUIRE_STRONG },
{ NULL, 0 }
};
+ if (c->emit) {
+ return mask_to_verbs( c, requires_ops, c->be->be_requires );
+ }
i = verbs_to_mask(c, requires_ops, &requires);
if ( i ) {
Debug(LDAP_DEBUG_ANY, "%s: "
return(0);
}
-int
+static int
config_loglevel(ConfigArgs *c) {
int i;
char *next;
{ "Any", -1 },
{ NULL, 0 }
};
+
+ if (c->emit) {
+ return mask_to_verbs( c, loglevel_ops, ldap_syslog );
+ }
+
ldap_syslog = 0;
for( i=1; i < c->argc; i++ ) {
return(0);
}
-int
+static int
config_syncrepl(ConfigArgs *c) {
+ if (c->emit) {
+ if ( c->be->be_syncinfo ) {
+ struct berval bv;
+ syncrepl_unparse( c->be->be_syncinfo, &bv );
+ ber_bvarray_add( &c->rvalue_vals, &bv );
+ return 0;
+ }
+ return 1;
+ }
if(SLAP_SHADOW(c->be)) {
Debug(LDAP_DEBUG_ANY, "%s: "
"syncrepl: database already shadowed.\n",
return(0);
}
-int
+static int
config_referral(ConfigArgs *c) {
struct berval vals[2];
+ if (c->emit) {
+ if ( default_referral ) {
+ value_add( &c->rvalue_vals, default_referral );
+ return 0;
+ } else {
+ return 1;
+ }
+ }
if(validate_global_referral(c->argv[1])) {
Debug(LDAP_DEBUG_ANY, "%s: "
"invalid URL (%s) in \"referral\" line.\n",
return(1);
}
- ber_str2bv(c->argv[1], 0, 1, &vals[0]);
+ ber_str2bv(c->argv[1], 0, 0, &vals[0]);
vals[1].bv_val = NULL; vals[1].bv_len = 0;
if(value_add(&default_referral, vals)) return(LDAP_OTHER);
return(0);
}
-int
+static struct {
+ struct berval key;
+ int off;
+} sec_keys[] = {
+ { BER_BVC("ssf="), offsetof(slap_ssf_set_t, sss_ssf) },
+ { BER_BVC("transport="), offsetof(slap_ssf_set_t, sss_transport) },
+ { BER_BVC("tls="), offsetof(slap_ssf_set_t, sss_tls) },
+ { BER_BVC("sasl="), offsetof(slap_ssf_set_t, sss_sasl) },
+ { BER_BVC("update_ssf="), offsetof(slap_ssf_set_t, sss_update_ssf) },
+ { BER_BVC("update_transport="), offsetof(slap_ssf_set_t, sss_update_transport) },
+ { BER_BVC("update_tls="), offsetof(slap_ssf_set_t, sss_update_tls) },
+ { BER_BVC("update_sasl="), offsetof(slap_ssf_set_t, sss_update_sasl) },
+ { BER_BVC("simple_bind="), offsetof(slap_ssf_set_t, sss_simple_bind) },
+ { BER_BVNULL, 0 }
+};
+
+static int
config_security(ConfigArgs *c) {
slap_ssf_set_t *set = &c->be->be_ssf_set;
char *next;
- int i;
- for(i = 1; i < c->argc; i++) {
+ int i, j;
+ if (c->emit) {
+ char numbuf[32];
+ struct berval bv;
slap_ssf_t *tgt;
+ int rc = 1;
+
+ for (i=0; !BER_BVISNULL( &sec_keys[i].key ); i++) {
+ tgt = (slap_ssf_t *)((char *)set + sec_keys[i].off);
+ if ( *tgt ) {
+ rc = 0;
+ bv.bv_len = sprintf( numbuf, "%u", *tgt );
+ bv.bv_len += sec_keys[i].key.bv_len;
+ bv.bv_val = ch_malloc( bv.bv_len + 1);
+ next = lutil_strcopy( bv.bv_val, sec_keys[i].key.bv_val );
+ strcpy( next, numbuf );
+ ber_bvarray_add( &c->rvalue_vals, &bv );
+ }
+ }
+ return rc;
+ }
+ for(i = 1; i < c->argc; i++) {
+ slap_ssf_t *tgt = NULL;
char *src;
- if(!strncasecmp(c->argv[i], "ssf=", 4)) {
- tgt = &set->sss_ssf;
- src = &c->argv[i][4];
- } else if(!strncasecmp(c->argv[i], "transport=", 10)) {
- tgt = &set->sss_transport;
- src = &c->argv[i][10];
- } else if(!strncasecmp(c->argv[i], "tls=", 4)) {
- tgt = &set->sss_tls;
- src = &c->argv[i][4];
- } else if(!strncasecmp(c->argv[i], "sasl=", 5)) {
- tgt = &set->sss_sasl;
- src = &c->argv[i][5];
- } else if(!strncasecmp(c->argv[i], "update_ssf=", 11)) {
- tgt = &set->sss_update_ssf;
- src = &c->argv[i][11];
- } else if(!strncasecmp(c->argv[i], "update_transport=", 17)) {
- tgt = &set->sss_update_transport;
- src = &c->argv[i][17];
- } else if(!strncasecmp(c->argv[i], "update_tls=", 11)) {
- tgt = &set->sss_update_tls;
- src = &c->argv[i][11];
- } else if(!strncasecmp(c->argv[i], "update_sasl=", 12)) {
- tgt = &set->sss_update_sasl;
- src = &c->argv[i][12];
- } else if(!strncasecmp(c->argv[i], "simple_bind=", 12)) {
- tgt = &set->sss_simple_bind;
- src = &c->argv[i][12];
- } else {
+ for ( j=0; !BER_BVISNULL( &sec_keys[j].key ); j++ ) {
+ if(!strncasecmp(c->argv[i], sec_keys[j].key.bv_val,
+ sec_keys[j].key.bv_len)) {
+ src = c->argv[i] + sec_keys[j].key.bv_len;
+ tgt = (slap_ssf_t *)((char *)set + sec_keys[j].off);
+ break;
+ }
+ }
+ if ( !tgt ) {
Debug(LDAP_DEBUG_ANY, "%s: "
"unknown factor %s in \"security <factors>\" line\n",
c->log, c->argv[i], 0);
return(0);
}
-int
+static struct verb_mask_list tlskey[] = {
+ { "no", SB_TLS_OFF },
+ { "yes", SB_TLS_ON },
+ { "critical", SB_TLS_CRITICAL }
+};
+
+static struct verb_mask_list methkey[] = {
+ { "simple", LDAP_AUTH_SIMPLE },
+#ifdef HAVE_CYRUS_SASL
+ { "sasl", LDAP_AUTH_SASL },
+#endif
+ { NULL, 0 }
+};
+
+typedef struct cf_aux_table {
+ struct berval key;
+ int off;
+ int quote;
+ struct verb_mask_list *aux;
+} cf_aux_table;
+
+static cf_aux_table bindkey[] = {
+ { BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 0, tlskey },
+ { BER_BVC("bindmethod="), offsetof(slap_bindconf, sb_method), 0, methkey },
+ { BER_BVC("binddn="), offsetof(slap_bindconf, sb_binddn), 1, NULL },
+ { BER_BVC("credentials="), offsetof(slap_bindconf, sb_cred), 1, NULL },
+ { BER_BVC("saslmech="), offsetof(slap_bindconf, sb_saslmech), 0, NULL },
+ { BER_BVC("secprops="), offsetof(slap_bindconf, sb_secprops), 0, NULL },
+ { BER_BVC("realm="), offsetof(slap_bindconf, sb_realm), 0, NULL },
+ { BER_BVC("authcID="), offsetof(slap_bindconf, sb_authcId), 0, NULL },
+ { BER_BVC("authzID="), offsetof(slap_bindconf, sb_authzId), 1, NULL },
+ { BER_BVNULL, 0, 0, NULL }
+};
+
+int bindconf_parse( char *word, slap_bindconf *bc ) {
+ int i, rc = 0;
+ char **cptr;
+ cf_aux_table *tab;
+
+ for (tab = bindkey; !BER_BVISNULL(&tab->key); tab++) {
+ if ( !strncasecmp( word, tab->key.bv_val, tab->key.bv_len )) {
+ cptr = (char **)((char *)bc + tab->off);
+ if ( tab->aux ) {
+ int j;
+ rc = 1;
+ for (j=0; tab->aux[j].word; j++) {
+ if (!strcasecmp(word+tab->key.bv_len, tab->aux[j].word)) {
+ int *ptr = (int *)cptr;
+ *ptr = tab->aux[j].mask;
+ rc = 0;
+ }
+ }
+ if (rc ) {
+ Debug(LDAP_DEBUG_ANY, "invalid bind config value %s\n",
+ word, 0, 0 );
+ }
+ return rc;
+ }
+ *cptr = ch_strdup(word+tab->key.bv_len);
+ return 0;
+ }
+ }
+ return rc;
+}
+
+int bindconf_unparse( slap_bindconf *bc, struct berval *bv ) {
+ char buf[BUFSIZ], *ptr;
+ cf_aux_table *tab;
+ char **cptr;
+ struct berval tmp;
+
+ ptr = buf;
+ for (tab = bindkey; !BER_BVISNULL(&tab->key); tab++) {
+ cptr = (char **)((char *)bc + tab->off);
+ if ( tab->aux ) {
+ int *ip = (int *)cptr, i;
+ for ( i=0; tab->aux[i].word; i++ ) {
+ if ( *ip == tab->aux[i].mask ) {
+ *ptr++ = ' ';
+ ptr = lutil_strcopy( ptr, tab->key.bv_val );
+ ptr = lutil_strcopy( ptr, tab->aux[i].word );
+ break;
+ }
+ }
+ } else if ( *cptr ) {
+ *ptr++ = ' ';
+ ptr = lutil_strcopy( ptr, tab->key.bv_val );
+ if ( tab->quote ) *ptr++ = '"';
+ ptr = lutil_strcopy( ptr, *cptr );
+ if ( tab->quote ) *ptr++ = '"';
+ }
+ }
+ tmp.bv_val = buf;
+ tmp.bv_len = ptr - buf;
+ ber_dupbv( bv, &tmp );
+ return 0;
+}
+
+void bindconf_free( slap_bindconf *bc ) {
+ if ( bc->sb_binddn ) {
+ ch_free( bc->sb_binddn );
+ }
+ if ( bc->sb_cred ) {
+ ch_free( bc->sb_cred );
+ }
+ if ( bc->sb_saslmech ) {
+ ch_free( bc->sb_saslmech );
+ }
+ if ( bc->sb_secprops ) {
+ ch_free( bc->sb_secprops );
+ }
+ if ( bc->sb_realm ) {
+ ch_free( bc->sb_realm );
+ }
+ if ( bc->sb_authcId ) {
+ ch_free( bc->sb_authcId );
+ }
+ if ( bc->sb_authzId ) {
+ ch_free( bc->sb_authzId );
+ }
+}
+
+static char *
+anlist_unparse( AttributeName *an, char *ptr ) {
+ int comma = 0;
+
+ for (; !BER_BVISNULL( &an->an_name ); an++) {
+ if ( comma ) *ptr++ = ',';
+ ptr = lutil_strcopy( ptr, an->an_name.bv_val );
+ comma = 1;
+ }
+ return ptr;
+}
+
+static void
+replica_unparse( struct slap_replica_info *ri, int i, struct berval *bv )
+{
+ int len;
+ char *ptr;
+ struct berval bc = {0};
+ char numbuf[32];
+
+ len = sprintf(numbuf, "{%d}", i );
+
+ len += strlen( ri->ri_uri ) + STRLENOF("uri=");
+ if ( ri->ri_nsuffix ) {
+ for (i=0; !BER_BVISNULL( &ri->ri_nsuffix[i] ); i++) {
+ len += ri->ri_nsuffix[i].bv_len + STRLENOF(" suffix=\"\"");
+ }
+ }
+ if ( ri->ri_attrs ) {
+ len += STRLENOF("attr");
+ if ( ri->ri_exclude ) len++;
+ for (i=0; !BER_BVISNULL( &ri->ri_attrs[i].an_name ); i++) {
+ len += 1 + ri->ri_attrs[i].an_name.bv_len;
+ }
+ }
+ bindconf_unparse( &ri->ri_bindconf, &bc );
+ len += bc.bv_len;
+
+ bv->bv_val = ch_malloc(len + 1);
+ bv->bv_len = len;
+
+ ptr = lutil_strcopy( bv->bv_val, numbuf );
+ ptr = lutil_strcopy( ptr, "uri=" );
+ ptr = lutil_strcopy( ptr, ri->ri_uri );
+
+ if ( ri->ri_nsuffix ) {
+ for (i=0; !BER_BVISNULL( &ri->ri_nsuffix[i] ); i++) {
+ ptr = lutil_strcopy( ptr, " suffix=\"" );
+ ptr = lutil_strcopy( ptr, ri->ri_nsuffix[i].bv_val );
+ *ptr++ = '"';
+ }
+ }
+ if ( ri->ri_attrs ) {
+ ptr = lutil_strcopy( ptr, "attr" );
+ if ( ri->ri_exclude ) *ptr++ = '!';
+ *ptr++ = '=';
+ ptr = anlist_unparse( ri->ri_attrs, ptr );
+ }
+ if ( bc.bv_val ) {
+ strcpy( ptr, bc.bv_val );
+ ch_free( bc.bv_val );
+ }
+}
+
+static int
config_replica(ConfigArgs *c) {
- int i, nr = -1;
- char *replicahost, *replicalog = NULL;
+ int i, nr = -1, len;
+ char *replicahost, *replicauri;
LDAPURLDesc *ludp;
+ if (c->emit) {
+ if (c->be->be_replica) {
+ struct berval bv;
+ for (i=0;c->be->be_replica[i]; i++) {
+ replica_unparse( c->be->be_replica[i], i, &bv );
+ ber_bvarray_add( &c->rvalue_vals, &bv );
+ }
+ return 0;
+ }
+ return 1;
+ }
if(SLAP_MONITOR(c->be)) {
Debug(LDAP_DEBUG_ANY, "%s: "
"\"replica\" should not be used inside monitor database\n",
for(i = 1; i < c->argc; i++) {
if(!strncasecmp(c->argv[i], "host=", STRLENOF("host="))) {
- replicalog = c->argv[i] + STRLENOF("host=");
- nr = add_replica_info(c->be, c->argv[i] + STRLENOF("host="));
+ replicahost = c->argv[i] + STRLENOF("host=");
+ len = strlen( replicahost );
+ replicauri = ch_malloc( len + STRLENOF("ldap://") + 1 );
+ sprintf( replicauri, "ldap://%s", replicahost );
+ replicahost = replicauri + STRLENOF( "ldap://");
+ nr = add_replica_info(c->be, replicauri, replicahost);
break;
} else if(!strncasecmp(c->argv[i], "uri=", STRLENOF("uri="))) {
if(ldap_url_parse(c->argv[i] + STRLENOF("uri="), &ludp) != LDAP_SUCCESS) {
c->log, 0, 0);
return(1);
}
- replicahost = ch_malloc(strlen(c->argv[i]));
- if(!replicahost) {
- Debug(LDAP_DEBUG_ANY,
- "out of memory in read_config\n", 0, 0, 0);
- ldap_free_urldesc(ludp);
- exit(EXIT_FAILURE);
- }
- sprintf(replicahost, "%s:%d", ludp->lud_host, ludp->lud_port);
- replicalog = c->argv[i] + STRLENOF("uri=");
- nr = add_replica_info(c->be, replicahost);
ldap_free_urldesc(ludp);
- ch_free(replicahost);
+ replicauri = c->argv[i] + STRLENOF("uri=");
+ replicauri = ch_strdup( replicauri );
+ replicahost = strchr( replicauri, '/' );
+ replicahost += 2;
+ nr = add_replica_info(c->be, replicauri, replicahost);
break;
}
}
} else if(nr == -1) {
Debug(LDAP_DEBUG_ANY, "%s: "
"unable to add replica \"%s\"\n",
- c->log, replicalog, 0);
+ c->log, replicauri, 0);
return(1);
} else {
for(i = 1; i < c->argc; i++) {
c->log, arg + 1, 0);
return(1);
}
+ } else if ( bindconf_parse( c->argv[i],
+ &c->be->be_replica[nr]->ri_bindconf ) ) {
+ return(1);
}
}
}
return(0);
}
-int
+static int
config_updatedn(ConfigArgs *c) {
struct berval dn;
int rc;
+ if (c->emit) {
+ if (!BER_BVISEMPTY(&c->be->be_update_ndn)) {
+ value_add_one(&c->rvalue_vals, &c->be->be_update_ndn);
+ value_add_one(&c->rvalue_nvals, &c->be->be_update_ndn);
+ return 0;
+ }
+ return 1;
+ }
if(SLAP_SHADOW(c->be)) {
Debug(LDAP_DEBUG_ANY, "%s: "
"updatedn: database already shadowed.\n",
return(0);
}
-int
+static int
config_updateref(ConfigArgs *c) {
struct berval vals[2];
+ if (c->emit) {
+ if ( c->be->be_update_refs ) {
+ value_add( &c->rvalue_vals, c->be->be_update_refs );
+ return 0;
+ } else {
+ return 1;
+ }
+ }
if(!SLAP_SHADOW(c->be)) {
Debug(LDAP_DEBUG_ANY, "%s: "
- "updateref line must after syncrepl or updatedn.\n",
+ "updateref line must come after syncrepl or updatedn.\n",
c->log, 0, 0);
return(1);
}
return(0);
}
-/* XXX meaningless in ldif */
-
-int
+static int
config_include(ConfigArgs *c) {
unsigned long savelineno = c->lineno;
int rc;
- ConfigFile *cf = ch_calloc( 1, sizeof(ConfigFile));
+ ConfigFile *cf;
ConfigFile *cfsave = cfn;
ConfigFile *cf2 = NULL;
+ if (c->emit) {
+ return 1;
+ }
+ cf = ch_calloc( 1, sizeof(ConfigFile));
if ( cfn->c_kids ) {
for (cf2=cfn->c_kids; cf2 && cf2->c_sibs; cf2=cf2->c_sibs) ;
cf2->c_sibs = cf;
}
#ifdef HAVE_TLS
-int
+static int
config_tls_option(ConfigArgs *c) {
int flag;
switch(c->type) {
case CFG_TLS_RAND: flag = LDAP_OPT_X_TLS_RANDOM_FILE; break;
- case CFG_TLS_CIPHER: flag = LDAP_OPT_X_TLS_CIPHER_SUITE; break;
+ case CFG_TLS_CIPHER: flag = LDAP_OPT_X_TLS_CIPHER_SUITE; break;
case CFG_TLS_CERT_FILE: flag = LDAP_OPT_X_TLS_CERTFILE; break;
case CFG_TLS_CERT_KEY: flag = LDAP_OPT_X_TLS_KEYFILE; break;
case CFG_TLS_CA_PATH: flag = LDAP_OPT_X_TLS_CACERTDIR; break;
case CFG_TLS_CA_FILE: flag = LDAP_OPT_X_TLS_CACERTFILE; break;
-#ifdef HAVE_OPENSSL_CRL
- case CFG_TLS_CRLCHECK: flag = LDAP_OPT_X_TLS_CRLCHECK; break;
-#endif
- default: Debug(LDAP_DEBUG_ANY, "%s: "
- "unknown tls_option <%x>\n",
- c->log, c->type, 0);
+ default: Debug(LDAP_DEBUG_ANY, "%s: "
+ "unknown tls_option <%x>\n",
+ c->log, c->type, 0);
+ }
+ if (c->emit) {
+ return ldap_pvt_tls_get_option( NULL, flag, &c->value_string );
}
+ ch_free(c->value_string);
return(ldap_pvt_tls_set_option(NULL, flag, c->argv[1]));
}
-int
-config_tls_verify(ConfigArgs *c) {
- int i;
+/* FIXME: this ought to be provided by libldap */
+static int
+config_tls_config(ConfigArgs *c) {
+ int i, flag;
+ struct verb_mask_list crlkeys[] = {
+ { "none", LDAP_OPT_X_TLS_CRL_NONE },
+ { "peer", LDAP_OPT_X_TLS_CRL_PEER },
+ { "all", LDAP_OPT_X_TLS_CRL_ALL },
+ { NULL, 0 }
+ };
+ struct verb_mask_list vfykeys[] = {
+ { "never", LDAP_OPT_X_TLS_NEVER },
+ { "demand", LDAP_OPT_X_TLS_DEMAND },
+ { "try", LDAP_OPT_X_TLS_TRY },
+ { "hard", LDAP_OPT_X_TLS_HARD },
+ { NULL, 0 }
+ }, *keys;
+ switch(c->type) {
+#ifdef HAVE_OPENSSL_CRL
+ case CFG_TLS_CRLCHECK: flag = LDAP_OPT_X_TLS_CRLCHECK; keys = crlkeys;
+ break;
+#endif
+ case CFG_TLS_VERIFY: flag = LDAP_OPT_X_TLS_REQUIRE_CERT; keys = vfykeys;
+ break;
+ default: Debug(LDAP_DEBUG_ANY, "%s: "
+ "unknown tls_option <%x>\n",
+ c->log, c->type, 0);
+ }
+ if (c->emit) {
+ ldap_pvt_tls_get_option( NULL, flag, &c->value_int );
+ for (i=0; keys[i].word; i++) {
+ if (keys[i].mask == c->value_int) {
+ c->value_string = ch_strdup( keys[i].word );
+ return 0;
+ }
+ }
+ return 1;
+ }
+ ch_free( c->value_string );
if(isdigit((unsigned char)c->argv[1][0])) {
i = atoi(c->argv[1]);
- return(ldap_pvt_tls_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &i));
+ return(ldap_pvt_tls_set_option(NULL, flag, &i));
} else {
- return(ldap_int_tls_config(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, c->argv[1]));
+ return(ldap_int_tls_config(NULL, flag, c->argv[1]));
}
}
#endif
return(0);
}
-
-#if 0
-/* Loads ucdata, returns 1 if loading, 0 if already loaded, -1 on error */
-static int
-load_ucdata( char *path )
-{
-#if 0
- static int loaded = 0;
- int err;
-
- if ( loaded ) {
- return( 0 );
- }
- err = ucdata_load( path ? path : SLAPD_DEFAULT_UCDATA, UCDATA_ALL );
- if ( err ) {
- Debug( LDAP_DEBUG_ANY, "error loading ucdata (error %d)\n",
- err, 0, 0 );
-
- return( -1 );
- }
- loaded = 1;
- return( 1 );
-#else
- /* ucdata is now hardcoded */
- return( 0 );
-#endif
-}
-#endif
-
void
config_destroy( )
{
return 1;
}
- si->si_tls = SYNCINFO_TLS_OFF;
- si->si_bindmethod = LDAP_AUTH_SIMPLE;
+ si->si_bindconf.sb_tls = SB_TLS_OFF;
+ si->si_bindconf.sb_method = LDAP_AUTH_SIMPLE;
si->si_schemachecking = 0;
ber_str2bv( "(objectclass=*)", STRLENOF("(objectclass=*)"), 1,
&si->si_filterstr );
#define SLIMITSTR "sizelimit"
#define TLIMITSTR "timelimit"
#define SCHEMASTR "schemachecking"
-#define BINDMETHSTR "bindmethod"
-#define SIMPLESTR "simple"
-#define SASLSTR "sasl"
-#define BINDDNSTR "binddn"
-#define SASLMECHSTR "saslmech"
-#define AUTHCSTR "authcID"
-#define AUTHZSTR "authzID"
-#define CREDSTR "credentials"
-#define REALMSTR "realm"
-#define SECPROPSSTR "secprops"
/* FIXME: undocumented */
#define OLDAUTHCSTR "bindprincipal"
-#define STARTTLSSTR "starttls"
-#define CRITICALSTR "critical"
#define EXATTRSSTR "exattrs"
-#define MANAGEDSAITSTR "manageDSAit"
#define RETRYSTR "retry"
/* FIXME: unused */
#define LMREQSTR "req"
#define SRVTABSTR "srvtab"
#define SUFFIXSTR "suffix"
-#define UPDATEDNSTR "updatedn"
+#define MANAGEDSAITSTR "manageDSAit"
/* mandatory */
#define GOT_ID 0x0001
#define GOT_PROVIDER 0x0002
-#define GOT_METHOD 0x0004
/* check */
-#define GOT_ALL (GOT_ID|GOT_PROVIDER|GOT_METHOD)
+#define GOT_ALL (GOT_ID|GOT_PROVIDER)
+
+static struct {
+ struct berval key;
+ int val;
+} scopes[] = {
+ { BER_BVC("base"), LDAP_SCOPE_BASE },
+ { BER_BVC("one"), LDAP_SCOPE_ONELEVEL },
+#ifdef LDAP_SCOPE_SUBORDINATE
+ { BER_BVC("children"), LDAP_SCOPE_SUBORDINATE },
+ { BER_BVC("subordinate"), 0 },
+#endif
+ { BER_BVC("sub"), LDAP_SCOPE_SUBTREE },
+ { BER_BVNULL, 0 }
+};
static int
parse_syncrepl_line(
val = cargv[ i ] + STRLENOF( PROVIDERSTR "=" );
ber_str2bv( val, 0, 1, &si->si_provideruri );
gots |= GOT_PROVIDER;
- } else if ( !strncasecmp( cargv[ i ], STARTTLSSTR "=",
- STRLENOF(STARTTLSSTR "=") ) )
- {
- val = cargv[ i ] + STRLENOF( STARTTLSSTR "=" );
- if( !strcasecmp( val, CRITICALSTR ) ) {
- si->si_tls = SYNCINFO_TLS_CRITICAL;
- } else {
- si->si_tls = SYNCINFO_TLS_ON;
- }
- } else if ( !strncasecmp( cargv[ i ], BINDMETHSTR "=",
- STRLENOF( BINDMETHSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( 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 "=",
- STRLENOF( BINDDNSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( BINDDNSTR "=" );
- si->si_binddn = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], CREDSTR "=",
- STRLENOF( CREDSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( CREDSTR "=" );
- si->si_passwd = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], SASLMECHSTR "=",
- STRLENOF( SASLMECHSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( SASLMECHSTR "=" );
- si->si_saslmech = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], SECPROPSSTR "=",
- STRLENOF( SECPROPSSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( SECPROPSSTR "=" );
- si->si_secprops = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], REALMSTR "=",
- STRLENOF( REALMSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( REALMSTR "=" );
- si->si_realm = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], AUTHCSTR "=",
- STRLENOF( AUTHCSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( AUTHCSTR "=" );
- if ( si->si_authcId )
- ch_free( si->si_authcId );
- si->si_authcId = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], OLDAUTHCSTR "=",
- STRLENOF( OLDAUTHCSTR "=" ) ) )
- {
- /* Old authcID is provided for some backwards compatibility */
- val = cargv[ i ] + STRLENOF( OLDAUTHCSTR "=" );
- if ( si->si_authcId )
- ch_free( si->si_authcId );
- si->si_authcId = ch_strdup( val );
- } else if ( !strncasecmp( cargv[ i ], AUTHZSTR "=",
- STRLENOF( AUTHZSTR "=" ) ) )
- {
- val = cargv[ i ] + STRLENOF( AUTHZSTR "=" );
- si->si_authzId = ch_strdup( val );
} else if ( !strncasecmp( cargv[ i ], SCHEMASTR "=",
STRLENOF( SCHEMASTR "=" ) ) )
{
} else if ( !strncasecmp( cargv[ i ], SCOPESTR "=",
STRLENOF( SCOPESTR "=" ) ) )
{
+ int j;
val = cargv[ i ] + STRLENOF( SCOPESTR "=" );
- if ( !strncasecmp( val, "base", STRLENOF( "base" ) )) {
- si->si_scope = LDAP_SCOPE_BASE;
- } else if ( !strncasecmp( val, "one", STRLENOF( "one" ) )) {
- si->si_scope = LDAP_SCOPE_ONELEVEL;
-#ifdef LDAP_SCOPE_SUBORDINATE
- } else if ( !strcasecmp( val, "subordinate" ) ||
- !strcasecmp( val, "children" ))
- {
- si->si_scope = LDAP_SCOPE_SUBORDINATE;
-#endif
- } else if ( !strncasecmp( val, "sub", STRLENOF( "sub" ) )) {
- si->si_scope = LDAP_SCOPE_SUBTREE;
- } else {
+ for ( j=0; !BER_BVISNULL(&scopes[j].key); j++ ) {
+ if (!strncasecmp( val, scopes[j].key.bv_val,
+ scopes[j].key.bv_len )) {
+ while (!scopes[j].val) j--;
+ si->si_scope = scopes[j].val;
+ break;
+ }
+ }
+ if ( BER_BVISNULL(&scopes[j].key) ) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"unknown scope \"%s\"\n", val);
return -1;
ch_free( attr_fname );
return -1;
}
- ch_free( attr_fname );
+ si->si_anfile = attr_fname;
} else {
char *str, *s, *next;
char delimstr[] = " ,\t";
{
val = cargv[ i ] + STRLENOF( TLIMITSTR "=" );
si->si_tlimit = atoi( val );
- } else {
+ } else if ( bindconf_parse( cargv[i], &si->si_bindconf )) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"unknown keyword \"%s\"\n", cargv[ i ] );
return -1;
return 0;
}
+
+
+static void
+syncrepl_unparse( syncinfo_t *si, struct berval *bv )
+{
+ struct berval bc;
+ char buf[BUFSIZ*2], *ptr;
+ int i, len;
+
+ bindconf_unparse( &si->si_bindconf, &bc );
+ ptr = buf;
+ ptr += sprintf( ptr, IDSTR "=%03d " PROVIDERSTR "=%s",
+ si->si_rid, si->si_provideruri.bv_val );
+ if ( !BER_BVISNULL( &bc )) {
+ ptr = lutil_strcopy( ptr, bc.bv_val );
+ free( bc.bv_val );
+ }
+ if ( !BER_BVISEMPTY( &si->si_filterstr )) {
+ ptr = lutil_strcopy( ptr, " " FILTERSTR "=\"" );
+ ptr = lutil_strcopy( ptr, si->si_filterstr.bv_val );
+ *ptr++ = '"';
+ }
+ if ( !BER_BVISNULL( &si->si_base )) {
+ ptr = lutil_strcopy( ptr, " " SEARCHBASESTR "=\"" );
+ ptr = lutil_strcopy( ptr, si->si_base.bv_val );
+ *ptr++ = '"';
+ }
+ for (i=0; !BER_BVISNULL(&scopes[i].key);i++) {
+ if ( si->si_scope == scopes[i].val ) {
+ ptr = lutil_strcopy( ptr, " " SCOPESTR "=" );
+ ptr = lutil_strcopy( ptr, scopes[i].key.bv_val );
+ break;
+ }
+ }
+ if ( si->si_attrsonly ) {
+ ptr = lutil_strcopy( ptr, " " ATTRSONLYSTR "=yes" );
+ }
+ if ( si->si_anfile ) {
+ ptr = lutil_strcopy( ptr, " " ATTRSSTR "=:include:" );
+ ptr = lutil_strcopy( ptr, si->si_anfile );
+ } else if ( si->si_allattrs || si->si_allopattrs ||
+ ( si->si_anlist && !BER_BVISNULL(&si->si_anlist[0].an_name) )) {
+ char *old;
+ ptr = lutil_strcopy( ptr, " " ATTRSSTR "=\"" );
+ old = ptr;
+ ptr = anlist_unparse( si->si_anlist, ptr );
+ if ( si->si_allattrs ) {
+ if ( old != ptr ) *ptr++ = ',';
+ *ptr++ = '*';
+ }
+ if ( si->si_allopattrs ) {
+ if ( old != ptr ) *ptr++ = ',';
+ *ptr++ = '+';
+ }
+ *ptr++ = '"';
+ }
+ if ( si->si_exanlist && !BER_BVISNULL(&si->si_exanlist[0].an_name) ) {
+ ptr = lutil_strcopy( ptr, " " EXATTRSSTR "=" );
+ ptr = anlist_unparse( si->si_exanlist, ptr );
+ }
+ ptr = lutil_strcopy( ptr, " " SCHEMASTR "=" );
+ ptr = lutil_strcopy( ptr, si->si_schemachecking ? "on" : "off" );
+
+ ptr = lutil_strcopy( ptr, " " TYPESTR "=" );
+ ptr = lutil_strcopy( ptr, si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST ?
+ "refreshAndPersist" : "refreshOnly" );
+
+ if ( si->si_type == LDAP_SYNC_REFRESH_ONLY ) {
+ int dd, hh, mm, ss;
+
+ dd = si->si_interval;
+ ss = dd % 60;
+ dd /= 60;
+ mm = dd % 60;
+ dd /= 60;
+ hh = dd % 24;
+ dd /= 24;
+ ptr = lutil_strcopy( ptr, " " INTERVALSTR "=" );
+ ptr += sprintf( ptr, "%02d:%02d:%02d:%02d", dd, hh, mm, ss );
+ } else if ( si->si_retryinterval ) {
+ int space=0;
+ ptr = lutil_strcopy( ptr, " " RETRYSTR "=\"" );
+ for (i=0; si->si_retryinterval[i]; i++) {
+ if ( space ) *ptr++ = ' ';
+ space = 1;
+ ptr += sprintf( ptr, "%d", si->si_retryinterval[i] );
+ if ( si->si_retrynum_init[i] == -1 )
+ *ptr++ = '+';
+ else
+ ptr += sprintf( ptr, "%d", si->si_retrynum_init );
+ }
+ *ptr++ = '"';
+ }
+
+#if 0 /* FIXME: unused in syncrepl.c, should remove it */
+ ptr = lutil_strcopy( ptr, " " MANAGEDSAITSTR "=" );
+ ptr += sprintf( ptr, "%d", si->si_manageDSAit );
+#endif
+
+ if ( si->si_slimit ) {
+ ptr = lutil_strcopy( ptr, " " SLIMITSTR "=" );
+ ptr += sprintf( ptr, "%d", si->si_slimit );
+ }
+
+ if ( si->si_tlimit ) {
+ ptr = lutil_strcopy( ptr, " " TLIMITSTR "=" );
+ ptr += sprintf( ptr, "%d", si->si_tlimit );
+ }
+ bc.bv_len = ptr - buf;
+ bc.bv_val = buf;
+ ber_dupbv( bv, &bc );
+}
+
char **
slap_str2clist( char ***out, char *in, const char *brkstr )
{
projects / openldap / blobdiff