summaryrefslogtreecommitdiff
path: root/src/responder
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-04-04 13:03:23 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-04-10 13:38:44 +0200
commit6fc4702a3037d9bb5b27bcb58f70edf1802b7b19 (patch)
treee0470eba6e749d3b5d10dabf98d1acfdce89007c /src/responder
parent591b0325f5d6f70ae71e61a8c563b437acfb1884 (diff)
downloadsssd-6fc4702a3037d9bb5b27bcb58f70edf1802b7b19.tar.gz
sssd-6fc4702a3037d9bb5b27bcb58f70edf1802b7b19.tar.bz2
sssd-6fc4702a3037d9bb5b27bcb58f70edf1802b7b19.zip
Allow using flatname for subdomain home dir template
https://fedorahosted.org/sssd/ticket/1609
Diffstat (limited to 'src/responder')
-rw-r--r--src/responder/nss/nsssrv_cmd.c10
-rw-r--r--src/responder/pac/pacsrv_utils.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index c391ed53..df7255bb 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -183,10 +183,10 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx,
*/
if (dom->override_homedir) {
return expand_homedir_template(mem_ctx, dom->override_homedir,
- name, uid, homedir, dom->name);
+ name, uid, homedir, dom->name, NULL);
} else if (nctx->override_homedir) {
return expand_homedir_template(mem_ctx, nctx->override_homedir,
- name, uid, homedir, dom->name);
+ name, uid, homedir, dom->name, NULL);
}
if (!homedir || *homedir == '\0') {
@@ -195,10 +195,12 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx,
*/
if (dom->fallback_homedir) {
return expand_homedir_template(mem_ctx, dom->fallback_homedir,
- name, uid, homedir, dom->name);
+ name, uid, homedir,
+ dom->name, NULL);
} else if (nctx->fallback_homedir) {
return expand_homedir_template(mem_ctx, nctx->fallback_homedir,
- name, uid, homedir, dom->name);
+ name, uid, homedir,
+ dom->name, NULL);
}
}
diff --git a/src/responder/pac/pacsrv_utils.c b/src/responder/pac/pacsrv_utils.c
index 824daa62..c868b107 100644
--- a/src/responder/pac/pacsrv_utils.c
+++ b/src/responder/pac/pacsrv_utils.c
@@ -796,7 +796,7 @@ errno_t get_pwd_from_pac(TALLOC_CTX *mem_ctx,
if (dom->subdomain_homedir) {
pwd->pw_dir = expand_homedir_template(pwd, dom->subdomain_homedir,
lname, pwd->pw_uid, NULL,
- dom->name);
+ dom->name, dom->flat_name);
if (pwd->pw_dir == NULL) {
ret = ENOMEM;
goto done;