diff options
| author | Robert Fairley <rfairley@users.noreply.github.com> | 2018-11-21 02:46:02 -0500 |
|---|---|---|
| committer | Tomáš Mráz <t8m@users.noreply.github.com> | 2018-11-21 08:46:02 +0100 |
| commit | 8eaf5570cf011148a0b55c53570df5edaafebdb0 (patch) | |
| tree | ca73af7e2b7eeb5a6a2dbf42af96c2db3b3f7795 /xtests | |
| parent | f9c9c72121eada731e010ab3620762bcf63db08f (diff) | |
| download | pam-8eaf5570cf011148a0b55c53570df5edaafebdb0.tar.gz pam-8eaf5570cf011148a0b55c53570df5edaafebdb0.tar.bz2 pam-8eaf5570cf011148a0b55c53570df5edaafebdb0.zip | |
pam_motd: Fix segmentation fault when no motd_dir specified (#76)
This fixes a regression introduced by #69, where motd_path was set
to NULL and passed into strdup() if the motd_dir argument was
not specified in the configuration file. This caused a segmentation
fault.
* modules/pam_motd/pam_motd.c: fix checks for NULL in arguments
* xtests/Makefile.am: add test scripts and config file
* xtests/tst-pam_motd.sh: add running tst-pam_motd4.sh
* xtests/tst-pam_motd4.pamd: create
* xtests/tst-pam_motd4.sh: create
Diffstat (limited to 'xtests')
| -rw-r--r-- | xtests/Makefile.am | 4 | ||||
| -rwxr-xr-x | xtests/tst-pam_motd.sh | 1 | ||||
| -rw-r--r-- | xtests/tst-pam_motd4.pamd | 3 | ||||
| -rwxr-xr-x | xtests/tst-pam_motd4.sh | 27 |
4 files changed, 33 insertions, 2 deletions
diff --git a/xtests/Makefile.am b/xtests/Makefile.am index 555d5e33..4d5aba3d 100644 --- a/xtests/Makefile.am +++ b/xtests/Makefile.am @@ -34,8 +34,8 @@ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ tst-pam_pwhistory1.pamd tst-pam_pwhistory1.sh \ tst-pam_time1.pamd time.conf \ tst-pam_motd.sh tst-pam_motd1.sh tst-pam_motd2.sh \ - tst-pam_motd3.sh tst-pam_motd1.pamd \ - tst-pam_motd2.pamd tst-pam_motd3.pamd + tst-pam_motd3.sh tst-pam_motd4.sh tst-pam_motd1.pamd \ + tst-pam_motd2.pamd tst-pam_motd3.pamd tst-pam_motd4.pamd XTESTS = tst-pam_dispatch1 tst-pam_dispatch2 tst-pam_dispatch3 \ tst-pam_dispatch4 tst-pam_dispatch5 \ diff --git a/xtests/tst-pam_motd.sh b/xtests/tst-pam_motd.sh index 9b0c38f6..90801280 100755 --- a/xtests/tst-pam_motd.sh +++ b/xtests/tst-pam_motd.sh @@ -5,3 +5,4 @@ set -e ./tst-pam_motd1.sh ./tst-pam_motd2.sh ./tst-pam_motd3.sh +./tst-pam_motd4.sh diff --git a/xtests/tst-pam_motd4.pamd b/xtests/tst-pam_motd4.pamd new file mode 100644 index 00000000..9dc311ad --- /dev/null +++ b/xtests/tst-pam_motd4.pamd @@ -0,0 +1,3 @@ +#%PAM-1.0 +session required pam_permit.so +session optional pam_motd.so motd=tst-pam_motd4.d/etc/motd diff --git a/xtests/tst-pam_motd4.sh b/xtests/tst-pam_motd4.sh new file mode 100755 index 00000000..6022177f --- /dev/null +++ b/xtests/tst-pam_motd4.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +TST_DIR="tst-pam_motd4.d" + +function tst_cleanup() { + rm -rf "${TST_DIR}" + rm -f tst-pam_motd4.out +} + +mkdir -p ${TST_DIR}/etc + +# Verify the case of single motd with no motd_dir given in tst-pam_motd4.pamd +echo "motd: /etc/motd" > ${TST_DIR}/etc/motd + +./tst-pam_motd tst-pam_motd4 > tst-pam_motd4.out + +RET=$? + +motd_to_show_output=$(cat tst-pam_motd4.out | grep "motd: /etc/motd") +if [ -z "${motd_to_show_output}" ]; +then + tst_cleanup + exit 1 +fi + +tst_cleanup +exit $RET |