[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  d8d18fa s3:test: don't rely on pyhton being in /usr/bin/python in the sids2xids test
       via  0892313 s3:test: fix the smbclient_s3 test on older systems
       via  aa2dd25 s3:test: fix the net registry roundtrip test on older systems
      from  833fdb5 s3-autconf Move nmbd socket directory to PREFIX/var/nmbd

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit d8d18fa66464b780818807a4fb50bf458158714a
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:40:17 2011 +0200

    s3:test: don't rely on pyhton being in /usr/bin/python in the sids2xids test
    
    "/usr/bin/env pyhton" should always work as long as pyhton is in the path.

commit 0892313b4b1bdcab671e18db58d7758fe87a0efd
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:38:07 2011 +0200

    s3:test: fix the smbclient_s3 test on older systems
    
    mktemp requires precisely six Xs at the end of the template name

commit aa2dd250abd392b9ce77d35af7d3f4827326559b
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 24 16:37:20 2011 +0200

    s3:test: fix the net registry roundtrip test on older systems
    
    mktemp requires exactly Xs at the end of the template name on SLES8

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

Summary of changes:
 .../script/tests/test_net_registry_roundtrip.sh    |    2 +-
 source3/script/tests/test_smbclient_s3.sh          |    2 +-
 source3/script/tests/test_wbinfo_sids2xids_int.py  |    2 +-
 3 files changed, 3 insertions(+), 3 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 5431098..f3c43af 100755
--- a/source3/script/tests/test_net_registry_roundtrip.sh
+++ b/source3/script/tests/test_net_registry_roundtrip.sh
@@ -67,7 +67,7 @@ LOGDIR_PREFIX="conf_roundtrip"
 
 conf_roundtrip()
 {
-    local DIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXX)
+    local DIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXXXX)
     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 857400e..772802f 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 ${PREFIX}/${LOGDIR_PREFIX}_XXXX)
+LOGDIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXXXX)
 
 
 testit "smbclient -L $SERVER_IP" $SMBCLIENT -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
diff --git a/source3/script/tests/test_wbinfo_sids2xids_int.py b/source3/script/tests/test_wbinfo_sids2xids_int.py
index 064a300..87db0ef 100755
--- a/source3/script/tests/test_wbinfo_sids2xids_int.py
+++ b/source3/script/tests/test_wbinfo_sids2xids_int.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys,os,subprocess
 


-- 
Samba Shared Repository