[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  8167e84 selftest: create ncalrpcdir with 0755 permissions
      from  28d7282 s3: Remove unused cli_[en|de]crypt_message

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


- Log -----------------------------------------------------------------
commit 8167e840738febd3fad47094f3e948545c6f0677
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun May 22 19:40:19 2011 +0200

    selftest: create ncalrpcdir with 0755 permissions
    
    We need to reset the umask in order to set to the desired permissions.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon May 23 13:26:33 CEST 2011 on sn-devel-104

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

Summary of changes:
 selftest/selftest.pl |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 6f8cbe1..23434fc 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -597,11 +597,20 @@ sub write_clientconf($$$)
 	        mkdir("$clientdir/lockdir", 0777);
 	}
 
+	# this is ugly, but the ncalrpcdir needs exactly 0755
+	# otherwise tests fail.
+	my $mask = umask;
+	umask 0022;
+	if ( -d "$clientdir/ncalrpcdir/np" ) {
+	        unlink <$clientdir/ncalrpcdir/np/*>;
+		rmdir <$clientdir/ncalrpcdir/np>;
+	}
 	if ( -d "$clientdir/ncalrpcdir" ) {
 	        unlink <$clientdir/ncalrpcdir/*>;
-	} else {
-	        mkdir("$clientdir/ncalrpcdir", 0777);
+		rmdir <$clientdir/ncalrpcdir>;
 	}
+	mkdir("$clientdir/ncalrpcdir", 0755);
+	umask $mask;
 
 	open(CF, ">$conffile");
 	print CF "[global]\n";


-- 
Samba Shared Repository