[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  e55937c s3:test: fix smbclient test on older systems (usage of mktemp)
       via  61c2bcd s3:test: fix registry roundtrip test on older systems (usage of mktemp)
      from  c1bc916 nsswitch: Eliminate select from wb_common

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e55937cfea387e58f646f3973971d5c7c14b0563
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 28 17:06:01 2011 +0100

    s3:test: fix smbclient test on older systems (usage of mktemp)
    
    --tmpdir is not a valid option to mktemp on older systems
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Mon Feb 28 18:12:46 CET 2011 on sn-devel-104

commit 61c2bcdf20f83340c732a1b727b3349be7235c0c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 28 17:06:01 2011 +0100

    s3:test: fix registry roundtrip test on older systems (usage of mktemp)
    
    --tmpdir is not a valid option to mktemp on older systems

-----------------------------------------------------------------------

Summary of changes:
 .../script/tests/test_net_registry_roundtrip.sh    |    2 +-
 source3/script/tests/test_smbclient_s3.sh          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_net_registry_roundtrip.sh b/source3/script/tests/test_net_registry_roundtrip.sh
index 52ce192..eba28a6 100755
--- a/source3/script/tests/test_net_registry_roundtrip.sh
+++ b/source3/script/tests/test_net_registry_roundtrip.sh
@@ -59,7 +59,7 @@ LOGDIR_PREFIX="conf_roundtrip"
 
 conf_roundtrip()
 {
-    local DIR=$(mktemp -d --tmpdir=$PREFIX ${LOGDIR_PREFIX}_XXXX)
+    local DIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXX)
     local LOG=$DIR/log
 
     echo conf_roundtrip $1 > $LOG
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 8ae8ef2..857400e 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -399,7 +399,7 @@ for OLDDIR in $(find ${PREFIX} -type d -name "${LOGDIR_PREFIX}_*") ;  do
 	rm -rf ${OLDDIR}
 done
 
-LOGDIR=$(mktemp -d --tmpdir=$PREFIX ${LOGDIR_PREFIX}_XXXX)
+LOGDIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXX)
 
 
 testit "smbclient -L $SERVER_IP" $SMBCLIENT -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`


-- 
Samba Shared Repository