>From 4f30e003eee75791cf8dfb7026e9cdf047c6e5b9 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 19 Jul 2013 17:28:26 +0200 Subject: [PATCH] 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. --- src/confdb/confdb.h | 4 ++-- src/providers/ipa/ipa_subdomains.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 3e88b78f3ef4f8e98ac6a1a0e7552f6a232bbbc4..ab7abe910c633e53e003a04231be3cdc2666f643 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 a09f07ac9473b105d01273980c5c294d838b26a2..9ded9954bbc819e65e3b222c8968d2440320c4be 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)); -- 1.8.3.1