summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnicronNL <kim.sidney@gmail.com>2018-05-17 22:52:01 +0200
committerUnicronNL <kim.sidney@gmail.com>2018-05-17 22:52:01 +0200
commit80ec9b746124ca540faeac332131a7833a08b14c (patch)
treeaf5eb4664e13097b4607b30ef31bee2fdbe7661b
parent9535c4b1c1fb6613e2abacac38b7f3bbf80a9309 (diff)
downloadlibpam-radius-auth-80ec9b746124ca540faeac332131a7833a08b14c.tar.gz
libpam-radius-auth-80ec9b746124ca540faeac332131a7833a08b14c.zip
Do not include config file
Use vbash instead of bash Only change shell for priv user
-rw-r--r--debian/radius-shell.postinst4
-rw-r--r--src/radius_shell.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/radius-shell.postinst b/debian/radius-shell.postinst
index 55ebd22..6d7e941 100644
--- a/debian/radius-shell.postinst
+++ b/debian/radius-shell.postinst
@@ -9,12 +9,12 @@ case "$1" in
configure)
radshell=/sbin/radius_shell
chmod 750 $radshell
- chgrp radius_users $radshell
+ chgrp users $radshell
setcap cap_setuid+ep $radshell
# The users will have been created by the libnss-mapuser package
# and possibly by an older version, so change the shells here.
# This also prevents a loop in package install ordering dependencies
- for usr in radius_user radius_priv_user; do
+ for usr in radius_priv_user; do
uent="$(getent -s compat passwd $usr 2>/dev/null)" || true
[ -z "$uent" ] && continue
case "$uent" in
diff --git a/src/radius_shell.c b/src/radius_shell.c
index 5da76dc..e7cffad 100644
--- a/src/radius_shell.c
+++ b/src/radius_shell.c
@@ -92,7 +92,7 @@ execit:
/*
* Eventually handle this program being linked or symlinked
* and that the shell is one of the shells in /etc/shells
- * Expect it to be installed as /sbin/radius/bash, etc.
+ * Expect it to be installed as /sbin/radius/vbash, etc.
*/
shell = strrchr(args[0], '/');
if (!shell)
@@ -110,11 +110,11 @@ execit:
/* should really check this against /etc/shell */
snprintf(execshell, sizeof execshell, "/bin/%s", check);
#else
- check = "bash";
+ check = "vbash";
if (*args[0] == '-')
- shell = "-bash";
+ shell = "-vbash";
else
- shell = "bash";
+ shell = "vbash";
snprintf(execshell, sizeof execshell, "/bin/%s", check);
#endif