VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated patches for upstream 4.1.3.

Browse Source
This commit is contained in:
nekral-guest
2008-09-14 14:10:48 +00:00
parent 9d3a7eb59a
commit dbe74223ee
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+3
View File
@@ -26,6 +26,9 @@ shadow (1:4.1.3-1) experimental; urgency=low
+ debian/patches/429_login_FAILLOG_ENAB
+ debian/patches/507_32char_grnames.dpatch
+ debian/patches/428_grpck_add_prune_option
+ debian/patches/401_cppw_src.dpatch
+ debian/patches/506_relaxed_usernames
+ debian/patches/463_login_delay_obeys_to_PAM
* debian/patches/454_userdel_no_MAIL_FILE: Patch removed. If MAIL_FILE is
defined, the mailbox is not in MAIL_SPOOL_DIR.
* debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
debian/patches/401_cppw_src.dpatch
Vendored
+4 -4
View File
@@ -221,13 +221,13 @@ Index: shadow-4.1.0/src/Makefile.am
chpasswd \
groupadd \
@@ -59,6 +60,7 @@
chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
chpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
+cppw_LDADD = $(LDADD) $(LIBSELINUX)
gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
Index: shadow-4.1.0/po/POTFILES.in
===================================================================
--- shadow-4.1.0.orig/po/POTFILES.in
debian/patches/463_login_delay_obeys_to_PAM
Vendored
+4 -2
View File
@@ -47,20 +47,22 @@ Index: shadow-4.1.0/src/login.c
PAM_FAIL_CHECK;
retcode = pam_set_item (pamh, PAM_TTY, tty);
PAM_FAIL_CHECK;
-#ifdef HAVE_PAM_FAIL_DELAY
-#ifdef HAS_PAM_FAIL_DELAY
- retcode = pam_fail_delay (pamh, 1000000 * delay);
- PAM_FAIL_CHECK;
-#endif
/* if fflg, then the user has already been authenticated */
if (!fflg || (getuid () != 0)) {
int failcount = 0;
@@ -645,9 +639,6 @@
@@ -645,11 +639,6 @@
failed = 0;
failcount++;
-#ifdef HAS_PAM_FAIL_DELAY
- if (delay > 0) {
- retcode = pam_fail_delay(pamh, 1000000*delay);
- }
-#endif
retcode = pam_authenticate (pamh, 0);
debian/patches/506_relaxed_usernames
Vendored
+3 -6
View File
@@ -62,13 +62,13 @@ Index: shadow-4.1.0/man/useradd.8.xml
</listitem>
</varlistentry>
<varlistentry>
@@ -372,9 +373,18 @@
@@ -372,9 +373,15 @@
</para>
<para>
- Usernames must begin with a lower case letter or an underscore, and
- only lower case letters, underscores, dashes, and dollar signs may
- follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
- follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+ It is usually recommended to only use usernames that begin with
+ a lower case letter or an underscore, and are only followed by lower
+ case letters, digits, underscores, dashes, and optionally terminated by
@@ -78,9 +78,6 @@ Index: shadow-4.1.0/man/useradd.8.xml
+ On Debian, the only constraints are that usernames must neither start
+ with a dash ('-') nor contain a colon (':') or a whitespace (space:' ',
+ end of line: '\n', tabulation: '\t', etc.).
+ </para>
+ <para>
+ Usernames may only be up to 32 characters long.
</para>
</refsect1>
@@ -94,7 +91,7 @@ Index: shadow-4.1.1/man/groupadd.8.xml
<para>
- Groupnames must begin with a lower case letter or an underscore,
- and only lower case letters, underscores, dashes, and dollar signs
- may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
- may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+ It is usually recommended to only use usernames that begin with
+ a lower case letter or an underscore, and are only followed by lower
+ case letters, digits, underscores, dashes, and optionally terminated by