From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 27 Jun 2012 07:51:55 +0000 (+1000)
Subject: selftest: Add extra users to nss_wrapper
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=df899ae04069d57f5120947d9e9fd20b0af1bfd1;p=mat%2Fsamba.git

selftest: Add extra users to nss_wrapper

These will be used for a test using pdbtest and to run the client
test environment under nss_wrapper.

Andrew Bartlett
---

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 5dfafe41ca..149a31e1eb 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -808,7 +808,7 @@ sub provision($$$$$$)
 	##
 
 	my ($max_uid, $max_gid);
-	my ($uid_nobody, $uid_root);
+	my ($uid_nobody, $uid_root, $uid_pdbtest);
 	my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
 
 	if ($unix_uid < 0xffff - 2) {
@@ -819,6 +819,7 @@ sub provision($$$$$$)
 
 	$uid_root = $max_uid - 1;
 	$uid_nobody = $max_uid - 2;
+	$uid_pdbtest = $max_uid - 3;
 
 	if ($unix_gids[0] < 0xffff - 3) {
 		$max_gid = 0xffff;
@@ -1008,6 +1009,7 @@ sub provision($$$$$$)
         } 
 	print PASSWD "nobody:x:$uid_nobody:$gid_nobody:nobody gecos:$prefix_abs:/bin/false
 $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
+pdbtest:x:$uid_pdbtest:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false
 ";
 	if ($unix_uid != 0) {
 		print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false";
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index af3951785b..c15c29885c 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -621,8 +621,8 @@ sub provision_raw_step1($$)
 	open(PWD, ">$ctx->{nsswrap_passwd}");
 	print PWD "
 root:x:0:0:root gecos:$ctx->{prefix_abs}:/bin/false
-$ctx->{unix_name}:x:$ctx->{unix_uid}:@{$ctx->{unix_gids}}[0]:$ctx->{unix_name} gecos:$ctx->{prefix_abs}:/bin/false
 nobody:x:65534:65533:nobody gecos:$ctx->{prefix_abs}:/bin/false
+pdbtest:x:65533:65533:pdbtest gecos:$ctx->{prefix_abs}:/bin/false
 ";
 	close(PWD);