[Pkg-shadow-commits] r985 - in trunk/debian: . patches
Christian Perrier
bubulle at costa.debian.org
Wed May 17 13:35:07 UTC 2006
Author: bubulle
Date: 2006-05-17 13:35:07 +0000 (Wed, 17 May 2006)
New Revision: 985
Added:
trunk/debian/patches/506_relaxed_usernames
Removed:
trunk/debian/patches/406_good_name.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
Move the 406 patch to 5xx series as it is Debian specific
Fix #364909
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-17 00:43:47 UTC (rev 984)
+++ trunk/debian/changelog 2006-05-17 13:35:07 UTC (rev 985)
@@ -1,15 +1,17 @@
-shadow (1:4.0.15-8) UNSTABLE; urgency=low
+shadow (1:4.0.15-8) unreleased; urgency=low
* The "Tomme de Savoie" release
* Upstream bugs or fixes not yet fixed in upstream releases or CVS:
- 487_passwd_chauthtok_failed_message: Add an informative message
When password couldn't be changed in passwd when chauthok fails
Closes: #352137
+ - 506_relaxed_usernames: better wording of the explanations about
+ the constraints on usernames in Debian. Closes: #364909
* Debian packaging fixes:
- stop reading /etc/default/locale in addition to /etc/environment
in the PAM configuration file for login and su
- -- Christian Perrier <bubulle at kheops.frmug.org> Fri, 5 May 2006 15:59:41 +0200
+ -- Christian Perrier <bubulle at debian.org> Tue, 16 May 2006 20:09:17 -0500
shadow (1:4.0.15-7) unstable; urgency=low
Deleted: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch 2006-05-17 00:43:47 UTC (rev 984)
+++ trunk/debian/patches/406_good_name.dpatch 2006-05-17 13:35:07 UTC (rev 985)
@@ -1,94 +0,0 @@
-#! /bin/sh -e
-## 406_good_name.dpatch by xrgtn
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Relaxed usernames/groupnames checking patch.
-## DP: Allows any non-empty user/grounames that don't contain ':' and '\n'
-## DP: characters and don't start with '-'. This patch is more restrictive
-## DP: than original Karl's version. closes: #264879
-## DP:
-## DP: Comments from Karl Ramm (shadow 1:4.0.3-9, 20 Aug 2003 02:06:50 -0400):
-## DP:
-## DP: I can't come up with a good justification as to why characters other
-## DP: than ':'s and '\0's should be disallowed in group and usernames (other
-## DP: than '-' as the leading character). Thus, the maintenance tools don't
-## DP: anymore. closes: #79682, #166798, #171179
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-Index: shadow-4.0.15/libmisc/chkname.c
-===================================================================
---- shadow-4.0.15.orig/libmisc/chkname.c 2006-03-08 19:32:11.412980911 +0100
-+++ shadow-4.0.15/libmisc/chkname.c 2006-03-08 19:33:33.777296244 +0100
-@@ -17,6 +17,7 @@
- #endif
- static int good_name (const char *name)
- {
-+#if 0
- /*
- * User/group names must match [a-z_][a-z0-9_-]*[$]
- */
-@@ -30,6 +31,16 @@
- (*name == '$' && *(name + 1) == '\0')))
- return 0;
- }
-+#endif
-+ /*
-+ * Allow more relaxed user/group names in Debian -- ^[^-:\n][^:\n]*$
-+ */
-+ if (!*name || *name == '-')
-+ return 0;
-+ do
-+ if (*name == ':' || *name == '\n')
-+ return 0;
-+ while (*++name);
-
- return 1;
- }
-Index: shadow-4.0.15/man/useradd.8.xml
-===================================================================
---- shadow-4.0.15.orig/man/useradd.8.xml 2006-03-08 19:32:11.414980506 +0100
-+++ shadow-4.0.15/man/useradd.8.xml 2006-03-08 19:33:33.780295636 +0100
-@@ -174,6 +174,7 @@
- valid in conjunction with the <option>-m</option> option. The
- default is to not create the directory and to not copy any
- files.
-+ This option may not function correctly if the username has a / in it.
- </para>
- </listitem>
- </varlistentry>
-@@ -352,9 +353,13 @@
- </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_-]*[$]
-+ 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
-+ a dollar sign. In regular expression terms: ^[a-z_][a-z0-9_-]*[$]?$
-+ On Debian, the constraints on the username are loosened:
-+ Usernames must neither start by a dash ('-') nor contain a colon (':')
-+ or an end of line ('\n').
- </para>
- </refsect1>
-
Copied: trunk/debian/patches/506_relaxed_usernames (from rev 983, trunk/debian/patches/406_good_name.dpatch)
===================================================================
--- trunk/debian/patches/406_good_name.dpatch 2006-05-10 08:09:41 UTC (rev 983)
+++ trunk/debian/patches/506_relaxed_usernames 2006-05-17 13:35:07 UTC (rev 985)
@@ -0,0 +1,74 @@
+Goal: Relaxed usernames/groupnames checking patch.
+
+Status wrt upstream: Debian specific. Not to be used upstream
+
+Details:
+ Allows any non-empty user/grounames that don't contain ':' and '\n'
+ characters and don't start with '-'. This patch is more restrictive
+ than original Karl's version. closes: #264879
+
+ Comments from Karl Ramm (shadow 1:4.0.3-9, 20 Aug 2003 02:06:50 -0400):
+
+ I can't come up with a good justification as to why characters other
+ than ':'s and '\0's should be disallowed in group and usernames (other
+ than '-' as the leading character). Thus, the maintenance tools don't
+ anymore. closes: #79682, #166798, #171179
+
+Index: shadow-4.0.15/libmisc/chkname.c
+===================================================================
+--- shadow-4.0.15.orig/libmisc/chkname.c 2006-03-08 19:32:11.412980911 +0100
++++ shadow-4.0.15/libmisc/chkname.c 2006-03-08 19:33:33.777296244 +0100
+@@ -17,6 +17,7 @@
+ #endif
+ static int good_name (const char *name)
+ {
++#if 0
+ /*
+ * User/group names must match [a-z_][a-z0-9_-]*[$]
+ */
+@@ -30,6 +31,16 @@
+ (*name == '$' && *(name + 1) == '\0')))
+ return 0;
+ }
++#endif
++ /*
++ * Allow more relaxed user/group names in Debian -- ^[^-:\n][^:\n]*$
++ */
++ if (!*name || *name == '-')
++ return 0;
++ do
++ if (*name == ':' || *name == '\n')
++ return 0;
++ while (*++name);
+
+ return 1;
+ }
+Index: shadow-4.0.15/man/useradd.8.xml
+===================================================================
+--- shadow-4.0.15.orig/man/useradd.8.xml 2006-03-08 19:32:11.414980506 +0100
++++ shadow-4.0.15/man/useradd.8.xml 2006-03-08 19:33:33.780295636 +0100
+@@ -174,6 +174,7 @@
+ valid in conjunction with the <option>-m</option> option. The
+ default is to not create the directory and to not copy any
+ files.
++ This option may not function correctly if the username has a / in it.
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -352,9 +353,13 @@
+ </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_-]*[$]
++ 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
++ a dollar sign. In regular expression terms: ^[a-z_][a-z0-9_-]*[$]?$
++ On Debian, the only constraints are that usernames must neither start with a
++ dash ('-') nor contain a colon (':')
++ or an end of line ('\n').
+ </para>
+ </refsect1>
+
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-05-17 00:43:47 UTC (rev 984)
+++ trunk/debian/patches/series 2006-05-17 13:35:07 UTC (rev 985)
@@ -17,7 +17,7 @@
401_cppw_src.dpatch
404_undef_USE_PAM.dpatch
404_undef_USE_PAM.nolibpam
-406_good_name.dpatch
+506_relaxed_usernames
407_32char_grnames.dpatch
326_grpck_group-gshadow_members_consistency
542_useradd-O_option
More information about the Pkg-shadow-commits
mailing list