From 3d5b4ce121aff2fba742a4906f46cdcb4b699ebb Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 21 May 2009 15:55:29 +0000
Subject: [PATCH]   * debian/patches/506_relaxed_usernames: usernames with a
 slash will not only     break one option. Move to the discussion on the
 usernames.

---
 debian/changelog                     |  4 +++-
 debian/patches/506_relaxed_usernames | 18 +++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8a86b18..15e06ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ shadow (1:4.1.4.1-1) unstable; urgency=low
   * debian/login.defs: Removed comment about MD5_CRYPT. MD5_CRYPT_ENAB is no
     more used by chpasswd and newusers. 
   * debian/patches/*: Updated patches to the new quilt and shadow versions.
+  * debian/patches/506_relaxed_usernames: usernames with a slash will not only
+    break one option. Move to the discussion on the usernames.
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Thu, 21 May 2009 17:29:42 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Thu, 21 May 2009 17:54:22 +0200
 
 shadow (1:4.1.4-3) unstable; urgency=low
 
diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames
index 89a6b560..9dfe7313 100755
--- a/debian/patches/506_relaxed_usernames
+++ b/debian/patches/506_relaxed_usernames
@@ -1,8 +1,6 @@
 Goal: Relaxed usernames/groupnames checking patch.
 
 Status wrt upstream: Debian specific. Not to be used upstream
-                     The documentation of the username length restriction
-                     was added upstream
 
 Details:
  Allows any non-empty user/grounames that don't contain ':' and '\n'
@@ -50,15 +48,7 @@ Details:
  }
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -197,6 +197,7 @@
- 	    <option>INACTIVE</option> variable in
- 	    <filename>/etc/default/useradd</filename>, or -1 by default.
- 	  </para>
-+	  <para>This option may not function correctly if the username has a / in it.</para>
- 	</listitem>
-       </varlistentry>
-       <varlistentry>
-@@ -607,12 +608,17 @@
+@@ -607,12 +607,19 @@
      </para>
  
      <para>
@@ -70,8 +60,10 @@ Details:
      </para>
      <para>
 +      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.).
++      with a dash ('-') nor contain a colon (':') or a whitespace (space: ' ',
++      end of line: '\n', tabulation: '\t', etc.). Note that using a slash
++      ('/') may break the default algorithm for the definition of the
++      user's home directory.
 +    </para>
 +    <para>
        Usernames may only be up to 32 characters long.