[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  1a10a59... Improve symlink delete test. Make sure we don't delete the link target by mistake.
      from  98ba174... s4-smbtorture: add netr_SamLogon test with NULL domain to RPC-NETLOGON-S3.

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


- Log -----------------------------------------------------------------
commit 1a10a5949d9f2148bdcd61a864104e5c305f8a59
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 11 14:39:14 2010 -0800

    Improve symlink delete test. Make sure we don't delete the link target by mistake.
    
    Jeremy.

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

Summary of changes:
 source3/script/tests/test_smbclient_s3.sh |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 7896b28..dc9853d 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -132,11 +132,13 @@ EOF
 test_good_symlink()
 {
     tmpfile=/tmp/smbclient.in.$$
+    slink_name="$LOCAL_PATH/slink"
+    slink_target="$LOCAL_PATH/slink_target"
 
-    touch "$LOCAL_PATH/foo"
-    ln -s "$LOCAL_PATH/foo" "$LOCAL_PATH/bar"
+    touch $slink_target
+    ln -s $slink_target $slink_name
     cat > $tmpfile <<EOF
-del bar
+del slink
 quit
 EOF
 
@@ -149,18 +151,28 @@ EOF
     if [ $ret != 0 ] ; then
 	echo "$out"
 	echo "failed delete good symlink with error $ret"
+	rm $slink_target
+	rm $slink_name
 	false
 	return
     fi
 
-    if [ -e "$LOCAL_PATH/bar" ] ; then
+    if [ ! -e $slink_target ] ; then
+	echo "failed delete good symlink - symlink target deleted !"
+	rm $slink_target
+	rm $slink_name
+	false
+	return
+    fi
+
+    if [ -e $slink_name ] ; then
 	echo "failed delete good symlink - symlink still exists"
-	rm "$LOCAL_PATH/bar"
-	rm "$LOCAL_PATH/foo"
+	rm $slink_target
+	rm $slink_name
 	false
     else
 	# got the correct prompt .. succeed
-	rm "$LOCAL_PATH/foo"
+	rm $slink_target
 	true
     fi
 }


-- 
Samba Shared Repository