From bebb89c93bb6b8119bd57c1934f54de2729cf12c Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 9 Mar 2008 01:59:59 +0000
Subject: [PATCH] Update to new newusers behavior:  * users are not added
 automatically to the list of supplementary groups  * newusers use the same
 algorithm as useradd to define the new UIDs.

---
 tests/newusers/01_create_user/data/group                    | 2 +-
 tests/newusers/01_create_user/data/gshadow                  | 1 +
 tests/newusers/01_create_user/data/passwd                   | 2 +-
 tests/newusers/05_create_user_pid/data/group                | 2 +-
 tests/newusers/05_create_user_pid/data/gshadow              | 1 +
 tests/newusers/05_create_user_pid/data/passwd               | 2 +-
 tests/newusers/06_create_user_gid/data/group                | 2 +-
 tests/newusers/06_create_user_gid/data/gshadow              | 1 +
 tests/newusers/06_create_user_gid/data/passwd               | 2 +-
 tests/newusers/07_create_user_pid_gid/data/group            | 2 +-
 tests/newusers/07_create_user_pid_gid/data/gshadow          | 1 +
 tests/newusers/08_create_user_pid_other-gid/data/group      | 2 +-
 tests/newusers/08_create_user_pid_other-gid/data/gshadow    | 1 +
 tests/newusers/09_create_user_pid-as-user-bar/data/group    | 2 +-
 tests/newusers/09_create_user_pid-as-user-bar/data/gshadow  | 1 +
 tests/newusers/09_create_user_pid-as-user-bar/data/passwd   | 2 +-
 tests/newusers/10_create_user_gid-as-group-bar/data/group   | 2 +-
 tests/newusers/10_create_user_gid-as-group-bar/data/passwd  | 2 +-
 tests/newusers/13_create_user_new-home/data/group           | 2 +-
 tests/newusers/13_create_user_new-home/data/gshadow         | 1 +
 tests/newusers/13_create_user_new-home/data/passwd          | 2 +-
 tests/newusers/14_create_user_existing-home/data/group      | 2 +-
 tests/newusers/14_create_user_existing-home/data/gshadow    | 1 +
 tests/newusers/14_create_user_existing-home/data/passwd     | 2 +-
 tests/newusers/17_create_user_pid-already-used/data/group   | 2 +-
 tests/newusers/17_create_user_pid-already-used/data/gshadow | 1 +
 tests/newusers/17_create_user_pid-already-used/data/passwd  | 2 +-
 tests/newusers/18_create_user_gid-already-used/data/group   | 2 +-
 tests/newusers/18_create_user_gid-already-used/data/passwd  | 2 +-
 29 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/tests/newusers/01_create_user/data/group b/tests/newusers/01_create_user/data/group
index 555c889c..fecba0c4 100644
--- a/tests/newusers/01_create_user/data/group
+++ b/tests/newusers/01_create_user/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:65535:foo
+foo:x:1000:
diff --git a/tests/newusers/01_create_user/data/gshadow b/tests/newusers/01_create_user/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/01_create_user/data/gshadow
+++ b/tests/newusers/01_create_user/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/01_create_user/data/passwd b/tests/newusers/01_create_user/data/passwd
index 9de3b249..7bf7386c 100644
--- a/tests/newusers/01_create_user/data/passwd
+++ b/tests/newusers/01_create_user/data/passwd
@@ -17,4 +17,4 @@ 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:65535:65535:User Foo - Gecos Field::/bin/sh
+foo:x:1000:1000:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/05_create_user_pid/data/group b/tests/newusers/05_create_user_pid/data/group
index 555c889c..96574a5a 100644
--- a/tests/newusers/05_create_user_pid/data/group
+++ b/tests/newusers/05_create_user_pid/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:65535:foo
+foo:x:4242:
diff --git a/tests/newusers/05_create_user_pid/data/gshadow b/tests/newusers/05_create_user_pid/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/05_create_user_pid/data/gshadow
+++ b/tests/newusers/05_create_user_pid/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/05_create_user_pid/data/passwd b/tests/newusers/05_create_user_pid/data/passwd
index 897eb3e7..a45d9a76 100644
--- a/tests/newusers/05_create_user_pid/data/passwd
+++ b/tests/newusers/05_create_user_pid/data/passwd
@@ -17,4 +17,4 @@ 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:4242:65535:User Foo - Gecos Field::/bin/sh
+foo:x:4242:4242:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/06_create_user_gid/data/group b/tests/newusers/06_create_user_gid/data/group
index 54329325..96574a5a 100644
--- a/tests/newusers/06_create_user_gid/data/group
+++ b/tests/newusers/06_create_user_gid/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:4242:foo
+foo:x:4242:
diff --git a/tests/newusers/06_create_user_gid/data/gshadow b/tests/newusers/06_create_user_gid/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/06_create_user_gid/data/gshadow
+++ b/tests/newusers/06_create_user_gid/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/06_create_user_gid/data/passwd b/tests/newusers/06_create_user_gid/data/passwd
index 7985de1f..8ed5455a 100644
--- a/tests/newusers/06_create_user_gid/data/passwd
+++ b/tests/newusers/06_create_user_gid/data/passwd
@@ -17,4 +17,4 @@ 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:65535:4242:User Foo - Gecos Field::/bin/sh
+foo:x:1000:4242:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/07_create_user_pid_gid/data/group b/tests/newusers/07_create_user_pid_gid/data/group
index 54329325..96574a5a 100644
--- a/tests/newusers/07_create_user_pid_gid/data/group
+++ b/tests/newusers/07_create_user_pid_gid/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:4242:foo
+foo:x:4242:
diff --git a/tests/newusers/07_create_user_pid_gid/data/gshadow b/tests/newusers/07_create_user_pid_gid/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/07_create_user_pid_gid/data/gshadow
+++ b/tests/newusers/07_create_user_pid_gid/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/08_create_user_pid_other-gid/data/group b/tests/newusers/08_create_user_pid_other-gid/data/group
index aa64cc53..b2d9984d 100644
--- a/tests/newusers/08_create_user_pid_other-gid/data/group
+++ b/tests/newusers/08_create_user_pid_other-gid/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:4243:foo
+foo:x:4243:
diff --git a/tests/newusers/08_create_user_pid_other-gid/data/gshadow b/tests/newusers/08_create_user_pid_other-gid/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/08_create_user_pid_other-gid/data/gshadow
+++ b/tests/newusers/08_create_user_pid_other-gid/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/09_create_user_pid-as-user-bar/data/group b/tests/newusers/09_create_user_pid-as-user-bar/data/group
index f470e941..90da8d7f 100644
--- a/tests/newusers/09_create_user_pid-as-user-bar/data/group
+++ b/tests/newusers/09_create_user_pid-as-user-bar/data/group
@@ -40,4 +40,4 @@ nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
 bar:x:1042:
-foo:x:65535:foo
+foo:x:1043:
diff --git a/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow b/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
index 0586f95b..d11bb83c 100644
--- a/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
+++ b/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
@@ -40,3 +40,4 @@ nogroup:*::
 crontab:x::
 Debian-exim:x::
 bar:x::
+foo:*::
diff --git a/tests/newusers/09_create_user_pid-as-user-bar/data/passwd b/tests/newusers/09_create_user_pid-as-user-bar/data/passwd
index e88ec5a3..5f9155bb 100644
--- a/tests/newusers/09_create_user_pid-as-user-bar/data/passwd
+++ b/tests/newusers/09_create_user_pid-as-user-bar/data/passwd
@@ -18,4 +18,4 @@ 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
 bar:x:1042:1042::/:/bin/false
-foo:x:1042:65535:User Foo - Gecos Field::/bin/sh
+foo:x:1042:1043:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/10_create_user_gid-as-group-bar/data/group b/tests/newusers/10_create_user_gid-as-group-bar/data/group
index 916119d2..4e6b697b 100644
--- a/tests/newusers/10_create_user_gid-as-group-bar/data/group
+++ b/tests/newusers/10_create_user_gid-as-group-bar/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-bar:x:1043:foo
+bar:x:1043:
diff --git a/tests/newusers/10_create_user_gid-as-group-bar/data/passwd b/tests/newusers/10_create_user_gid-as-group-bar/data/passwd
index d7a923e9..e4742730 100644
--- a/tests/newusers/10_create_user_gid-as-group-bar/data/passwd
+++ b/tests/newusers/10_create_user_gid-as-group-bar/data/passwd
@@ -18,4 +18,4 @@ 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
 bar:x:1042:1043::/:/bin/false
-foo:x:65535:1043:User Foo - Gecos Field::/bin/sh
+foo:x:1043:1043:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/13_create_user_new-home/data/group b/tests/newusers/13_create_user_new-home/data/group
index 555c889c..fecba0c4 100644
--- a/tests/newusers/13_create_user_new-home/data/group
+++ b/tests/newusers/13_create_user_new-home/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:65535:foo
+foo:x:1000:
diff --git a/tests/newusers/13_create_user_new-home/data/gshadow b/tests/newusers/13_create_user_new-home/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/13_create_user_new-home/data/gshadow
+++ b/tests/newusers/13_create_user_new-home/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/13_create_user_new-home/data/passwd b/tests/newusers/13_create_user_new-home/data/passwd
index 8b23a248..a6c525be 100644
--- a/tests/newusers/13_create_user_new-home/data/passwd
+++ b/tests/newusers/13_create_user_new-home/data/passwd
@@ -17,4 +17,4 @@ 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:65535:65535:User Foo - Gecos Field:/tmp/test-newusers:/bin/sh
+foo:x:1000:1000:User Foo - Gecos Field:/tmp/test-newusers:/bin/sh
diff --git a/tests/newusers/14_create_user_existing-home/data/group b/tests/newusers/14_create_user_existing-home/data/group
index 555c889c..fecba0c4 100644
--- a/tests/newusers/14_create_user_existing-home/data/group
+++ b/tests/newusers/14_create_user_existing-home/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:65535:foo
+foo:x:1000:
diff --git a/tests/newusers/14_create_user_existing-home/data/gshadow b/tests/newusers/14_create_user_existing-home/data/gshadow
index ae424865..5042e581 100644
--- a/tests/newusers/14_create_user_existing-home/data/gshadow
+++ b/tests/newusers/14_create_user_existing-home/data/gshadow
@@ -39,3 +39,4 @@ users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:*::
diff --git a/tests/newusers/14_create_user_existing-home/data/passwd b/tests/newusers/14_create_user_existing-home/data/passwd
index 8b23a248..a6c525be 100644
--- a/tests/newusers/14_create_user_existing-home/data/passwd
+++ b/tests/newusers/14_create_user_existing-home/data/passwd
@@ -17,4 +17,4 @@ 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:65535:65535:User Foo - Gecos Field:/tmp/test-newusers:/bin/sh
+foo:x:1000:1000:User Foo - Gecos Field:/tmp/test-newusers:/bin/sh
diff --git a/tests/newusers/17_create_user_pid-already-used/data/group b/tests/newusers/17_create_user_pid-already-used/data/group
index f470e941..90da8d7f 100644
--- a/tests/newusers/17_create_user_pid-already-used/data/group
+++ b/tests/newusers/17_create_user_pid-already-used/data/group
@@ -40,4 +40,4 @@ nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
 bar:x:1042:
-foo:x:65535:foo
+foo:x:1043:
diff --git a/tests/newusers/17_create_user_pid-already-used/data/gshadow b/tests/newusers/17_create_user_pid-already-used/data/gshadow
index 0586f95b..d11bb83c 100644
--- a/tests/newusers/17_create_user_pid-already-used/data/gshadow
+++ b/tests/newusers/17_create_user_pid-already-used/data/gshadow
@@ -40,3 +40,4 @@ nogroup:*::
 crontab:x::
 Debian-exim:x::
 bar:x::
+foo:*::
diff --git a/tests/newusers/17_create_user_pid-already-used/data/passwd b/tests/newusers/17_create_user_pid-already-used/data/passwd
index e88ec5a3..5f9155bb 100644
--- a/tests/newusers/17_create_user_pid-already-used/data/passwd
+++ b/tests/newusers/17_create_user_pid-already-used/data/passwd
@@ -18,4 +18,4 @@ 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
 bar:x:1042:1042::/:/bin/false
-foo:x:1042:65535:User Foo - Gecos Field::/bin/sh
+foo:x:1042:1043:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/18_create_user_gid-already-used/data/group b/tests/newusers/18_create_user_gid-already-used/data/group
index 916119d2..4e6b697b 100644
--- a/tests/newusers/18_create_user_gid-already-used/data/group
+++ b/tests/newusers/18_create_user_gid-already-used/data/group
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-bar:x:1043:foo
+bar:x:1043:
diff --git a/tests/newusers/18_create_user_gid-already-used/data/passwd b/tests/newusers/18_create_user_gid-already-used/data/passwd
index d7a923e9..e4742730 100644
--- a/tests/newusers/18_create_user_gid-already-used/data/passwd
+++ b/tests/newusers/18_create_user_gid-already-used/data/passwd
@@ -18,4 +18,4 @@ 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
 bar:x:1042:1043::/:/bin/false
-foo:x:65535:1043:User Foo - Gecos Field::/bin/sh
+foo:x:1043:1043:User Foo - Gecos Field::/bin/sh