summaryrefslogtreecommitdiffstats
path: root/src/responder/nss
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-10-17 14:43:07 +0200
committerJakub Hrozek <jhrozek@redhat.com>2012-10-18 20:20:29 +0200
commitb8c33686aeb5fb34112b46fc93175a3ec887d9a1 (patch)
tree1a7cd663ac9f91af761d0dc4ff4aa30b54ebed35 /src/responder/nss
parent78fb6ec085ba14e513361e42ed9285888ac319e3 (diff)
downloadsssd-b8c33686aeb5fb34112b46fc93175a3ec887d9a1.tar.gz
sssd-b8c33686aeb5fb34112b46fc93175a3ec887d9a1.tar.xz
sssd-b8c33686aeb5fb34112b46fc93175a3ec887d9a1.zip
Allow setting the default_shell option per-domain as well
https://fedorahosted.org/sssd/ticket/1583
Diffstat (limited to 'src/responder/nss')
-rw-r--r--src/responder/nss/nsssrv_cmd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index 42d32e9db..ec2561123 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -173,7 +173,9 @@ static const char *get_shell_override(TALLOC_CTX *mem_ctx,
user_shell = ldb_msg_find_attr_as_string(msg, SYSDB_SHELL, NULL);
if (!user_shell) {
/* Check whether there is a default shell specified */
- if (nctx->default_shell) {
+ if (dom->default_shell) {
+ return talloc_strdup(mem_ctx, dom->default_shell);
+ } else if (nctx->default_shell) {
return talloc_strdup(mem_ctx, nctx->default_shell);
}
return NULL;