diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2013-02-07 13:04:24 -0500 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-02-10 19:43:16 +0100 |
commit | fb91c1c9275ae93293d0b182c6ba892438d9cdcf (patch) | |
tree | cad2760d0cf8e4b70ab18421d91f79f127791415 /src/responder/nss | |
parent | 1117cf65b89b6cbd3a3b1e34589f57ab71a35d60 (diff) | |
download | sssd-fb91c1c9275ae93293d0b182c6ba892438d9cdcf.tar.gz sssd-fb91c1c9275ae93293d0b182c6ba892438d9cdcf.tar.xz sssd-fb91c1c9275ae93293d0b182c6ba892438d9cdcf.zip |
NSS: Add original homedir to home directory template options
https://fedorahosted.org/sssd/ticket/1805
Diffstat (limited to 'src/responder/nss')
-rw-r--r-- | src/responder/nss/nsssrv_cmd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 3aea4391e..93cd2dd45 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -176,28 +176,29 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx, { const char *homedir; + homedir = ldb_msg_find_attr_as_string(msg, SYSDB_HOMEDIR, NULL); + /* Check whether we are unconditionally overriding the server * for home directory locations. */ if (dom->override_homedir) { return expand_homedir_template(mem_ctx, dom->override_homedir, - name, uid, dom->name); + name, uid, homedir, dom->name); } else if (nctx->override_homedir) { return expand_homedir_template(mem_ctx, nctx->override_homedir, - name, uid, dom->name); + name, uid, homedir, dom->name); } - homedir = ldb_msg_find_attr_as_string(msg, SYSDB_HOMEDIR, NULL); if (!homedir || *homedir == '\0') { /* In the case of a NULL or empty homedir, check to see if * we have a fallback homedir to use. */ if (dom->fallback_homedir) { return expand_homedir_template(mem_ctx, dom->fallback_homedir, - name, uid, dom->name); + name, uid, homedir, dom->name); } else if (nctx->fallback_homedir) { return expand_homedir_template(mem_ctx, nctx->fallback_homedir, - name, uid, dom->name); + name, uid, homedir, dom->name); } } |