[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1515-g5268649

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  5268649b7ef60a2caae9cdf66dfeaf6d2037aba3 (commit)
       via  9ba5962addc0ef2e0d01329ab8178b3f51659e75 (commit)
      from  43c18ba5cf0f709c4a7bd686d5e6bf613227b61d (commit)

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


- Log -----------------------------------------------------------------
commit 5268649b7ef60a2caae9cdf66dfeaf6d2037aba3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 11 14:32:06 2008 +0200

    Remove python extension from upgrade script.

commit 9ba5962addc0ef2e0d01329ab8178b3f51659e75
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 11 14:08:31 2008 +0200

    Properly support sentinels for binary init functions. This should fix the build.

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

Summary of changes:
 source/build/smb_build/input.pm      |    2 ++
 source/selftest/samba4_tests.sh      |    2 +-
 source/setup/{upgrade.py => upgrade} |    0 
 3 files changed, 3 insertions(+), 1 deletions(-)
 rename source/setup/{upgrade.py => upgrade} (100%)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 34b4445..7028d2a 100644
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -170,6 +170,8 @@ sub check_binary($$)
 	return if ($bin->{ENABLE} ne "YES");
 
 	($bin->{BINARY} = (lc $bin->{NAME})) if not defined($bin->{BINARY});
+	unless (defined($bin->{INIT_FUNCTION_SENTINEL})) { $bin->{INIT_FUNCTION_SENTINEL} = "NULL"; }
+	unless (defined($bin->{INIT_FUNCTION_TYPE})) { $bin->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
 
 	$bin->{OUTPUT_TYPE} = ["BINARY"];
 	add_libreplace($bin);
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 725fde2..9c7e939 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -351,7 +351,7 @@ plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcer
 plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
 rm -rf $PREFIX/upgrade
-plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
 rm -rf $PREFIX/provision
 mkdir $PREFIX/provision
 plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION" 
diff --git a/source/setup/upgrade.py b/source/setup/upgrade
similarity index 100%
rename from source/setup/upgrade.py
rename to source/setup/upgrade


-- 
Samba Shared Repository