From 3c60433641ce2e86b9b04778c8f8652ef0d097e4 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 11 Apr 2012 15:02:10 +0200 Subject: Make re_expression and full_name_format per domain options * Allows different user/domain qualified names for different domains. For example Domain\User or user@domain. * The global re_expression and full_name_format options remain as defaults for the domains. * Subdomains get the re_expression and full_name_format of their parent domain. https://bugzilla.redhat.com/show_bug.cgi?id=811663 --- src/confdb/confdb.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/confdb') diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 5893897f9..db247b184 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -63,11 +63,13 @@ #define CONFDB_MONITOR_SBUS_TIMEOUT "sbus_timeout" #define CONFDB_MONITOR_ACTIVE_SERVICES "services" #define CONFDB_MONITOR_ACTIVE_DOMAINS "domains" -#define CONFDB_MONITOR_NAME_REGEX "re_expression" -#define CONFDB_MONITOR_FULL_NAME_FORMAT "full_name_format" #define CONFDB_MONITOR_TRY_INOTIFY "try_inotify" #define CONFDB_MONITOR_KRB5_RCACHEDIR "krb5_rcache_dir" +/* Both monitor and domains */ +#define CONFDB_NAME_REGEX "re_expression" +#define CONFDB_FULL_NAME_FORMAT "full_name_format" + /* Responders */ #define CONFDB_RESPONDER_GET_DOMAINS_TIMEOUT "get_domains_timeout" @@ -207,6 +209,7 @@ struct sss_domain_info { int pwd_expiration_warning; struct sysdb_ctx *sysdb; + struct sss_names_ctx *names; struct sss_domain_info **subdomains; uint32_t subdomain_count; -- cgit