Rev 11327: Merge upstream in file:///home/jelmer/bzr.samba/4.0-perlselftest/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11327
revision-id: jelmer at samba.org-20070305141531-u5h8rx1x1inwcgdr
parent: jelmer at samba.org-20070305135827-87yu6y0ije0vos9z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Mon 2007-03-05 15:15:31 +0100
message:
  Merge upstream
modified:
  source/script/tests/mktestsetup.sh svn-v2:16522 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fmktestsetup.sh
=== modified file 'source/script/tests/mktestsetup.sh'
--- a/source/script/tests/mktestsetup.sh	2007-03-05 13:58:27 +0000
+++ b/source/script/tests/mktestsetup.sh	2007-03-05 14:15:31 +0000
@@ -280,6 +280,8 @@
 echo "CONFFILE=$CONFFILE"
 echo "SLAPD_CONF=$SLAPD_CONF"
 echo "PIDDIR=$PIDDIR"
+echo "AUTH=$AUTH"
+echo "SERVER=$SERVER"
 echo "NETBIOSNAME=$NETBIOSNAME"
 echo "LDAP_URI=$LDAP_URI"
 echo "LDAP_URI_ESCAPE=$LDAP_URI_ESCAPE"
@@ -294,4 +296,3 @@
 echo "PREFIX=$PREFIX"
 echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
 echo "LDAPDIR=$LDAPDIR"
-echo "LOCKDIR=$LOCKDIR"