From: Alejandro Colomar Date: Mon, 15 Dec 2025 23:18:45 +0000 (+0100) Subject: */: expiry(1): Remove program X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2bb1b9842b387b4da7611069be195d9e6aff8306;p=thirdparty%2Fshadow.git */: expiry(1): Remove program Password expiration is deprecated, and will be eventually removed. The functionality of expiry(1) is the most superfluous of password expiry and can be removed early. This shouldn't conflict with any existing regulations about password expiry. Link: Signed-off-by: Alejandro Colomar --- diff --git a/man/Makefile.am b/man/Makefile.am index 315bb0c27..50ef284d3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -12,7 +12,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ @@ -79,7 +78,6 @@ man_XMANS = \ chgpasswd.8.xml \ chpasswd.8.xml \ chsh.1.xml \ - expiry.1.xml \ faillog.5.xml \ faillog.8.xml \ getsubids.1.xml \ diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am index ed6d4ae53..3a7a2a1ae 100644 --- a/man/cs/Makefile.am +++ b/man/cs/Makefile.am @@ -2,7 +2,6 @@ mandir = @mandir@/cs man_MANS = \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man1/gpasswd.1 \ diff --git a/man/cs/man1/expiry.1 b/man/cs/man1/expiry.1 deleted file mode 100644 index 99a0b4efd..000000000 --- a/man/cs/man1/expiry.1 +++ /dev/null @@ -1,25 +0,0 @@ -.TH "EXPIRY" "1" "11/05/2005" "User Commands" "User Commands" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "JMÉNO" -expiry \- zkontroluje a vynutí politiku vypršení platnosti hesla -.SH "POUŽITÍ" -.HP 7 -\fBexpiry\fR [\-c] [\-f] -.SH "POPIS" -.PP -\fBexpiry\fR -zkontroluje (\fB\-c\fR) vypršení platnosti aktuálního hesla a případně vynutí (\fB\-f\fR) změnu. Příkaz lze spustit jako běžný uživatel. -.SH "SOUBORY" -.TP -\fI/etc/passwd\fR -informace o uživatelských účtech -.TP -\fI/etc/shadow\fR -důvěrné informace o uživatelských účtech -.SH "VIZ TAKÉ" -.PP -\fBpasswd\fR(5), -\fBshadow\fR(5). diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 49505ef94..77fa03809 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/expiry.1.xml b/man/expiry.1.xml deleted file mode 100644 index 338b3bf76..000000000 --- a/man/expiry.1.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - -]> - - - - - - Julianne Frances - Haugh - Creation, 1990 - - - Thomas - Kłoczko - kloczek@pld.org.pl - shadow-utils maintainer, 2000 - 2007 - - - Nicolas - François - nicolas.francois@centraliens.net - shadow-utils maintainer, 2007 - now - - - - expiry - 1 - User Commands - shadow-utils - &SHADOW_UTILS_VERSION; - - - expiry - check and enforce password expiration policy - - - - - expiry - - option - - - - - - DESCRIPTION - - The expiry command checks () - the current password expiration and forces () - changes when required. It is callable as a normal user command. - - - - - OPTIONS - - The options which apply to the expiry command are: - - - - , - - Check the password expiration of the current user. - - - - , - - - Force a password change if the current user has an expired - password. - - - - - , - - Display help message and exit. - - - - - - - FILES - - - /etc/passwd - - User account information. - - - - /etc/shadow - - Secure user account information. - - - - - - - SEE ALSO - - - passwd5 - , - - shadow5 - . - - - diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index 48fcc40fa..3987b8b95 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/it/Makefile.am b/man/it/Makefile.am index f833713b7..709478d9f 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am index 9f3bbe4ae..26c3c0c3b 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -6,7 +6,6 @@ man_MANS = \ man1/chfn.1 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man1/gpasswd.1 \ diff --git a/man/ja/man1/expiry.1 b/man/ja/man1/expiry.1 deleted file mode 100644 index 6658372b9..000000000 --- a/man/ja/man1/expiry.1 +++ /dev/null @@ -1,30 +0,0 @@ -.\" SPDX-FileCopyrightText: 1990 - 1994 Julianne Frances Haugh -.\" SPDX-FileCopyrightText: 1997 Kazuyoshi Furutaka -.\" SPDX-License-Identifier: BSD-3-Clause -.\" -.\" Modified for expiry by Ben Collins , 1999 -.\" Translated Sun 3 Mar 2002 by NAKANO Takeo -.\" Modified Tue 16 Sep 2002 by NAKANO Takeo -.\" -.\" $Id$ -.\" -.TH EXPIRY 1 -.SH 名前 -expiry \- パスワードの期限切れポリシーのチェックと執行 -.SH 書式 -.TP 6 -\fBexpiry\fR [\fB\-c\fR] [\fB\-f\fR] -.SH 説明 -.B expiry -は現在のパスワード期限切れ情報をチェック (\fB\-c\fR) し、 -必要な場合は変更を強制する (\fB\-f\fR)。 -このコマンドは通常のユーザコマンドとして呼び出し可能である。 -.SH ファイル -\fI/etc/passwd\fR \- ユーザアカウント情報 -.br -\fI/etc/shadow\fR \- shadow 化されたユーザアカウント情報 -.SH 関連項目 -.BR passwd (5), -.BR shadow (5) -.SH 著者 -Ben Collins diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml index 18acbd240..5f81b5e2e 100644 --- a/man/login.defs.5.xml +++ b/man/login.defs.5.xml @@ -282,7 +282,6 @@ - gpasswd diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index c691231da..f82177088 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -5,7 +5,6 @@ mandir = @mandir@/pl man_MANS = \ man1/chage.1 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/po/XMLFILES b/man/po/XMLFILES index f3a8e2f50..12f207dd4 100644 --- a/man/po/XMLFILES +++ b/man/po/XMLFILES @@ -5,7 +5,6 @@ XMLFILES = \ $(top_srcdir)/man/chgpasswd.8.xml \ $(top_srcdir)/man/chpasswd.8.xml \ $(top_srcdir)/man/chsh.1.xml \ - $(top_srcdir)/man/expiry.1.xml \ $(top_srcdir)/man/faillog.5.xml \ $(top_srcdir)/man/faillog.8.xml \ $(top_srcdir)/man/gpasswd.1.xml \ diff --git a/man/po/shadow-man-pages.pot b/man/po/shadow-man-pages.pot index e4634bcfe..8c9c6fc45 100644 --- a/man/po/shadow-man-pages.pot +++ b/man/po/shadow-man-pages.pot @@ -15,7 +15,6 @@ msgstr "" #: chfn.1.xml.out:18 #: chpasswd.8.xml.out:21 #: chsh.1.xml.out:18 -#: expiry.1.xml.out:19 #: faillog.5.xml.out:15 #: faillog.8.xml.out:15 #: groupadd.8.xml.out:18 @@ -48,7 +47,6 @@ msgstr "" #: chfn.1.xml.out:19 #: chpasswd.8.xml.out:22 #: chsh.1.xml.out:19 -#: expiry.1.xml.out:20 #: faillog.5.xml.out:16 #: faillog.8.xml.out:16 #: groupadd.8.xml.out:19 @@ -80,7 +78,6 @@ msgstr "" #: chage.1.xml.out:18 #: chfn.1.xml.out:20 #: chsh.1.xml.out:20 -#: expiry.1.xml.out:21 msgid "Creation, 1990" msgstr "" @@ -90,7 +87,6 @@ msgstr "" #: chgpasswd.8.xml.out:22 #: chpasswd.8.xml.out:26 #: chsh.1.xml.out:23 -#: expiry.1.xml.out:24 #: faillog.5.xml.out:20 #: faillog.8.xml.out:20 #: gpasswd.1.xml.out:27 @@ -131,7 +127,6 @@ msgstr "" #: chgpasswd.8.xml.out:23 #: chpasswd.8.xml.out:27 #: chsh.1.xml.out:24 -#: expiry.1.xml.out:25 #: faillog.5.xml.out:21 #: faillog.8.xml.out:21 #: gpasswd.1.xml.out:28 @@ -172,7 +167,6 @@ msgstr "" #: chgpasswd.8.xml.out:24 #: chpasswd.8.xml.out:28 #: chsh.1.xml.out:25 -#: expiry.1.xml.out:26 #: faillog.5.xml.out:22 #: faillog.8.xml.out:22 #: gpasswd.1.xml.out:29 @@ -212,7 +206,6 @@ msgstr "" #: chfn.1.xml.out:26 #: chpasswd.8.xml.out:29 #: chsh.1.xml.out:26 -#: expiry.1.xml.out:27 #: faillog.5.xml.out:23 #: faillog.8.xml.out:23 #: gpasswd.1.xml.out:30 @@ -253,7 +246,6 @@ msgstr "" #: chgpasswd.8.xml.out:28 #: chpasswd.8.xml.out:32 #: chsh.1.xml.out:29 -#: expiry.1.xml.out:30 #: faillog.5.xml.out:26 #: faillog.8.xml.out:26 #: gpasswd.1.xml.out:33 @@ -296,7 +288,6 @@ msgstr "" #: chgpasswd.8.xml.out:29 #: chpasswd.8.xml.out:33 #: chsh.1.xml.out:30 -#: expiry.1.xml.out:31 #: faillog.5.xml.out:27 #: faillog.8.xml.out:27 #: gpasswd.1.xml.out:34 @@ -339,7 +330,6 @@ msgstr "" #: chgpasswd.8.xml.out:30 #: chpasswd.8.xml.out:34 #: chsh.1.xml.out:31 -#: expiry.1.xml.out:32 #: faillog.5.xml.out:28 #: faillog.8.xml.out:28 #: gpasswd.1.xml.out:35 @@ -382,7 +372,6 @@ msgstr "" #: chgpasswd.8.xml.out:31 #: chpasswd.8.xml.out:35 #: chsh.1.xml.out:32 -#: expiry.1.xml.out:33 #: faillog.5.xml.out:29 #: faillog.8.xml.out:29 #: gpasswd.1.xml.out:36 @@ -453,7 +442,6 @@ msgstr "" #: chpasswd.8.xml.out:307 #: chsh.1.xml.out:37 #: chsh.1.xml.out:212 -#: expiry.1.xml.out:38 #: faillog.8.xml.out:235 #: gpasswd.1.xml.out:41 #: gpasswd.1.xml.out:95 @@ -545,7 +533,6 @@ msgstr "" #: chage.1.xml.out:36 #: chfn.1.xml.out:38 #: chsh.1.xml.out:38 -#: expiry.1.xml.out:39 #: gpasswd.1.xml.out:42 #: groups.1.xml.out:35 #: login.1.xml.out:68 @@ -562,7 +549,6 @@ msgstr "" #: chgpasswd.8.xml.out:38 #: chpasswd.8.xml.out:42 #: chsh.1.xml.out:39 -#: expiry.1.xml.out:40 #: faillog.5.xml.out:36 #: faillog.8.xml.out:36 #: gpasswd.1.xml.out:43 @@ -605,7 +591,6 @@ msgstr "" #: chgpasswd.8.xml.out:39 #: chpasswd.8.xml.out:43 #: chsh.1.xml.out:40 -#: expiry.1.xml.out:41 #: faillog.5.xml.out:37 #: faillog.8.xml.out:37 #: gpasswd.1.xml.out:44 @@ -702,7 +687,6 @@ msgstr "" #: chgpasswd.8.xml.out:56 #: chpasswd.8.xml.out:60 #: chsh.1.xml.out:60 -#: expiry.1.xml.out:58 #: faillog.5.xml.out:45 #: faillog.8.xml.out:54 #: gpasswd.1.xml.out:72 @@ -752,7 +736,6 @@ msgstr "" #: chgpasswd.8.xml.out:83 #: chpasswd.8.xml.out:108 #: chsh.1.xml.out:71 -#: expiry.1.xml.out:67 #: faillog.8.xml.out:65 #: gpasswd.1.xml.out:112 #: groupadd.8.xml.out:51 @@ -781,7 +764,6 @@ msgstr "" #: chgpasswd.8.xml.out:84 #: chpasswd.8.xml.out:109 #: chsh.1.xml.out:72 -#: expiry.1.xml.out:68 #: faillog.8.xml.out:66 #: gpasswd.1.xml.out:120 #: groupadd.8.xml.out:81 @@ -1009,7 +991,6 @@ msgstr "" #: chgpasswd.8.xml.out:113 #: chpasswd.8.xml.out:153 #: chsh.1.xml.out:77 -#: expiry.1.xml.out:88 #: faillog.8.xml.out:98 #: gpasswd.1.xml.out:151 #: groupadd.8.xml.out:118 @@ -1037,7 +1018,6 @@ msgstr "" #: chgpasswd.8.xml.out:113 #: chpasswd.8.xml.out:153 #: chsh.1.xml.out:77 -#: expiry.1.xml.out:88 #: faillog.8.xml.out:98 #: gpasswd.1.xml.out:151 #: groupadd.8.xml.out:118 @@ -1071,9 +1051,6 @@ msgstr "" #: chpasswd.8.xml.out:153 #: chpasswd.8.xml.out:161 #: chsh.1.xml.out:77 -#: expiry.1.xml.out:73 -#: expiry.1.xml.out:79 -#: expiry.1.xml.out:88 #: faillog.8.xml.out:72 #: faillog.8.xml.out:98 #: faillog.8.xml.out:144 @@ -1155,7 +1132,6 @@ msgstr "" #: chgpasswd.8.xml.out:115 #: chpasswd.8.xml.out:155 #: chsh.1.xml.out:79 -#: expiry.1.xml.out:90 #: faillog.8.xml.out:100 #: gpasswd.1.xml.out:153 #: groupadd.8.xml.out:120 @@ -1779,7 +1755,6 @@ msgstr "" #: chgpasswd.8.xml.out:218 #: chpasswd.8.xml.out:274 #: chsh.1.xml.out:163 -#: expiry.1.xml.out:97 #: faillog.5.xml.out:72 #: faillog.8.xml.out:220 #: gpasswd.1.xml.out:258 @@ -1820,7 +1795,6 @@ msgstr "" #: chfn.1.xml.out:193 #: chpasswd.8.xml.out:277 #: chsh.1.xml.out:166 -#: expiry.1.xml.out:100 #: groupmod.8.xml.out:245 #: grpck.8.xml.out:223 #: lastlog.8.xml.out:63 @@ -1862,7 +1836,6 @@ msgstr "" #: chfn.1.xml.out:195 #: chpasswd.8.xml.out:279 #: chsh.1.xml.out:168 -#: expiry.1.xml.out:102 #: groupmod.8.xml.out:247 #: grpck.8.xml.out:225 #: login.1.xml.out:331 @@ -1884,7 +1857,6 @@ msgstr "" #. (itstool) path: para/filename #: chage.1.xml.out:288 #: chpasswd.8.xml.out:283 -#: expiry.1.xml.out:106 #: login.1.xml.out:335 #: newgrp.1.xml.out:68 #: newgrp.1.xml.out:106 @@ -1925,7 +1897,6 @@ msgstr "" #. (itstool) path: listitem/para #: chage.1.xml.out:291 #: chpasswd.8.xml.out:285 -#: expiry.1.xml.out:108 #: login.1.xml.out:337 #: newgrp.1.xml.out:108 #: newusers.8.xml.out:428 @@ -2034,7 +2005,6 @@ msgstr "" #: chgpasswd.8.xml.out:242 #: chpasswd.8.xml.out:304 #: chsh.1.xml.out:209 -#: expiry.1.xml.out:115 #: faillog.5.xml.out:84 #: faillog.8.xml.out:232 #: gpasswd.1.xml.out:276 @@ -2082,7 +2052,6 @@ msgstr "" #: chfn.1.xml.out:211 #: chpasswd.8.xml.out:307 #: chsh.1.xml.out:218 -#: expiry.1.xml.out:118 #: groupadd.8.xml.out:351 #: groupdel.8.xml.out:211 #: groupmems.8.xml.out:215 @@ -2140,8 +2109,6 @@ msgstr "" #: chpasswd.8.xml.out:314 #: chsh.1.xml.out:215 #: chsh.1.xml.out:218 -#: expiry.1.xml.out:118 -#: expiry.1.xml.out:121 #: faillog.5.xml.out:34 #: faillog.8.xml.out:238 #: gpasswd.1.xml.out:294 @@ -2224,7 +2191,6 @@ msgstr "" #. (itstool) path: refnamediv/refname #. (itstool) path: para/filename #: chage.1.xml.out:337 -#: expiry.1.xml.out:121 #: grpck.8.xml.out:51 #: grpck.8.xml.out:190 #: grpck.8.xml.out:297 @@ -2255,7 +2221,6 @@ msgstr "" #. (itstool) path: refsect1/para #: chage.1.xml.out:332 -#: expiry.1.xml.out:116 #: faillog.8.xml.out:233 #: nologin.8.xml.out:58 #: shadow.3.xml.out:215 @@ -2336,8 +2301,6 @@ msgstr "" #. (itstool) path: para/option #. (itstool) path: cmdsynopsis/arg #: chfn.1.xml.out:94 -#: expiry.1.xml.out:61 -#: expiry.1.xml.out:79 #: groupadd.8.xml.out:88 #: groupdel.8.xml.out:72 #: login.1.xml.out:90 @@ -2784,8 +2747,6 @@ msgstr "" #: chpasswd.8.xml.out:86 #: chpasswd.8.xml.out:116 #: chpasswd.8.xml.out:135 -#: expiry.1.xml.out:60 -#: expiry.1.xml.out:73 #: newusers.8.xml.out:270 #: sg.1.xml.out:50 #: su.1.xml.out:86 @@ -3546,57 +3507,18 @@ msgstr "" msgid "Directory for additional user defined configuration files." msgstr "" -#. (itstool) path: refmeta/refentrytitle -#. (itstool) path: refnamediv/refname -#. (itstool) path: cmdsynopsis/command -#. (itstool) path: para/command -#: expiry.1.xml.out:37 -#: expiry.1.xml.out:44 -#: expiry.1.xml.out:50 -#: expiry.1.xml.out:60 -#: expiry.1.xml.out:69 -msgid "expiry" -msgstr "" - -#. (itstool) path: refnamediv/refpurpose -#: expiry.1.xml.out:45 -msgid "check and enforce password expiration policy" -msgstr "" - #. (itstool) path: arg/replaceable -#: expiry.1.xml.out:52 #: gpasswd.1.xml.out:63 msgid "option" msgstr "" -#. (itstool) path: refsect1/para -#: expiry.1.xml.out:59 -msgid "The <_:command-1/> command checks (<_:option-2/>) the current password expiration and forces (<_:option-3/>) changes when required. It is callable as a normal user command." -msgstr "" - -#. (itstool) path: term/option -#: expiry.1.xml.out:73 -msgid "--check" -msgstr "" - -#. (itstool) path: listitem/para -#: expiry.1.xml.out:75 -msgid "Check the password expiration of the current user." -msgstr "" - #. (itstool) path: term/option -#: expiry.1.xml.out:79 #: groupadd.8.xml.out:88 #: groupdel.8.xml.out:72 #: userdel.8.xml.out:76 msgid "--force" msgstr "" -#. (itstool) path: listitem/para -#: expiry.1.xml.out:81 -msgid "Force a password change if the current user has an expired password." -msgstr "" - #. (itstool) path: author/contrib #: faillog.5.xml.out:17 #: faillog.8.xml.out:17 diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index 4ed352858..b3102b1d2 100644 --- a/man/ru/Makefile.am +++ b/man/ru/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am index 929954859..64eda7e65 100644 --- a/man/sv/Makefile.am +++ b/man/sv/Makefile.am @@ -4,7 +4,6 @@ mandir = @mandir@/sv man_MANS = \ man1/chage.1 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am index b23da85c7..b61a38e82 100644 --- a/man/uk/Makefile.am +++ b/man/uk/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am index 937a620c6..83ed1776e 100644 --- a/man/zh_CN/Makefile.am +++ b/man/zh_CN/Makefile.am @@ -7,7 +7,6 @@ man_MANS = \ man8/chgpasswd.8 \ man8/chpasswd.8 \ man1/chsh.1 \ - man1/expiry.1 \ man5/faillog.5 \ man8/faillog.8 \ man3/getspnam.3 \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0dae69660..2071f3f82 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -79,7 +79,6 @@ src/chfn.c src/chgpasswd.c src/chpasswd.c src/chsh.c -src/expiry.c src/faillog.c src/gpasswd.c src/groupadd.c diff --git a/src/.gitignore b/src/.gitignore index 2dc79ad5f..5c78083e1 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -3,7 +3,6 @@ /chgpasswd /chpasswd /chsh -/expiry /faillog /gpasswd /groupadd diff --git a/src/Makefile.am b/src/Makefile.am index de78dde78..187a32a8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ AM_CFLAGS = $(LIBBSD_CFLAGS) bin_PROGRAMS = login sbin_PROGRAMS = nologin -ubin_PROGRAMS = faillog chage chfn chsh expiry gpasswd newgrp passwd +ubin_PROGRAMS = faillog chage chfn chsh gpasswd newgrp passwd if ENABLE_SUBIDS ubin_PROGRAMS += newgidmap newuidmap endif @@ -62,7 +62,7 @@ noinst_PROGRAMS = sulogin suidusbins = suidbins = -suidubins = chage chfn chsh expiry gpasswd newgrp +suidubins = chage chfn chsh gpasswd newgrp if WITH_SU suidbins += su endif @@ -96,7 +96,6 @@ chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) chgpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) -ldl -expiry_LDADD = $(LDADD) $(LIBECONF) gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -ldl groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -ldl diff --git a/src/expiry.c b/src/expiry.c deleted file mode 100644 index 8da89bdf7..000000000 --- a/src/expiry.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - * SPDX-FileCopyrightText: 1994 , Julianne Frances Haugh - * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz - * SPDX-FileCopyrightText: 2001 - 2006, Tomasz Kłoczko - * SPDX-FileCopyrightText: 2007 - 2011, Nicolas François - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#ident "$Id$" - -#include -#include -#include -#include -#include - -#include "attr.h" -#include "defines.h" -#include "prototypes.h" -/*@-exitarg@*/ -#include "exitcodes.h" -#include "shadowlog.h" - -/* Global variables */ -static const char Prog[] = "expiry"; -static bool cflg = false; - -/* local function prototypes */ -static void catch_signals(int); -NORETURN static void usage (int status); -static void process_flags (int argc, char **argv); - -/* - * catch_signals - signal catcher - */ -static void -catch_signals(int) -{ - _exit (10); -} - -/* - * usage - print syntax message and exit - */ -NORETURN -static void -usage (int status) -{ - FILE *usageout = (E_SUCCESS != status) ? stderr : stdout; - (void) fprintf (usageout, - _("Usage: %s [options]\n" - "\n" - "Options:\n"), - Prog); - (void) fputs (_(" -c, --check check the user's password expiration\n"), usageout); - (void) fputs (_(" -f, --force force password change if the user's password\n" - " is expired\n"), usageout); - (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); - (void) fputs ("\n", usageout); - exit (status); -} - -/* - * process_flags - parse the command line options - * - * It will not return if an error is encountered. - */ -static void process_flags (int argc, char **argv) -{ - bool fflg = false; - int c; - static struct option long_options[] = { - {"check", no_argument, NULL, 'c'}, - {"force", no_argument, NULL, 'f'}, - {"help", no_argument, NULL, 'h'}, - {NULL, 0, NULL, '\0'} - }; - - while ((c = getopt_long (argc, argv, "cfh", - long_options, NULL)) != -1) { - switch (c) { - case 'c': - cflg = true; - break; - case 'f': - fflg = true; - break; - case 'h': - usage (E_SUCCESS); - /*@notreached@*/break; - default: - usage (E_USAGE); - } - } - - if (! (cflg || fflg)) { - usage (E_USAGE); - } - - if (cflg && fflg) { - fprintf (stderr, - _("%s: options %s and %s conflict\n"), - Prog, "-c", "-f"); - usage (E_USAGE); - } - - if (argc != optind) { - fprintf (stderr, - _("%s: unexpected argument: %s\n"), - Prog, argv[optind]); - usage (E_USAGE); - } -} - -/* - * expiry - check and enforce password expiration policy - * - * expiry checks (-c) the current password expiration and forces (-f) - * changes when required. It is callable as a normal user command. - */ -int main (int argc, char **argv) -{ - struct passwd *pwd; - struct spwd *spwd; - - sanitize_env (); - check_fds (); - - log_set_progname(Prog); - log_set_logfd(stderr); - - /* - * Start by disabling all of the keyboard signals. - */ - (void) signal (SIGHUP, catch_signals); - (void) signal (SIGINT, catch_signals); - (void) signal (SIGQUIT, catch_signals); - (void) signal (SIGTSTP, catch_signals); - - /* - * expiry takes one of two arguments. The default action is to give - * the usage message. - */ - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); - - OPENLOG (Prog); - - process_flags (argc, argv); - - /* - * Get user entries for /etc/passwd and /etc/shadow - */ - pwd = get_my_pwent (); - if (NULL == pwd) { - fprintf (stderr, _("%s: Cannot determine your user name.\n"), - Prog); - SYSLOG ((LOG_WARN, "Cannot determine the user name of the caller (UID %lu)", - (unsigned long) getuid ())); - exit (10); - } - spwd = getspnam (pwd->pw_name); /* !USE_PAM, No need for xgetspnam */ - - /* - * If checking accounts, use agecheck() function. - */ - if (cflg) { - /* - * Print out number of days until expiration. - */ - agecheck (spwd); - - /* - * Exit with status indicating state of account. - */ - exit (isexpired (pwd, spwd)); - } - - /* - * Otherwise, force a password change with the expire() function. - * It will force the change or give a message indicating what to - * do. - * It won't return unless the account is unexpired. - */ - (void) expire (pwd, spwd); - - return E_SUCCESS; -} - diff --git a/tests/debian/01/data/passwd_files b/tests/debian/01/data/passwd_files index 1afa1ca0d..2f3cabdd0 100644 --- a/tests/debian/01/data/passwd_files +++ b/tests/debian/01/data/passwd_files @@ -18,7 +18,6 @@ /usr/bin/chage /usr/bin/chfn /usr/bin/chsh -/usr/bin/expiry /usr/bin/gpasswd /usr/bin/passwd /usr/sbin @@ -59,7 +58,6 @@ /usr/share/man /usr/share/man/cs /usr/share/man/cs/man1 -/usr/share/man/cs/man1/expiry.1.gz /usr/share/man/cs/man1/gpasswd.1.gz /usr/share/man/cs/man5 /usr/share/man/cs/man5/gshadow.5.gz @@ -85,7 +83,6 @@ /usr/share/man/de/man1/chage.1.gz /usr/share/man/de/man1/chfn.1.gz /usr/share/man/de/man1/chsh.1.gz -/usr/share/man/de/man1/expiry.1.gz /usr/share/man/de/man1/gpasswd.1.gz /usr/share/man/de/man1/passwd.1.gz /usr/share/man/de/man5 @@ -119,7 +116,6 @@ /usr/share/man/fr/man1/chage.1.gz /usr/share/man/fr/man1/chfn.1.gz /usr/share/man/fr/man1/chsh.1.gz -/usr/share/man/fr/man1/expiry.1.gz /usr/share/man/fr/man1/gpasswd.1.gz /usr/share/man/fr/man1/passwd.1.gz /usr/share/man/fr/man5 @@ -164,7 +160,6 @@ /usr/share/man/it/man1/chage.1.gz /usr/share/man/it/man1/chfn.1.gz /usr/share/man/it/man1/chsh.1.gz -/usr/share/man/it/man1/expiry.1.gz /usr/share/man/it/man1/gpasswd.1.gz /usr/share/man/it/man1/passwd.1.gz /usr/share/man/it/man5 @@ -194,7 +189,6 @@ /usr/share/man/ja/man1/chage.1.gz /usr/share/man/ja/man1/chfn.1.gz /usr/share/man/ja/man1/chsh.1.gz -/usr/share/man/ja/man1/expiry.1.gz /usr/share/man/ja/man1/gpasswd.1.gz /usr/share/man/ja/man1/passwd.1.gz /usr/share/man/ja/man5 @@ -231,7 +225,6 @@ /usr/share/man/man1/chage.1.gz /usr/share/man/man1/chfn.1.gz /usr/share/man/man1/chsh.1.gz -/usr/share/man/man1/expiry.1.gz /usr/share/man/man1/gpasswd.1.gz /usr/share/man/man1/passwd.1.gz /usr/share/man/man5 @@ -264,7 +257,6 @@ /usr/share/man/pl/man1 /usr/share/man/pl/man1/chage.1.gz /usr/share/man/pl/man1/chsh.1.gz -/usr/share/man/pl/man1/expiry.1.gz /usr/share/man/pl/man8 /usr/share/man/pl/man8/groupadd.8.gz /usr/share/man/pl/man8/groupdel.8.gz @@ -291,7 +283,6 @@ /usr/share/man/ru/man1/chage.1.gz /usr/share/man/ru/man1/chfn.1.gz /usr/share/man/ru/man1/chsh.1.gz -/usr/share/man/ru/man1/expiry.1.gz /usr/share/man/ru/man1/gpasswd.1.gz /usr/share/man/ru/man1/passwd.1.gz /usr/share/man/ru/man5 @@ -320,7 +311,6 @@ /usr/share/man/sv/man1 /usr/share/man/sv/man1/chage.1.gz /usr/share/man/sv/man1/chsh.1.gz -/usr/share/man/sv/man1/expiry.1.gz /usr/share/man/sv/man1/passwd.1.gz /usr/share/man/sv/man5 /usr/share/man/sv/man5/gshadow.5.gz @@ -355,7 +345,6 @@ /usr/share/man/zh_CN/man1/chage.1.gz /usr/share/man/zh_CN/man1/chfn.1.gz /usr/share/man/zh_CN/man1/chsh.1.gz -/usr/share/man/zh_CN/man1/expiry.1.gz /usr/share/man/zh_CN/man1/gpasswd.1.gz /usr/share/man/zh_CN/man1/passwd.1.gz /usr/share/man/zh_CN/man5 diff --git a/tests/expiry/01_expiry_-c_no_expiry/config/etc/group b/tests/expiry/01_expiry_-c_no_expiry/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow b/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd b/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow b/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow deleted file mode 100644 index 2baad3b46..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/01_expiry_-c_no_expiry/expiry.exp b/tests/expiry/01_expiry_-c_no_expiry/expiry.exp deleted file mode 100755 index 564f183ca..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "0" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/01_expiry_-c_no_expiry/expiry.test b/tests/expiry/01_expiry_-c_no_expiry/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/01_expiry_-c_no_expiry/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/02_expiry_-c_expired/config/etc/group b/tests/expiry/02_expiry_-c_expired/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/02_expiry_-c_expired/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/02_expiry_-c_expired/config/etc/gshadow b/tests/expiry/02_expiry_-c_expired/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/02_expiry_-c_expired/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/02_expiry_-c_expired/config/etc/passwd b/tests/expiry/02_expiry_-c_expired/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/02_expiry_-c_expired/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/02_expiry_-c_expired/config/etc/shadow b/tests/expiry/02_expiry_-c_expired/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/02_expiry_-c_expired/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/02_expiry_-c_expired/expiry.exp b/tests/expiry/02_expiry_-c_expired/expiry.exp deleted file mode 100755 index 92ae40921..000000000 --- a/tests/expiry/02_expiry_-c_expired/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "1" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/02_expiry_-c_expired/expiry.test b/tests/expiry/02_expiry_-c_expired/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/02_expiry_-c_expired/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/03_expiry_-f_expired/config/etc/group b/tests/expiry/03_expiry_-f_expired/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/03_expiry_-f_expired/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/03_expiry_-f_expired/config/etc/gshadow b/tests/expiry/03_expiry_-f_expired/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/03_expiry_-f_expired/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password b/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password deleted file mode 100644 index cb8c7b710..000000000 --- a/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password +++ /dev/null @@ -1,33 +0,0 @@ -# -# /etc/pam.d/common-password - password-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define the services to be -# used to change user passwords. The default is pam_unix. - -# Explanation of pam_unix options: -# -# The "sha512" option enables salted SHA512 passwords. Without this option, -# the default is Unix crypt. Prior releases used the option "md5". -# -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# -# See the pam_unix manpage for other options. - -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -password [success=1 default=ignore] pam_unix.so obscure sha512 -# here's the fallback if no module succeeds -password requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -password required pam_permit.so -# and here are more per-package modules (the "Additional" block) -# end of pam-auth-update config diff --git a/tests/expiry/03_expiry_-f_expired/config/etc/passwd b/tests/expiry/03_expiry_-f_expired/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/03_expiry_-f_expired/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/03_expiry_-f_expired/config/etc/shadow b/tests/expiry/03_expiry_-f_expired/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/03_expiry_-f_expired/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/03_expiry_-f_expired/data/shadow b/tests/expiry/03_expiry_-f_expired/data/shadow deleted file mode 100644 index 83da315f9..000000000 --- a/tests/expiry/03_expiry_-f_expired/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:@PASS_SHA512 password@:@TODAY@:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/03_expiry_-f_expired/expiry.exp b/tests/expiry/03_expiry_-f_expired/expiry.exp deleted file mode 100755 index ada61c950..000000000 --- a/tests/expiry/03_expiry_-f_expired/expiry.exp +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -f\r" -expect "Your password has expired. Choose a new password." -expect "Enter new UNIX password: " -send "password\r" -expect "Retype new UNIX password: " -send "password\r" -expect "passwd: password updated successfully" -expect "# " -send "echo \$?\r" -expect "0" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/03_expiry_-f_expired/expiry.test b/tests/expiry/03_expiry_-f_expired/expiry.test deleted file mode 100755 index 252afb1be..000000000 --- a/tests/expiry/03_expiry_-f_expired/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/04_expiry_no_options/config/etc/group b/tests/expiry/04_expiry_no_options/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/04_expiry_no_options/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/04_expiry_no_options/config/etc/gshadow b/tests/expiry/04_expiry_no_options/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/04_expiry_no_options/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/04_expiry_no_options/config/etc/passwd b/tests/expiry/04_expiry_no_options/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/04_expiry_no_options/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/04_expiry_no_options/config/etc/shadow b/tests/expiry/04_expiry_no_options/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/04_expiry_no_options/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/04_expiry_no_options/data/usage.out b/tests/expiry/04_expiry_no_options/data/usage.out deleted file mode 100644 index ab67c87b0..000000000 --- a/tests/expiry/04_expiry_no_options/data/usage.out +++ /dev/null @@ -1,8 +0,0 @@ -Usage: expiry [options] - -Options: - -c, --check check the user's password expiration - -f, --force force password change if the user's password - is expired - -h, --help display this help message and exit - diff --git a/tests/expiry/04_expiry_no_options/expiry.test b/tests/expiry/04_expiry_no_options/expiry.test deleted file mode 100755 index 02c6cbb03..000000000 --- a/tests/expiry/04_expiry_no_options/expiry.test +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry provides an Usage message if no options are given" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Call expiry without any option (expiry)..." -expiry 2>tmp/usage.out && exit 1 || { - status=$? -} -echo "OK" - -echo -n "Check returned status ($status)..." -test "$status" = "2" -echo "OK" - -echo "expiry reported:" -echo "=======================================================================" -cat tmp/usage.out -echo "=======================================================================" -echo -n "Check the usage message..." -diff -au data/usage.out tmp/usage.out -echo "usage message OK." -rm -f tmp/usage.out - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow deleted file mode 100644 index 2baad3b46..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp b/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp deleted file mode 100755 index 564f183ca..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "0" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test b/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test deleted file mode 100755 index 0251edd21..000000000 --- a/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Remove /etc/shadow..." -rm -f /etc/shadow -echo "OK" - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check that there are no shadow files..." -test ! -f /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow deleted file mode 100644 index 3789b9f39..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp b/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp deleted file mode 100755 index 564f183ca..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "0" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test b/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/07_expiry_-c_expired_account/config/etc/group b/tests/expiry/07_expiry_-c_expired_account/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow b/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd b/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow b/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow deleted file mode 100644 index 319082d8b..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::13000: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/07_expiry_-c_expired_account/expiry.exp b/tests/expiry/07_expiry_-c_expired_account/expiry.exp deleted file mode 100755 index 18dce25ff..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "3" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/07_expiry_-c_expired_account/expiry.test b/tests/expiry/07_expiry_-c_expired_account/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/07_expiry_-c_expired_account/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow deleted file mode 100644 index 65489e743..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:10:7:10:: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp b/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp deleted file mode 100755 index fc0bf4f68..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "2" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test b/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow deleted file mode 100644 index bf371c096..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:9000:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp b/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp deleted file mode 100755 index 564f183ca..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/expect - -set timeout 2 -expect_after default {puts stderr "\nFAIL"; exit 1} - -spawn /bin/sh -send "if \[ \$(id -u) -eq 0 \]; then PS1='# '; else PS1='$ '; fi\r" -expect "# " - -send "expiry -c\r" -expect "# " -send "echo \$?\r" -expect "0" -expect "# " -send "exit\r" -puts "OK\n" -exit 0 diff --git a/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test b/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test deleted file mode 100755 index 68d653264..000000000 --- a/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "expiry can verify that a password is not expired" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -./expiry.exp - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/10_expiry_bad_option/config/etc/group b/tests/expiry/10_expiry_bad_option/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/10_expiry_bad_option/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/10_expiry_bad_option/config/etc/gshadow b/tests/expiry/10_expiry_bad_option/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/10_expiry_bad_option/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/10_expiry_bad_option/config/etc/passwd b/tests/expiry/10_expiry_bad_option/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/10_expiry_bad_option/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/10_expiry_bad_option/config/etc/shadow b/tests/expiry/10_expiry_bad_option/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/10_expiry_bad_option/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/10_expiry_bad_option/data/usage.out b/tests/expiry/10_expiry_bad_option/data/usage.out deleted file mode 100644 index c2d971667..000000000 --- a/tests/expiry/10_expiry_bad_option/data/usage.out +++ /dev/null @@ -1,9 +0,0 @@ -expiry: invalid option -- 'Z' -Usage: expiry [options] - -Options: - -c, --check check the user's password expiration - -f, --force force password change if the user's password - is expired - -h, --help display this help message and exit - diff --git a/tests/expiry/10_expiry_bad_option/expiry.test b/tests/expiry/10_expiry_bad_option/expiry.test deleted file mode 100755 index bcbbb608c..000000000 --- a/tests/expiry/10_expiry_bad_option/expiry.test +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh -log_start "$0" "expiry provides an Usage message if an invalid option is given" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Call expiry with an invalid option (expiry -Z)..." -expiry -Z 2>tmp/usage.out && exit 1 || { - status=$? -} -echo "OK" - -echo -n "Check returned status ($status)..." -test "$status" = "2" -echo "OK" - -echo "expiry reported:" -echo "=======================================================================" -cat tmp/usage.out -echo "=======================================================================" -echo -n "Check the usage message..." -diff -au data/usage.out tmp/usage.out -echo "usage message OK." -rm -f tmp/usage.out - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/11_expiry_usage/config/etc/group b/tests/expiry/11_expiry_usage/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/11_expiry_usage/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/11_expiry_usage/config/etc/gshadow b/tests/expiry/11_expiry_usage/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/11_expiry_usage/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/11_expiry_usage/config/etc/passwd b/tests/expiry/11_expiry_usage/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/11_expiry_usage/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/11_expiry_usage/config/etc/shadow b/tests/expiry/11_expiry_usage/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/11_expiry_usage/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/11_expiry_usage/data/usage.out b/tests/expiry/11_expiry_usage/data/usage.out deleted file mode 100644 index ab67c87b0..000000000 --- a/tests/expiry/11_expiry_usage/data/usage.out +++ /dev/null @@ -1,8 +0,0 @@ -Usage: expiry [options] - -Options: - -c, --check check the user's password expiration - -f, --force force password change if the user's password - is expired - -h, --help display this help message and exit - diff --git a/tests/expiry/11_expiry_usage/expiry.test b/tests/expiry/11_expiry_usage/expiry.test deleted file mode 100755 index 93c455c19..000000000 --- a/tests/expiry/11_expiry_usage/expiry.test +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh -log_start "$0" "expiry can display its usage message" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Get expiry usage message (expiry --help)..." -expiry --help >tmp/usage.out -echo "OK" - -echo "expiry reported:" -echo "=======================================================================" -cat tmp/usage.out -echo "=======================================================================" -echo -n "Check the usage message..." -diff -au data/usage.out tmp/usage.out -echo "usage message OK." -rm -f tmp/usage.out - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/12_expiry_extra_arg/config/etc/group b/tests/expiry/12_expiry_extra_arg/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/12_expiry_extra_arg/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/12_expiry_extra_arg/config/etc/gshadow b/tests/expiry/12_expiry_extra_arg/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/12_expiry_extra_arg/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/12_expiry_extra_arg/config/etc/passwd b/tests/expiry/12_expiry_extra_arg/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/12_expiry_extra_arg/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/12_expiry_extra_arg/config/etc/shadow b/tests/expiry/12_expiry_extra_arg/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/12_expiry_extra_arg/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/12_expiry_extra_arg/data/usage.out b/tests/expiry/12_expiry_extra_arg/data/usage.out deleted file mode 100644 index f250f48fb..000000000 --- a/tests/expiry/12_expiry_extra_arg/data/usage.out +++ /dev/null @@ -1,9 +0,0 @@ -expiry: unexpected argument: foo -Usage: expiry [options] - -Options: - -c, --check check the user's password expiration - -f, --force force password change if the user's password - is expired - -h, --help display this help message and exit - diff --git a/tests/expiry/12_expiry_extra_arg/expiry.test b/tests/expiry/12_expiry_extra_arg/expiry.test deleted file mode 100755 index ea6fa08cf..000000000 --- a/tests/expiry/12_expiry_extra_arg/expiry.test +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh -log_start "$0" "expiry check that no argument remain onthecommand line" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Call expiry with an extra argument (expiry -f foo)..." -expiry -f foo 2>tmp/usage.out && exit 1 || { - status=$? -} -echo "OK" - -echo -n "Check returned status ($status)..." -test "$status" = "2" -echo "OK" - -echo "expiry reported:" -echo "=======================================================================" -cat tmp/usage.out -echo "=======================================================================" -echo -n "Check the usage message..." -diff -au data/usage.out tmp/usage.out -echo "usage message OK." -rm -f tmp/usage.out - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/expiry/13_expiry_usage-c-f/config/etc/group b/tests/expiry/13_expiry_usage-c-f/config/etc/group deleted file mode 100644 index d1e687c3e..000000000 --- a/tests/expiry/13_expiry_usage-c-f/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow b/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow deleted file mode 100644 index 5042e5818..000000000 --- a/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/expiry/13_expiry_usage-c-f/config/etc/passwd b/tests/expiry/13_expiry_usage-c-f/config/etc/passwd deleted file mode 100644 index dc7bf8402..000000000 --- a/tests/expiry/13_expiry_usage-c-f/config/etc/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/expiry/13_expiry_usage-c-f/config/etc/shadow b/tests/expiry/13_expiry_usage-c-f/config/etc/shadow deleted file mode 100644 index 33d60bf19..000000000 --- a/tests/expiry/13_expiry_usage-c-f/config/etc/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/expiry/13_expiry_usage-c-f/data/usage.out b/tests/expiry/13_expiry_usage-c-f/data/usage.out deleted file mode 100644 index d0305e371..000000000 --- a/tests/expiry/13_expiry_usage-c-f/data/usage.out +++ /dev/null @@ -1,9 +0,0 @@ -expiry: options -c and -f conflict -Usage: expiry [options] - -Options: - -c, --check check the user's password expiration - -f, --force force password change if the user's password - is expired - -h, --help display this help message and exit - diff --git a/tests/expiry/13_expiry_usage-c-f/expiry.test b/tests/expiry/13_expiry_usage-c-f/expiry.test deleted file mode 100755 index 8a6a14a64..000000000 --- a/tests/expiry/13_expiry_usage-c-f/expiry.test +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh -log_start "$0" "expiry check that the -c and -f flags are not used at the same time" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Call expiry with the -c and -f flags (expiry -f -c)..." -expiry -f -c 2>tmp/usage.out && exit 1 || { - status=$? -} -echo "OK" - -echo -n "Check returned status ($status)..." -test "$status" = "2" -echo "OK" - -echo "expiry reported:" -echo "=======================================================================" -cat tmp/usage.out -echo "=======================================================================" -echo -n "Check the usage message..." -diff -au data/usage.out tmp/usage.out -echo "usage message OK." -rm -f tmp/usage.out - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/run_all b/tests/run_all index cb4969109..d565c0ee4 100755 --- a/tests/run_all +++ b/tests/run_all @@ -1169,19 +1169,6 @@ run_test ./failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test run_test ./failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test run_test ./failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test fi -run_test ./expiry/01_expiry_-c_no_expiry/expiry.test -run_test ./expiry/02_expiry_-c_expired/expiry.test -run_test ./expiry/03_expiry_-f_expired/expiry.test -run_test ./expiry/04_expiry_no_options/expiry.test -run_test ./expiry/05_expiry_-c_no_shadow_file/expiry.test -run_test ./expiry/06_expiry_-c_no_shadow_entry/expiry.test -run_test ./expiry/07_expiry_-c_expired_account/expiry.test -run_test ./expiry/08_expiry_-c_expired_max+inact/expiry.test -run_test ./expiry/09_expiry_-c_expired_not_inactive/expiry.test -run_test ./expiry/10_expiry_bad_option/expiry.test -run_test ./expiry/11_expiry_usage/expiry.test -run_test ./expiry/12_expiry_extra_arg/expiry.test -run_test ./expiry/13_expiry_usage-c-f/expiry.test run_test ./passwd/01_passwd_-S_root_locked_account/passwd.test run_test ./passwd/02_passwd_-S_root_valid_account/passwd.test run_test ./passwd/03_passwd_-S_root_empty_password/passwd.test diff --git a/tests/run_all.coverage b/tests/run_all.coverage index 87a517e0b..79af14ade 100755 --- a/tests/run_all.coverage +++ b/tests/run_all.coverage @@ -1184,19 +1184,6 @@ run_test ./failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test run_test ./failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test run_test ./failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test fi -run_test ./expiry/01_expiry_-c_no_expiry/expiry.test -run_test ./expiry/02_expiry_-c_expired/expiry.test -run_test ./expiry/03_expiry_-f_expired/expiry.test -run_test ./expiry/04_expiry_no_options/expiry.test -run_test ./expiry/05_expiry_-c_no_shadow_file/expiry.test -run_test ./expiry/06_expiry_-c_no_shadow_entry/expiry.test -run_test ./expiry/07_expiry_-c_expired_account/expiry.test -run_test ./expiry/08_expiry_-c_expired_max+inact/expiry.test -run_test ./expiry/09_expiry_-c_expired_not_inactive/expiry.test -run_test ./expiry/10_expiry_bad_option/expiry.test -run_test ./expiry/11_expiry_usage/expiry.test -run_test ./expiry/12_expiry_extra_arg/expiry.test -run_test ./expiry/13_expiry_usage-c-f/expiry.test run_test ./passwd/01_passwd_-S_root_locked_account/passwd.test run_test ./passwd/02_passwd_-S_root_valid_account/passwd.test run_test ./passwd/03_passwd_-S_root_empty_password/passwd.test