summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-07-19 17:28:26 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-07-19 17:49:43 +0200
commitd5e8c3a1290d68d07362a119e63121156ad448df (patch)
tree74549660befdb08d57814413d5c565dd4ff53c9b /src
parent943109edd1f6545f7d45d619f631b5d03c5c859b (diff)
downloadsssd-d5e8c3a1290d68d07362a119e63121156ad448df.tar.gz
sssd-d5e8c3a1290d68d07362a119e63121156ad448df.tar.xz
sssd-d5e8c3a1290d68d07362a119e63121156ad448df.zip
Fix the default FQDN format
Commit 52ae806bd17c3c00d70bd1aed437f10f5ae51a1c changed the default FQDN format by accident to the one we only ever user internally. This commit fixes the mistake.
Diffstat (limited to 'src')
-rw-r--r--src/confdb/confdb.h4
-rw-r--r--src/providers/ipa/ipa_subdomains.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 3e88b78f3..ab7abe910 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -71,8 +71,8 @@
/* Both monitor and domains */
#define CONFDB_NAME_REGEX "re_expression"
#define CONFDB_FULL_NAME_FORMAT "full_name_format"
-#define CONFDB_DEFAULT_FULL_NAME_FORMAT "%1$s@%2$s%3$s"
-#define CONFDB_DEFAULT_FULL_NAME_FORMAT_OLD "%1$s@%2$s"
+#define CONFDB_DEFAULT_FULL_NAME_FORMAT_INTERNAL "%1$s@%2$s%3$s"
+#define CONFDB_DEFAULT_FULL_NAME_FORMAT "%1$s@%2$s"
/* Responders */
#define CONFDB_RESPONDER_GET_DOMAINS_TIMEOUT "get_domains_timeout"
diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c
index a09f07ac9..9ded9954b 100644
--- a/src/providers/ipa/ipa_subdomains.c
+++ b/src/providers/ipa/ipa_subdomains.c
@@ -1125,7 +1125,7 @@ int ipa_ad_subdom_init(struct be_ctx *be_ctx,
if ((strcmp(be_ctx->domain->names->fq_fmt,
CONFDB_DEFAULT_FULL_NAME_FORMAT) != 0)
&& (strcmp(be_ctx->domain->names->fq_fmt,
- CONFDB_DEFAULT_FULL_NAME_FORMAT_OLD) != 0)) {
+ CONFDB_DEFAULT_FULL_NAME_FORMAT_INTERNAL) != 0)) {
DEBUG(SSSDBG_FATAL_FAILURE, ("%s is set to a non-default value [%s] " \
"lookups of subdomain users will likely fail!\n",
CONFDB_FULL_NAME_FORMAT, be_ctx->domain->names->fq_fmt));