From efc4a645d50f68d2a289c7e8a05bedf051d3c67d Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Mon, 25 Jun 2012 15:16:35 +0200
Subject: Set default for subdomain_homedir

---
 src/confdb/confdb.c     | 3 ++-
 src/confdb/confdb.h     | 1 +
 src/man/sssd.conf.5.xml | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
index e8f587167..cbd427147 100644
--- a/src/confdb/confdb.c
+++ b/src/confdb/confdb.c
@@ -968,7 +968,8 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
     }
 
     tmp = ldb_msg_find_attr_as_string(res->msgs[0],
-                                      CONFDB_DOMAIN_SUBDOMAIN_HOMEDIR, NULL);
+                                      CONFDB_DOMAIN_SUBDOMAIN_HOMEDIR,
+                                      CONFDB_DOMAIN_DEFAULT_SUBDOMAIN_HOMEDIR);
     if (tmp != NULL) {
         domain->subdomain_homedir = talloc_strdup(domain, tmp);
         if (!domain->subdomain_homedir) {
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 139dd9030..0c04112ec 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -156,6 +156,7 @@
 #define CONFDB_DOMAIN_OVERRIDE_GID "override_gid"
 #define CONFDB_DOMAIN_CASE_SENSITIVE "case_sensitive"
 #define CONFDB_DOMAIN_SUBDOMAIN_HOMEDIR "subdomain_homedir"
+#define CONFDB_DOMAIN_DEFAULT_SUBDOMAIN_HOMEDIR "/home/%d/%u"
 
 #define CONFDB_DOMAIN_USER_CACHE_TIMEOUT "entry_cache_user_timeout"
 #define CONFDB_DOMAIN_GROUP_CACHE_TIMEOUT "entry_cache_group_timeout"
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 6c57571e8..e6a1bbcdf 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -1477,6 +1477,9 @@
                             The value can be overridden by
                             <emphasis>override_homedir</emphasis> option.
                         </para>
+                        <para>
+                            Default: <filename>/home/%d/%u</filename>
+                        </para>
                     </listitem>
                 </varlistentry>
             </variablelist>
-- 
cgit