[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Thu Feb 10 11:25:01 MST 2011


The branch, master has been updated
       via  5ecda05 s3-waf: better checks for gssapi support.
       via  fa0c6c1 s3-system: fix malloc/talloc mismatch in sys_popen().
       via  97b03d5 s3-oldtest: remove unused tests_all.sh file.
      from  da9cd73 s3-rpc_client: Fixed an uninitialized variable.

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


- Log -----------------------------------------------------------------
commit 5ecda05967211834d085e5cdc7ea1862acf6fcc5
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 10 18:23:12 2011 +0100

    s3-waf: better checks for gssapi support.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Feb 10 19:24:12 CET 2011 on sn-devel-104

commit fa0c6c1a9e9c853d3f3bf66ff20ed5a024c68924
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 10 18:01:46 2011 +0100

    s3-system: fix malloc/talloc mismatch in sys_popen().
    
    Guenther

commit 97b03d5bfb820be521ce3314dbb09e6558e7c11e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 10 17:46:22 2011 +0100

    s3-oldtest: remove unused tests_all.sh file.
    
    Guenther

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

Summary of changes:
 source3/lib/system.c              |    2 +-
 source3/script/tests/tests_all.sh |   94 -------------------------------------
 source3/wscript                   |    9 ++-
 3 files changed, 7 insertions(+), 98 deletions(-)
 delete mode 100755 source3/script/tests/tests_all.sh


Changeset truncated at 500 lines:

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 1783fda..48623b9 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1543,7 +1543,7 @@ int sys_popen(const char *command)
 err_exit:
 
 	SAFE_FREE(entry);
-	SAFE_FREE(argl);
+	TALLOC_FREE(argl);
 	close(pipe_fds[0]);
 	close(pipe_fds[1]);
 	return -1;
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
deleted file mode 100755
index ccc5e06..0000000
--- a/source3/script/tests/tests_all.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-local_s3() {
-	echo "RUNNING TESTS local_s3"
-	$SCRIPTDIR/test_local_s3.sh \
-	|| failed=`expr $failed + $?`
-}
-
-smbtorture_s3() {
-	echo "RUNNING TESTS smbtorture_s3"
-	$SCRIPTDIR/test_smbtorture_s3.sh \
-		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-l $PREFIX_ABS/tmp" \
-	|| failed=`expr $failed + $?`
-}
-
-smbtorture_s3_encrypted() {
-	echo "RUNNING TESTS smbtorture_s3_encrypted"
-	$SCRIPTDIR/test_smbtorture_s3.sh \
-		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" "-l $PREFIX_ABS/tmp" \
-	|| failed=`expr $failed + $?`
-}
-
-smbclient_s3() {
-	echo "RUNNING TESTS smbclient_s3"
-	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP $USERNAME $PASSWORD $USERID "$PREFIX_ABS"/tmp \
-	|| failed=`expr $failed + $?`
-}
-
-smbclient_s3_encrypted() {
-	echo "RUNNING TESTS smbclient_s3_encrypted"
-	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP $USERNAME $PASSWORD $USERID "$PREFIX_ABS"/tmp "-e" \
-	|| failed=`expr $failed + $?`
-}
-
-wbinfo_s3() {
-	echo "RUNNING TESTS wbinfo_s3"
-	$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
-	|| failed=`expr $failed + $?`
-}
-
-ntlm_auth_s3() {
-	echo "RUNNING TESTS ntlm_auth_s3"
-	$SCRIPTDIR/test_ntlm_auth_s3.sh \
-	|| failed=`expr $failed + $?`
-}
-
-net_s3() {
-	echo "RUNNING TESTS net_s3"
-	$SCRIPTDIR/test_net_s3.sh \
-	|| failed=`expr $failed + $?`
-}
-
-testparm_s3() {
-	echo "RUNNING TESTS testparm_s3"
-	$SCRIPTDIR/test_testparm_s3.sh \
-	|| failed=`expr $failed + $?`
-}
-
-posix_s3() {
-	echo "RUNNING TESTS posix_s3"
-	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
-	eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
-	if [ -x "$SMBTORTURE4" ]; then
-		SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-	fi
-	if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-		echo "Running Tests with Samba4's smbtorture"
-		echo $SMBTORTURE4VERSION
-		$SCRIPTDIR/test_posix_s3.sh \
-			//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
-		|| failed=`expr $failed + $?`
-	else
-		echo "Skip Tests with Samba4's smbtorture"
-		echo "Try to compile with --with-smbtorture4-path=PATH to enable"
-	fi
-}
-
-failed=0
-
-if test "x$TESTS" = "x" ; then
-	local_s3
-	smbtorture_s3
-	smbtorture_s3_encrypted
-	smbclient_s3
-	smbclient_s3_encrypted
-	wbinfo_s3
-	ntlm_auth_s3
-	net_s3
-	testparm_s3
-	posix_s3
-else
-	for THIS_TEST in $TESTS; do
-		$THIS_TEST
-	done
-fi
-
diff --git a/source3/wscript b/source3/wscript
index 655de13..f5fe52b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -662,6 +662,7 @@ msg.msg_acctrightslen = sizeof(fd);
         conf.SET_TARGET_TYPE('lber', 'EMPTY')
 
     # Check for kerberos
+    have_gssapi=False
     if Options.options.with_krb5:
         conf.find_program('krb5-config', var='KRB5_CONFIG')
         if conf.env.KRB5_CONFIG:
@@ -678,8 +679,9 @@ msg.msg_acctrightslen = sizeof(fd);
         conf.CHECK_FUNCS_IN('crypto', 'des_set_key')
         conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
         conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
-        if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
-            conf.DEFINE('HAVE_GSSAPI', '1')
+        if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
+           conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi_krb5'):
+            have_gssapi=True
         conf.CHECK_FUNCS_IN('gss_wrap_iov', 'gssapi gssapi_krb5 krb5')
         conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
         conf.CHECK_FUNCS('''
@@ -880,7 +882,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
         if use_ads:
             conf.DEFINE('WITH_ADS', '1')
             conf.DEFINE('HAVE_KRB5', '1')
-            conf.DEFINE('HAVE_GSSAPI', '1')
+            if have_gssapi:
+                conf.DEFINE('HAVE_GSSAPI', '1')
         else:
             print "krb5 libs don't have all features required for Active Directory support"
             conf.undefine('HAVE_KRB5_H')


-- 
Samba Shared Repository


More information about the samba-cvs mailing list