[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Thu Feb 17 02:47:23 MST 2011
The branch, v3-6-test has been updated
via b9b65a2 s3-selftest: make sure we really use --format=subunit when calling smbtorture4.
via f4bf843 libndr: remove prototype for nonexisting function ndr_print_ipv4_addr().
via 0d3d93e s3-waf: move libsmb/clikrb5.c and libads/kerberos.c into KRBCLIENT.
via 8c37adc nsswitch: make wb_reqtrans a common subsystem.
via 7a81f83 s3-waf: make most of the nsswitch common.
via 9aa300b s4-waf: move wbinfo buildrule to winbind.
via 476cd3b build: change lib order to fix build on netbsd
via f134d5a s4/waf: add intl dependency for nss_winnbind
from aee5e95 s3-waf: add check for struct stat st_flags member.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit b9b65a225a5baf60e4e6d48ff2e12022898abfc7
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 17 01:12:04 2011 +0100
s3-selftest: make sure we really use --format=subunit when calling smbtorture4.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Feb 17 02:01:56 CET 2011 on sn-devel-104
(cherry picked from commit 78c4b2170eaa29f38d9b2904c8a6e71edfeb831b)
commit f4bf8432dd623c98d0302f81653899ce7523dd35
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 16 00:43:30 2011 +0100
libndr: remove prototype for nonexisting function ndr_print_ipv4_addr().
Guenther
(cherry picked from commit 0aed229710b8058878f25ce7b738ef807fb1faaa)
commit 0d3d93e01524cf4fa0dc095392782db1ffd80452
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 17 00:49:11 2011 +0100
s3-waf: move libsmb/clikrb5.c and libads/kerberos.c into KRBCLIENT.
This avoids two duplicates...
Guenther
(cherry picked from commit 0e156e7d62df9178c89d1beae4d0c3c936ea2827)
commit 8c37adcbc21fbfd740198a79b33a029684b0f9a5
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 17 00:43:05 2011 +0100
nsswitch: make wb_reqtrans a common subsystem.
Guenther
(cherry picked from commit bc83400d8102d7f01e00d71d86cd28f7dc1fbfc9)
commit 7a81f837c9780938de713da52be52cad88745ff2
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 17 00:11:18 2011 +0100
s3-waf: make most of the nsswitch common.
Guenther
(cherry picked from commit 743b13b8e0bb1a79219d4cd89a4c3e3f75344d2c)
commit 9aa300b7229928e0ff59d19a818aeff2b9833b7e
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 16 23:53:25 2011 +0100
s4-waf: move wbinfo buildrule to winbind.
Will be moved back later, once we have a more common samba-util.so
Guenther
(cherry picked from commit 9867b7bf34c80a12b936682ab6cb686ab45ca51c)
commit 476cd3bc76ab579b63a8f17a30a8fc6dbfb4526b
Author: Matthieu Patou <mat at matws.net>
Date: Sun Dec 12 12:06:31 2010 +0300
build: change lib order to fix build on netbsd
Autobuild-User: Matthieu Patou <mat at samba.org>
Autobuild-Date: Sun Dec 12 10:54:02 CET 2010 on sn-devel-104
(cherry picked from commit 24cac449a1910ce55cbc5e83180b6dd89940223f)
commit f134d5ad788ee4eb285e366bb1848dfd42ff93e7
Author: Björn Jacke <bj at sernet.de>
Date: Wed Dec 1 15:26:11 2010 +0100
s4/waf: add intl dependency for nss_winnbind
needed to fix a build issue on NetBSD and other platforms
Autobuild-User: Björn Jacke <bj at sernet.de>
Autobuild-Date: Wed Dec 1 16:15:19 CET 2010 on sn-devel-104
(cherry picked from commit ffc3f943cd9fbcc7dfdae6e843b2759a81e5b110)
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/libndr.h | 1 -
{source3/lib => nsswitch}/wb_reqtrans.c | 2 +-
{source3/lib => nsswitch}/wb_reqtrans.h | 0
nsswitch/wscript_build | 25 ++++++++-----
source3/Makefile.in | 4 +-
source3/selftest/tests.sh | 2 +-
source3/torture/wbc_async.h | 2 +-
source3/winbindd/winbindd.c | 2 +-
source3/winbindd/winbindd_dual.c | 2 +-
source3/wscript_build | 58 +++++-------------------------
source4/winbind/wscript_build | 4 ++
11 files changed, 37 insertions(+), 65 deletions(-)
rename {source3/lib => nsswitch}/wb_reqtrans.c (99%)
rename {source3/lib => nsswitch}/wb_reqtrans.h (100%)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 67b5372..21e4bda 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -378,7 +378,6 @@ enum ndr_err_code ndr_push_dom_sid0(struct ndr_push *ndr, int ndr_flags, const s
enum ndr_err_code ndr_pull_dom_sid0(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
-void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip);
void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid);
bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, const struct ndr_syntax_id *i2);
enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, ndr_push_flags_fn_t fn);
diff --git a/source3/lib/wb_reqtrans.c b/nsswitch/wb_reqtrans.c
similarity index 99%
rename from source3/lib/wb_reqtrans.c
rename to nsswitch/wb_reqtrans.c
index 78f806d..779ef52 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/nsswitch/wb_reqtrans.c
@@ -32,7 +32,7 @@
#include "lib/util/tevent_unix.h"
#include "nsswitch/winbind_struct_protocol.h"
#include "nsswitch/libwbclient/wbclient.h"
-#include "lib/wb_reqtrans.h"
+#include "nsswitch/wb_reqtrans.h"
/* can't use DEBUG here... */
#define DEBUG(a,b)
diff --git a/source3/lib/wb_reqtrans.h b/nsswitch/wb_reqtrans.h
similarity index 100%
rename from source3/lib/wb_reqtrans.h
rename to nsswitch/wb_reqtrans.h
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 4baed1c..6087eda 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -14,21 +14,28 @@ bld.SAMBA_BINARY('nsstest',
)
-bld.SAMBA_BINARY('wbinfo',
- source='wbinfo.c',
- deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY'
- )
-
bld.SAMBA_LIBRARY('nss_winbind',
- source='../nsswitch/winbind_nss_linux.c',
+ source='winbind_nss_linux.c',
deps='winbind-client',
realname='libnss_winbind.so.2',
vnum='2')
-if bld.CONFIG_SET('HAVE_PAM_START'):
+
+if bld.CONFIG_SET('WITH_PAM_MODULES') or bld.CONFIG_SET('HAVE_PAM_START'):
bld.SAMBA_LIBRARY('pamwinbind',
- source='../nsswitch/pam_winbind.c',
- deps='talloc wbclient winbind-client LIBINIPARSER pam',
+ source='pam_winbind.c',
+ deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_winbind.so',
)
+
+if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+ bld.SAMBA_LIBRARY('winbind_krb5_locator',
+ source='winbind_krb5_locator.c',
+ deps='wbclient krb5',
+ realname='winbind_krb5_locator.so')
+
+bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
+ source='wb_reqtrans.c',
+ deps='talloc tevent LIBASYNC_REQ'
+ )
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9648315..0d6a631 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1216,7 +1216,7 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
@LIBWBCLIENT_STATIC@ \
torture/wbc_async.o \
- lib/wb_reqtrans.o \
+ ../nsswitch/wb_reqtrans.o \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ)
MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
@@ -1410,7 +1410,7 @@ WINBINDD_OBJ1 = \
auth/server_info_sam.o \
auth/user_info.o \
auth/pampass.o \
- lib/wb_reqtrans.o
+ ../nsswitch/wb_reqtrans.o
WINBINDD_OBJ = \
$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index abac442..bfebd91 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -170,7 +170,7 @@ plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDI
if [ -n "$SELFTEST_VERBOSE" ]; then
TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:progress=no"
fi
- TORTURE_OPTIONS="$TORTURE4_OPTIONS --format=subunit"
+ TORTURE4_OPTIONS="$TORTURE4_OPTIONS --format=subunit"
if [ -n "$SELFTEST_QUICK" ]; then
TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:quick=yes"
fi
diff --git a/source3/torture/wbc_async.h b/source3/torture/wbc_async.h
index 6a49511..9cd6a93 100644
--- a/source3/torture/wbc_async.h
+++ b/source3/torture/wbc_async.h
@@ -27,7 +27,7 @@
#include <talloc.h>
#include <tevent.h>
#include "nsswitch/libwbclient/wbclient.h"
-#include "lib/wb_reqtrans.h"
+#include "nsswitch/wb_reqtrans.h"
struct wb_context;
struct winbindd_request;
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 3a76231..92ae12f 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -26,7 +26,7 @@
#include "popt_common.h"
#include "winbindd.h"
#include "nsswitch/winbind_client.h"
-#include "lib/wb_reqtrans.h"
+#include "nsswitch/wb_reqtrans.h"
#include "librpc/gen_ndr/messaging.h"
#include "../librpc/gen_ndr/srv_lsa.h"
#include "../librpc/gen_ndr/srv_samr.h"
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 6465d84..bf9fd13 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -29,7 +29,7 @@
#include "includes.h"
#include "winbindd.h"
-#include "lib/wb_reqtrans.h"
+#include "nsswitch/wb_reqtrans.h"
#include "librpc/gen_ndr/messaging.h"
#include "secrets.h"
#include "../lib/util/select.h"
diff --git a/source3/wscript_build b/source3/wscript_build
index 7d6fb3b..016f412 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -15,8 +15,6 @@ SMBLDAP_SRC = '''lib/smbldap.c lib/smbldap_util.c'''
VERSION_SRC = '''lib/version.c'''
-WBCOMMON_SRC = '../nsswitch/wb_common.c'
-
AFS_SRC = 'lib/afs.c'
AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
@@ -129,7 +127,7 @@ PARAM_UTIL_SRC = '''param/util.c'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
-KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
+KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c libsmb/clikrb5.c'''
LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
@@ -179,7 +177,7 @@ TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
- libsmb/clikrb5.c libsmb/clispnego.c
+ libsmb/clispnego.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
@@ -384,8 +382,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
auth/server_info.c
auth/server_info_sam.c
auth/user_info.c
- auth/user_util.c
- lib/wb_reqtrans.c'''
+ auth/user_util.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
${TDB_VALIDATE_SRC}'''
@@ -509,8 +506,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
-PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c'
-
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
@@ -617,8 +612,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
torture/test_smbsock_any_connect.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
- torture/wbc_async.c
- lib/wb_reqtrans.c'''
+ torture/wbc_async.c'''
MASKTEST_SRC = '''torture/masktest.c'''
@@ -626,8 +620,6 @@ MSGTEST_SRC = '''torture/msgtest.c'''
LOCKTEST_SRC = '''torture/locktest.c'''
-NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
-
PDBTEST_SRC = '''torture/pdbtest.c'''
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
@@ -659,9 +651,7 @@ WBINFO_SRC = '''../nsswitch/wbinfo.c'''
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
-NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
- libsmb/clikrb5.c libads/kerberos.c'''
-
+NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
VLP_SRC = '''printing/tests/vlp.c'''
@@ -701,11 +691,6 @@ bld.RECURSE('build')
######################## SUBSYSTEMS #################################
-bld.SAMBA_SUBSYSTEM('winbind-client',
- source=WBCOMMON_SRC,
- deps='replace',
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR)
-
bld.SAMBA_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
@@ -734,12 +719,6 @@ bld.SAMBA_LIBRARY('smbsharemodes',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('nss_winbind',
- source='../nsswitch/winbind_nss_linux.c',
- deps='winbind-client',
- realname='libnss_winbind.so.2',
- vnum='2')
-
bld.SAMBA_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
deps='''winbind-client PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
@@ -747,19 +726,6 @@ bld.SAMBA_LIBRARY('nss_wins',
realname='libnss_wins.so.2',
vnum='2')
-if bld.CONFIG_SET('WITH_PAM_MODULES'):
- bld.SAMBA_LIBRARY('pamwinbind',
- source=PAM_WINBIND_SRC,
- deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
- cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
- realname='pam_winbind.so')
-
-if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.SAMBA_LIBRARY('winbind_krb5_locator',
- source='../nsswitch/winbind_krb5_locator.c',
- deps='wbclient krb5',
- realname='winbind_krb5_locator.so')
-
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
@@ -865,7 +831,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET',
+ deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
@@ -1144,7 +1110,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
- PAM_ERRORS
+ PAM_ERRORS WB_REQTRANS
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1263,7 +1229,7 @@ bld.SAMBA_BINARY('nmblookup',
bld.SAMBA_BINARY('smbtorture',
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
- LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''',
+ LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
vars=locals())
bld.SAMBA_BINARY('smbconftort',
@@ -1313,11 +1279,6 @@ bld.SAMBA_BINARY('locktest',
ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('nsstest',
- source=NSSTEST_SRC,
- deps='dl',
- vars=locals())
-
bld.SAMBA_BINARY('pdbtest',
source=PDBTEST_SRC,
deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
@@ -1373,7 +1334,7 @@ bld.SAMBA_BINARY('ntlm_auth',
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
PASSDB GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
- NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
+ NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
bld.SAMBA_BINARY('timelimit',
@@ -1441,6 +1402,7 @@ bld.RECURSE('../lib/tdb')
bld.RECURSE('../lib/tevent')
bld.RECURSE('../lib/tsocket')
bld.RECURSE('../lib/zlib')
+bld.RECURSE('../nsswitch')
bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('auth')
bld.RECURSE('libgpo/gpext')
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 5ba9c2a..09fee43 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -24,3 +24,7 @@ bld.SAMBA_SUBSYSTEM('IDMAP',
public_deps='samdb-common ldbsamba'
)
+bld.SAMBA_BINARY('wbinfo',
+ source='../../nsswitch/wbinfo.c',
+ deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY'
+ )
--
Samba Shared Repository
More information about the samba-cvs
mailing list