[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Sat Nov 25 13:14:02 UTC 2017
The branch, master has been updated
via 6f8e3f7 python:tests: Create a test user for the dsdb test
via 8635465 build: Move pam_wrapper to third_party
via 6fbc8b8 build: Move uid_wrapper to third_party
via ac65070 build: Move resolv_wrapper to third_party
via 5d2b5e9 build: Move nss_wrapper to third_party
via 22bf36c build: Move socket_wrapper to third_party
from 6cf7abb repl_meta_data: Allow delete of an object with dangling backlinks
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6f8e3f7cd0ce2eaad4c8f83d3791bf6904a8bea3
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 24 13:13:55 2017 +0100
python:tests: Create a test user for the dsdb test
We should never taint the Administrator account as we don't shut down
target envionments!
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Sat Nov 25 14:13:24 CET 2017 on sn-devel-144
commit 8635465d77496e882ca73477690bbd20d877a197
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 24 13:34:25 2017 +0100
build: Move pam_wrapper to third_party
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit 6fbc8b810e094b946b92fb720953400fe28041ab
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 7 12:02:19 2017 +0100
build: Move uid_wrapper to third_party
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit ac65070490c9a6e46bd45665daa15cdc164b3748
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 7 11:55:04 2017 +0100
build: Move resolv_wrapper to third_party
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit 5d2b5e98485430ff0e07cd389609ccde0cd13975
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 7 11:40:11 2017 +0100
build: Move nss_wrapper to third_party
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit 22bf36c85ae11cd280a58729348c76032910dc16
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 7 10:51:11 2017 +0100
build: Move socket_wrapper to third_party
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_third_party.py | 25 ++++++++
ctdb/wscript | 21 +++++--
lib/README | 4 --
python/samba/tests/dsdb.py | 66 +++++++++++++---------
python/samba/tests/test_pam_winbind.sh | 2 +-
.../tests/test_pam_winbind_warn_pwd_expire.sh | 2 +-
selftest/target/Samba3.pm | 2 +-
{lib => third_party}/nss_wrapper/nss_wrapper.c | 0
{lib => third_party}/nss_wrapper/nss_wrapper.pl | 0
{lib => third_party}/nss_wrapper/wscript | 4 +-
{lib => third_party}/pam_wrapper/libpamtest.c | 0
{lib => third_party}/pam_wrapper/libpamtest.h | 0
{lib => third_party}/pam_wrapper/pam_wrapper.c | 2 +-
{lib => third_party}/pam_wrapper/pwrap_compat.h | 0
.../pam_wrapper/python/pypamtest.c | 0
{lib => third_party}/pam_wrapper/wscript | 13 +++--
.../resolv_wrapper/resolv_wrapper.c | 0
{lib => third_party}/resolv_wrapper/wscript | 4 +-
.../socket_wrapper/socket_wrapper.c | 4 +-
{lib => third_party}/socket_wrapper/wscript | 4 +-
{lib => third_party}/uid_wrapper/uid_wrapper.c | 0
{lib => third_party}/uid_wrapper/wscript | 5 +-
third_party/wscript | 18 ++++++
wscript | 33 ++++++++---
wscript_build | 10 ----
25 files changed, 145 insertions(+), 74 deletions(-)
rename {lib => third_party}/nss_wrapper/nss_wrapper.c (100%)
rename {lib => third_party}/nss_wrapper/nss_wrapper.pl (100%)
rename {lib => third_party}/nss_wrapper/wscript (96%)
rename {lib => third_party}/pam_wrapper/libpamtest.c (100%)
rename {lib => third_party}/pam_wrapper/libpamtest.h (100%)
rename {lib => third_party}/pam_wrapper/pam_wrapper.c (99%)
rename {lib => third_party}/pam_wrapper/pwrap_compat.h (100%)
rename {lib => third_party}/pam_wrapper/python/pypamtest.c (100%)
rename {lib => third_party}/pam_wrapper/wscript (91%)
rename {lib => third_party}/resolv_wrapper/resolv_wrapper.c (100%)
rename {lib => third_party}/resolv_wrapper/wscript (94%)
rename {lib => third_party}/socket_wrapper/socket_wrapper.c (99%)
rename {lib => third_party}/socket_wrapper/wscript (95%)
rename {lib => third_party}/uid_wrapper/uid_wrapper.c (100%)
rename {lib => third_party}/uid_wrapper/wscript (95%)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index ac77be7..9c894e4 100644
--- a/buildtools/wafsamba/samba_third_party.py
+++ b/buildtools/wafsamba/samba_third_party.py
@@ -39,3 +39,28 @@ def CHECK_CMOCKA(conf):
return conf.CHECK_BUNDLED_SYSTEM_PKG('cmocka', minversion='1.1.1')
Build.BuildContext.CHECK_CMOCKA = CHECK_CMOCKA
+
+ at conf
+def CHECK_SOCKET_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.1.7')
+Build.BuildContext.CHECK_SOCKET_WRAPPER = CHECK_SOCKET_WRAPPER
+
+ at conf
+def CHECK_NSS_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('nss_wrapper', minversion='1.1.3')
+Build.BuildContext.CHECK_NSS_WRAPPER = CHECK_NSS_WRAPPER
+
+ at conf
+def CHECK_RESOLV_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.4')
+Build.BuildContext.CHECK_RESOLV_WRAPPER = CHECK_RESOLV_WRAPPER
+
+ at conf
+def CHECK_UID_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('uid_wrapper', minversion='1.2.4')
+Build.BuildContext.CHECK_UID_WRAPPER = CHECK_UID_WRAPPER
+
+ at conf
+def CHECK_PAM_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('pam_wrapper', minversion='1.0.4')
+Build.BuildContext.CHECK_PAM_WRAPPER = CHECK_PAM_WRAPPER
diff --git a/ctdb/wscript b/ctdb/wscript
index fdd187b..f5a2481 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -30,7 +30,7 @@ default_prefix = Options.default_prefix = '/usr/local'
samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tevent:lib/tevent lib/tdb:lib/tdb
- lib/socket_wrapper:lib/socket_wrapper
+ third_party/socket_wrapper:third_party/socket_wrapper
third_party/popt:third_party/popt
lib/util:lib/util lib/tdb_wrap:lib/tdb_wrap
lib/ccan:lib/ccan libcli/util:libcli/util
@@ -112,20 +112,29 @@ def configure(conf):
if conf.CHECK_FOR_THIRD_PARTY():
conf.RECURSE('third_party/popt')
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ conf.RECURSE('third_party/socket_wrapper')
+ conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
else:
if not conf.CHECK_POPT():
raise Utils.WafError('popt development packages have not been found\nIf third_party is installed, check that it is in the proper place.')
else:
conf.define('USING_SYSTEM_POPT', 1)
+ conf.env.SOCKET_WRAPPER_SO_PATH = ''
+
+
+ if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
+ if not conf.CHECK_SOCKET_WRAPPER():
+ raise Utils.WafError('socket_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+ else:
+ conf.define('USING_SYSTEM_SOCKET_WRAPPER', 1)
+ conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
conf.RECURSE('lib/util')
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
- if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
- conf.RECURSE('lib/socket_wrapper')
- conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
conf.CHECK_HEADERS('sched.h')
conf.CHECK_HEADERS('procinfo.h')
@@ -315,6 +324,8 @@ def build(bld):
bld.RECURSE('lib/replace')
if bld.CHECK_FOR_THIRD_PARTY():
bld.RECURSE('third_party/popt')
+ if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
+ bld.RECURSE('third_party/socket_wrapper')
bld.RECURSE('lib/tdb_wrap')
bld.RECURSE('lib/util')
@@ -323,8 +334,6 @@ def build(bld):
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
- if bld.env.standalone_ctdb or bld.CONFIG_GET('SOCKET_WRAPPER'):
- bld.RECURSE('lib/socket_wrapper')
if bld.env.standalone_ctdb:
# If a combined build is implemented, CTDB will want to
diff --git a/lib/README b/lib/README
index 85b7952..24e9fac 100644
--- a/lib/README
+++ b/lib/README
@@ -1,12 +1,8 @@
compression - Various compression algorithms (MSZIP, lzxpress)
dnspython - Python module for working with DNS.
-nss_wrapper - Wrapper for the user and group NSS API allowing the use
- of other data sources.
popt - Command-line option parsing library
replace - Provides replacements for standard (POSIX, C99) functions
not provided by the host platform.
-socket_wrapper - Wrapper library allowing TCP/IP traffic to be redirected
- over Unix domain sockets.
subunit - Utilities and bindings for working with the Subunit test result
reporting protocol.
talloc - Hierarchical pool based memory allocator
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index a9f569b..493ea25 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -21,6 +21,7 @@ from samba.credentials import Credentials
from samba.samdb import SamDB
from samba.auth import system_session
from samba.tests import TestCase
+from samba.tests import delete_force
from samba.ndr import ndr_unpack, ndr_pack
from samba.dcerpc import drsblobs
from samba import dsdb
@@ -42,14 +43,27 @@ class DsdbTests(TestCase):
credentials=self.creds,
lp=self.lp)
+ # Create a test user
+ user_name = "samdb-testuser"
+ user_pass = samba.generate_random_password(32, 32)
+ user_description = "Test user for dsdb test"
+
+ base_dn = self.samdb.domain_dn()
+
+ self.account_dn = "cn=" + user_name + ",cn=Users," + base_dn
+ delete_force(self.samdb, self.account_dn)
+ self.samdb.newuser(username=user_name,
+ password=user_pass,
+ description=user_description)
+
def test_get_oid_from_attrid(self):
oid = self.samdb.get_oid_from_attid(591614)
self.assertEquals(oid, "1.2.840.113556.1.4.1790")
def test_error_replpropertymetadata(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["replPropertyMetaData"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["replPropertyMetaData"])
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(res[0]["replPropertyMetaData"]))
ctr = repl.ctr
@@ -65,9 +79,9 @@ class DsdbTests(TestCase):
self.assertRaises(ldb.LdbError, self.samdb.modify, msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0"])
def test_error_replpropertymetadata_nochange(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["replPropertyMetaData"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["replPropertyMetaData"])
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(res[0]["replPropertyMetaData"]))
replBlob = ndr_pack(repl)
@@ -77,9 +91,9 @@ class DsdbTests(TestCase):
self.assertRaises(ldb.LdbError, self.samdb.modify, msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0"])
def test_error_replpropertymetadata_allow_sort(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["replPropertyMetaData"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["replPropertyMetaData"])
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(res[0]["replPropertyMetaData"]))
replBlob = ndr_pack(repl)
@@ -89,9 +103,9 @@ class DsdbTests(TestCase):
self.samdb.modify(msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0", "local_oid:1.3.6.1.4.1.7165.4.3.25:0"])
def test_twoatt_replpropertymetadata(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["replPropertyMetaData", "uSNChanged"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["replPropertyMetaData", "uSNChanged"])
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(res[0]["replPropertyMetaData"]))
ctr = repl.ctr
@@ -109,9 +123,9 @@ class DsdbTests(TestCase):
self.assertRaises(ldb.LdbError, self.samdb.modify, msg, ["local_oid:1.3.6.1.4.1.7165.4.3.14:0"])
def test_set_replpropertymetadata(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["replPropertyMetaData", "uSNChanged"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["replPropertyMetaData", "uSNChanged"])
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(res[0]["replPropertyMetaData"]))
ctr = repl.ctr
@@ -135,17 +149,17 @@ class DsdbTests(TestCase):
self.assertEquals(self.samdb.get_attribute_from_attid(11979), None)
def test_get_attribute_replmetadata_version(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["dn"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["dn"])
self.assertEquals(len(res), 1)
dn = str(res[0].dn)
- self.assertEqual(self.samdb.get_attribute_replmetadata_version(dn, "unicodePwd"), 1)
+ self.assertEqual(self.samdb.get_attribute_replmetadata_version(dn, "unicodePwd"), 2)
def test_set_attribute_replmetadata_version(self):
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
- attrs=["dn"])
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
+ attrs=["dn"])
self.assertEquals(len(res), 1)
dn = str(res[0].dn)
version = self.samdb.get_attribute_replmetadata_version(dn, "description")
@@ -509,8 +523,8 @@ class DsdbTests(TestCase):
def test_no_error_on_invalid_control(self):
try:
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
attrs=["replPropertyMetaData"],
controls=["local_oid:%s:0"
% dsdb.DSDB_CONTROL_INVALID_NOT_IMPLEMENTED])
@@ -519,8 +533,8 @@ class DsdbTests(TestCase):
def test_error_on_invalid_critical_control(self):
try:
- res = self.samdb.search(expression="cn=Administrator",
- scope=ldb.SCOPE_SUBTREE,
+ res = self.samdb.search(scope=ldb.SCOPE_SUBTREE,
+ base=self.account_dn,
attrs=["replPropertyMetaData"],
controls=["local_oid:%s:1"
% dsdb.DSDB_CONTROL_INVALID_NOT_IMPLEMENTED])
diff --git a/python/samba/tests/test_pam_winbind.sh b/python/samba/tests/test_pam_winbind.sh
index c535759..0406b10 100755
--- a/python/samba/tests/test_pam_winbind.sh
+++ b/python/samba/tests/test_pam_winbind.sh
@@ -12,7 +12,7 @@ PASSWORD="$3"
export PASSWORD
shift 3
-PAM_WRAPPER_PATH="$BINDIR/default/lib/pam_wrapper"
+PAM_WRAPPER_PATH="$BINDIR/default/third_party/pam_wrapper"
pam_winbind="$BINDIR/shared/pam_winbind.so"
service_dir="$SELFTEST_TMPDIR/pam_services"
diff --git a/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh b/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
index 305633d..16dede4 100755
--- a/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
+++ b/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
@@ -12,7 +12,7 @@ PASSWORD="$3"
export PASSWORD
shift 3
-PAM_WRAPPER_PATH="$BINDIR/default/lib/pam_wrapper"
+PAM_WRAPPER_PATH="$BINDIR/default/third_party/pam_wrapper"
pam_winbind="$BINDIR/shared/pam_winbind.so"
service_dir="$SELFTEST_TMPDIR/pam_services"
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 6880455..f0e6a63 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1598,7 +1598,7 @@ sub provision($$$$$$$$$)
my $conffile="$libdir/server.conf";
my $dfqconffile="$libdir/dfq.conf";
- my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
+ my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/third_party/nss_wrapper/nss_wrapper.pl";
my $nss_wrapper_passwd = "$privatedir/passwd";
my $nss_wrapper_group = "$privatedir/group";
my $nss_wrapper_hosts = "$ENV{SELFTEST_PREFIX}/hosts";
diff --git a/lib/nss_wrapper/nss_wrapper.c b/third_party/nss_wrapper/nss_wrapper.c
similarity index 100%
rename from lib/nss_wrapper/nss_wrapper.c
rename to third_party/nss_wrapper/nss_wrapper.c
diff --git a/lib/nss_wrapper/nss_wrapper.pl b/third_party/nss_wrapper/nss_wrapper.pl
similarity index 100%
rename from lib/nss_wrapper/nss_wrapper.pl
rename to third_party/nss_wrapper/nss_wrapper.pl
diff --git a/lib/nss_wrapper/wscript b/third_party/nss_wrapper/wscript
similarity index 96%
rename from lib/nss_wrapper/wscript
rename to third_party/nss_wrapper/wscript
index f35e94e..90c6e71 100644
--- a/lib/nss_wrapper/wscript
+++ b/third_party/nss_wrapper/wscript
@@ -5,7 +5,7 @@ import os
VERSION="1.1.3"
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('nss_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_NSS_WRAPPER():
conf.DEFINE('USING_SYSTEM_NSS_WRAPPER', 1)
libnss_wrapper_so_path = 'libnss_wrapper.so'
else:
@@ -102,7 +102,7 @@ def configure(conf):
# Create full path to nss_wrapper
blddir = os.path.realpath(conf.blddir)
- libnss_wrapper_so_path = blddir + '/default/lib/nss_wrapper/libnss-wrapper.so'
+ libnss_wrapper_so_path = blddir + '/default/third_party/nss_wrapper/libnss-wrapper.so'
conf.DEFINE('LIBNSS_WRAPPER_SO_PATH', libnss_wrapper_so_path)
conf.DEFINE('NSS_WRAPPER', 1)
diff --git a/lib/pam_wrapper/libpamtest.c b/third_party/pam_wrapper/libpamtest.c
similarity index 100%
rename from lib/pam_wrapper/libpamtest.c
rename to third_party/pam_wrapper/libpamtest.c
diff --git a/lib/pam_wrapper/libpamtest.h b/third_party/pam_wrapper/libpamtest.h
similarity index 100%
rename from lib/pam_wrapper/libpamtest.h
rename to third_party/pam_wrapper/libpamtest.h
diff --git a/lib/pam_wrapper/pam_wrapper.c b/third_party/pam_wrapper/pam_wrapper.c
similarity index 99%
rename from lib/pam_wrapper/pam_wrapper.c
rename to third_party/pam_wrapper/pam_wrapper.c
index 03584be..2db9bcc 100644
--- a/lib/pam_wrapper/pam_wrapper.c
+++ b/third_party/pam_wrapper/pam_wrapper.c
@@ -1456,7 +1456,7 @@ int pam_prompt(pam_handle_t *pamh,
args);
va_end(args);
- return rv;
+ return rv;
}
#ifdef HAVE_PAM_STRERROR_CONST
diff --git a/lib/pam_wrapper/pwrap_compat.h b/third_party/pam_wrapper/pwrap_compat.h
similarity index 100%
rename from lib/pam_wrapper/pwrap_compat.h
rename to third_party/pam_wrapper/pwrap_compat.h
diff --git a/lib/pam_wrapper/python/pypamtest.c b/third_party/pam_wrapper/python/pypamtest.c
similarity index 100%
rename from lib/pam_wrapper/python/pypamtest.c
rename to third_party/pam_wrapper/python/pypamtest.c
diff --git a/lib/pam_wrapper/wscript b/third_party/pam_wrapper/wscript
similarity index 91%
rename from lib/pam_wrapper/wscript
rename to third_party/pam_wrapper/wscript
index cfd8b4f..75b4eec 100644
--- a/lib/pam_wrapper/wscript
+++ b/third_party/pam_wrapper/wscript
@@ -13,7 +13,7 @@ def find_library(library_names, lookup_paths):
return ''
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('pam_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_PAM_WRAPPER():
conf.DEFINE('USING_SYSTEM_PAM_WRAPPER', 1)
libpam_wrapper_so_path = 'libpam_wrapper.so'
else:
@@ -93,7 +93,7 @@ def configure(conf):
# Create full path to pam_wrapper
blddir = os.path.realpath(conf.blddir)
- libpam_wrapper_so_path = blddir + '/default/lib/pam_wrapper/libpam-wrapper.so'
+ libpam_wrapper_so_path = blddir + '/default/third_party/pam_wrapper/libpam-wrapper.so'
conf.DEFINE('LIBPAM_WRAPPER_SO_PATH', libpam_wrapper_so_path)
conf.DEFINE('PAM_WRAPPER', 1)
@@ -110,7 +110,8 @@ def build(bld):
realname='libpam-wrapper.so')
# Can be used to write pam tests in python
- bld.SAMBA_PYTHON('pypamtest',
- source='python/pypamtest.c libpamtest.c',
- deps='dl pam',
- install=False)
+ for env in bld.gen_python_environments():
+ bld.SAMBA_PYTHON('pypamtest',
+ source='python/pypamtest.c libpamtest.c',
+ deps='dl pam',
+ install=False)
diff --git a/lib/resolv_wrapper/resolv_wrapper.c b/third_party/resolv_wrapper/resolv_wrapper.c
similarity index 100%
rename from lib/resolv_wrapper/resolv_wrapper.c
rename to third_party/resolv_wrapper/resolv_wrapper.c
diff --git a/lib/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript
similarity index 94%
rename from lib/resolv_wrapper/wscript
rename to third_party/resolv_wrapper/wscript
index 25371ed..be3e82b 100644
--- a/lib/resolv_wrapper/wscript
+++ b/third_party/resolv_wrapper/wscript
@@ -5,7 +5,7 @@ import os
VERSION="1.1.4"
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('resolv_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_RESOLV_WRAPPER():
conf.DEFINE('USING_SYSTEM_RESOLV_WRAPPER', 1)
libresolv_wrapper_so_path = 'libresolv_wrapper.so'
else:
@@ -80,7 +80,7 @@ def configure(conf):
# Create full path to resolv_wrapper
blddir = os.path.realpath(conf.blddir)
- libresolv_wrapper_so_path = blddir + '/default/lib/resolv_wrapper/libresolv-wrapper.so'
+ libresolv_wrapper_so_path = blddir + '/default/third_party/resolv_wrapper/libresolv-wrapper.so'
conf.DEFINE('LIBRESOLV_WRAPPER_SO_PATH', libresolv_wrapper_so_path)
conf.DEFINE('RESOLV_WRAPPER', 1)
diff --git a/lib/socket_wrapper/socket_wrapper.c b/third_party/socket_wrapper/socket_wrapper.c
similarity index 99%
rename from lib/socket_wrapper/socket_wrapper.c
rename to third_party/socket_wrapper/socket_wrapper.c
index ba289e6..43b92f7 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/third_party/socket_wrapper/socket_wrapper.c
@@ -1233,7 +1233,7 @@ static int convert_in_un_alloc(struct socket_info *si, const struct sockaddr *in
if (addr == 0) {
/* 0.0.0.0 */
- is_bcast = 0;
+ is_bcast = 0;
type = d_type;
iface = socket_wrapper_default_iface();
} else if (a_type && addr == 0xFFFFFFFF) {
@@ -2019,7 +2019,7 @@ static int swrap_pcap_get_fd(const char *fname)
if (fd != -1) {
struct swrap_file_hdr file_hdr;
file_hdr.magic = 0xA1B2C3D4;
- file_hdr.version_major = 0x0002;
+ file_hdr.version_major = 0x0002;
file_hdr.version_minor = 0x0004;
file_hdr.timezone = 0x00000000;
file_hdr.sigfigs = 0x00000000;
diff --git a/lib/socket_wrapper/wscript b/third_party/socket_wrapper/wscript
similarity index 95%
rename from lib/socket_wrapper/wscript
rename to third_party/socket_wrapper/wscript
index dbefa83..514265b 100644
--- a/lib/socket_wrapper/wscript
+++ b/third_party/socket_wrapper/wscript
@@ -5,7 +5,7 @@ import os
VERSION="1.1.7"
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('socket_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_SOCKET_WRAPPER():
conf.DEFINE('USING_SYSTEM_SOCKET_WRAPPER', 1)
libsocket_wrapper_so_path = 'libsocket_wrapper.so'
else:
@@ -97,7 +97,7 @@ def configure(conf):
# Create full path to socket_wrapper
blddir = os.path.realpath(conf.blddir)
- libsocket_wrapper_so_path = blddir + '/default/lib/socket_wrapper/libsocket-wrapper.so'
+ libsocket_wrapper_so_path = blddir + '/default/third_party/socket_wrapper/libsocket-wrapper.so'
conf.DEFINE('LIBSOCKET_WRAPPER_SO_PATH', libsocket_wrapper_so_path)
conf.DEFINE('SOCKET_WRAPPER', 1)
diff --git a/lib/uid_wrapper/uid_wrapper.c b/third_party/uid_wrapper/uid_wrapper.c
similarity index 100%
rename from lib/uid_wrapper/uid_wrapper.c
rename to third_party/uid_wrapper/uid_wrapper.c
diff --git a/lib/uid_wrapper/wscript b/third_party/uid_wrapper/wscript
similarity index 95%
rename from lib/uid_wrapper/wscript
rename to third_party/uid_wrapper/wscript
index 9c1c009..6e1540f 100644
--- a/lib/uid_wrapper/wscript
+++ b/third_party/uid_wrapper/wscript
@@ -6,7 +6,7 @@ import os, sys
VERSION="1.2.4"
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('uid_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_UID_WRAPPER():
conf.DEFINE('USING_SYSTEM_UID_WRAPPER', 1)
libuid_wrapper_so_path = 'libuid_wrapper.so'
else:
@@ -113,7 +113,7 @@ syscall(SYS_setgroups32, 0, NULL);
# Create full path to uid_wrapper
--
Samba Shared Repository
More information about the samba-cvs
mailing list