Rev 11876: Output as few variables as possible. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11876
revision-id: jelmer at samba.org-20070416204856-62lyprph2k1ob7qh
parent: jelmer at samba.org-20070416203519-154364q13fgzj42f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-04-16 22:48:56 +0200
message:
  Output as few variables as possible.
modified:
  source/script/tests/Samba4.pm  svn-v2:21707 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fSamba4.pm
  source/script/tests/mksamba4server.pl svn-v2:22260 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fmksamba4server.sh
=== modified file 'source/script/tests/Samba4.pm'
--- a/source/script/tests/Samba4.pm	2007-04-16 20:35:19 +0000
+++ b/source/script/tests/Samba4.pm	2007-04-16 20:48:56 +0000
@@ -140,7 +140,7 @@
 	my ($self, $prefix, $dcvars) = @_;
 	my %ret = ();
 	print "PROVISIONING...";
-	open(IN, "$RealBin/mksamba4server.pl --server-role=\"member server\" $prefix|") or die("Unable to setup");
+	open(IN, "$RealBin/mksamba4server.pl --netbiosname=nbmember --server-role=\"member server\" $prefix|") or die("Unable to setup");
 	while (<IN>) {
 		die ("Error parsing `$_'") unless (/^([A-Z0-9a-z_]+)=(.*)$/);
 		$ret{$1} = $2;

=== modified file 'source/script/tests/mksamba4server.pl'
--- a/source/script/tests/mksamba4server.pl	2007-04-16 20:35:19 +0000
+++ b/source/script/tests/mksamba4server.pl	2007-04-16 20:48:56 +0000
@@ -295,7 +295,6 @@
 system("$srcdir/bin/ldbadd -H $privatedir/wins_config.ldb < $privatedir/wins_config.ldif >/dev/null") == 0 or die("Unable to add wins configuration");
 ;
 print "KRB5_CONFIG=$krb5_config\n";
-print "PREFIX_ABS=$prefix_abs\n";
 print "SLAPD_CONF=$slapd_conf\n";
 print "PIDDIR=$piddir\n";
 print "SERVER=$server\n";
@@ -304,13 +303,8 @@
 print "DOMAIN=$domain\n";
 print "USERNAME=$username\n";
 print "REALM=$realm\n";
-print "DNSNAME=$dnsname\n";
-print "BASEDN=$basedn\n";
 print "PASSWORD=$password\n";
-print "SRCDIR=$srcdir\n";
-print "PREFIX=$prefix\n";
 print "LDAPDIR=$ldapdir\n";
-print "CONFFILE=$conffile\n";
 print "PROVISION_OPTIONS=".join(' ', @provision_options) . "\n";
 print "WINBINDD_SOCKET_DIR=$winbindd_socket_dir\n";
 print "NCALRPCDIR=$ncalrpcdir\n";