The branch, master has been updated via 286c3d6 s3-waf: add NMBDSOCKETDIR variable. via 5c9eca6 s3-build: fix classic build after libcli netlogon changes. via 3294ccb netlogon: move netlogon helpers to ../libcli/netlogon. via 75c8e42 s3-waf: rename LIBCLI_NETLOGON subsystem to LIBRPCCLI_NETLOGON. via 358c8ec s3-waf: rearrange waf recurses in main wscript_build. via ccf15eb s3-waf: cleanup wscript_build a little. via 0a7d6dc s3-waf: recurse into ../lib/smbconf. from 3e0915f s3: Make nmbd socket dir configurable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 286c3d6d8ed0b50b8da0e9416df200c9162bc4cf Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 15:21:26 2011 +0100 s3-waf: add NMBDSOCKETDIR variable. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Fri Jan 7 16:33:55 CET 2011 on sn-devel-104 commit 5c9eca6fc4060d9780264fe3576f12ac1d9d9759 Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 12:36:38 2011 +0100 s3-build: fix classic build after libcli netlogon changes. Guenther commit 3294ccbb6d2ce26da5b6b9b512dfc1184a153d26 Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 12:01:42 2011 +0100 netlogon: move netlogon helpers to ../libcli/netlogon. Guenther commit 75c8e429383d0d5d4cb13e769d66d87a64252e42 Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 12:19:00 2011 +0100 s3-waf: rename LIBCLI_NETLOGON subsystem to LIBRPCCLI_NETLOGON. Guenther commit 358c8ec292868b8674577b41e46fc447e657b396 Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 12:08:54 2011 +0100 s3-waf: rearrange waf recurses in main wscript_build. Guenther commit ccf15ebcc3ee318415028cf449a0b2efa914548e Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 11:45:33 2011 +0100 s3-waf: cleanup wscript_build a little. Guenther commit 0a7d6dc8a886c0e4cd98efadc193e43df05ab172 Author: Günther Deschner <g...@samba.org> Date: Fri Jan 7 11:41:15 2011 +0100 s3-waf: recurse into ../lib/smbconf. Guenther ----------------------------------------------------------------------- Summary of changes: libcli/cldap/cldap.h | 2 +- libcli/nbt/wscript_build | 12 ---- libcli/{ => netlogon}/ndr_netlogon.c | 2 +- libcli/{ => netlogon}/ndr_netlogon_proto.h | 0 libcli/{ => netlogon}/netlogon.c | 2 +- libcli/{ => netlogon}/netlogon.h | 4 +- libcli/{ => netlogon}/netlogon_proto.h | 0 libcli/netlogon/wscript_build | 11 +++ librpc/idl/nbt.idl | 2 +- source3/Makefile.in | 4 +- source3/build/dynconfig.py | 2 + source3/libads/cldap.h | 2 +- source3/libsmb/clidgram.h | 2 +- source3/libsmb/namequery.c | 2 +- source3/nmbd/nmbd_processlogon.c | 2 +- source3/wscript_build | 95 ++++++++++++---------------- source4/libcli/dgram/libdgram.h | 2 +- source4/libcli/finddc.h | 2 +- source4/wscript_build | 1 + 19 files changed, 68 insertions(+), 81 deletions(-) rename libcli/{ => netlogon}/ndr_netlogon.c (99%) rename libcli/{ => netlogon}/ndr_netlogon_proto.h (100%) rename libcli/{ => netlogon}/netlogon.c (99%) rename libcli/{ => netlogon}/netlogon.h (94%) rename libcli/{ => netlogon}/netlogon_proto.h (100%) create mode 100644 libcli/netlogon/wscript_build Changeset truncated at 500 lines: diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h index d05e5b9..d119748 100644 --- a/libcli/cldap/cldap.h +++ b/libcli/cldap/cldap.h @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" struct ldap_message; struct tsocket_address; diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index 9cae6e0..7229d12 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -21,18 +21,6 @@ bld.SAMBA_BINARY('nmblookup', ) -bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', - source='../ndr_netlogon.c', - public_deps='ndr NDR_SECURITY' - ) - - -bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', - source='../netlogon.c', - public_deps='samba-util LIBCLI_NDR_NETLOGON' - ) - - bld.SAMBA_PYTHON('python_netbios', source='pynbt.c', public_deps='cli-nbt DYNCONFIG samba-hostconfig', diff --git a/libcli/ndr_netlogon.c b/libcli/netlogon/ndr_netlogon.c similarity index 99% rename from libcli/ndr_netlogon.c rename to libcli/netlogon/ndr_netlogon.c index d15154d..7d6aa97 100644 --- a/libcli/ndr_netlogon.c +++ b/libcli/netlogon/ndr_netlogon.c @@ -22,7 +22,7 @@ /* parser auto-generated by pidl, then hand-modified by abartlet */ #include "includes.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" /* Manually modified to handle the dom_sid being optional based on if it is present or all zero */ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_REQUEST *r) diff --git a/libcli/ndr_netlogon_proto.h b/libcli/netlogon/ndr_netlogon_proto.h similarity index 100% rename from libcli/ndr_netlogon_proto.h rename to libcli/netlogon/ndr_netlogon_proto.h diff --git a/libcli/netlogon.c b/libcli/netlogon/netlogon.c similarity index 99% rename from libcli/netlogon.c rename to libcli/netlogon/netlogon.c index ceb1c85..d82a201 100644 --- a/libcli/netlogon.c +++ b/libcli/netlogon/netlogon.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" NTSTATUS push_netlogon_samlogon_response(DATA_BLOB *data, TALLOC_CTX *mem_ctx, struct netlogon_samlogon_response *response) diff --git a/libcli/netlogon.h b/libcli/netlogon/netlogon.h similarity index 94% rename from libcli/netlogon.h rename to libcli/netlogon/netlogon.h index 3e626ed..9bf346a 100644 --- a/libcli/netlogon.h +++ b/libcli/netlogon/netlogon.h @@ -50,6 +50,6 @@ struct nbt_netlogon_response } data; }; -#include "../libcli/netlogon_proto.h" -#include "../libcli/ndr_netlogon_proto.h" +#include "../libcli/netlogon/netlogon_proto.h" +#include "../libcli/netlogon/ndr_netlogon_proto.h" #endif /* __CLDAP_SERVER_PROTO_H__ */ diff --git a/libcli/netlogon_proto.h b/libcli/netlogon/netlogon_proto.h similarity index 100% rename from libcli/netlogon_proto.h rename to libcli/netlogon/netlogon_proto.h diff --git a/libcli/netlogon/wscript_build b/libcli/netlogon/wscript_build new file mode 100644 index 0000000..6c5e57b --- /dev/null +++ b/libcli/netlogon/wscript_build @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', + source='ndr_netlogon.c', + public_deps='ndr NDR_SECURITY' + ) + +bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', + source='netlogon.c', + public_deps='samba-util LIBCLI_NDR_NETLOGON' + ) diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl index 246dfeb..cbfa966 100644 --- a/librpc/idl/nbt.idl +++ b/librpc/idl/nbt.idl @@ -10,7 +10,7 @@ import "misc.idl", "security.idl", "svcctl.idl", "samr.idl"; [ - helper("../libcli/netlogon.h", "../libcli/nbt/libnbt.h"), + helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"), helpstring("NBT messages"), uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e") ] diff --git a/source3/Makefile.in b/source3/Makefile.in index 7c52f04..56ae635 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -526,8 +526,8 @@ SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o passdb/machine_s librpc/gen_ndr/ndr_secrets.o LIBNBT_OBJ = ../libcli/nbt/nbtname.o \ - ../libcli/netlogon.o \ - ../libcli/ndr_netlogon.o \ + ../libcli/netlogon/netlogon.o \ + ../libcli/netlogon/ndr_netlogon.o \ librpc/gen_ndr/ndr_nbt.o \ librpc/gen_ndr/ndr_svcctl.o \ ../librpc/ndr/ndr_svcctl.o diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py index f755f7f..0654710 100644 --- a/source3/build/dynconfig.py +++ b/source3/build/dynconfig.py @@ -8,6 +8,7 @@ dir_options = { 'with-lockdir' : [ '${PREFIX}/var/locks', 'where to put lock files' ], 'with-logfilebase' : [ '${PREFIX}/var/log/samba', 'Where to put log files' ], 'with-ncalrpcdir' : [ '${PREFIX}/var/ncalrpc', 'where to put ncalrpc sockets' ], + 'with-nmbdsocketdir' : [ '${PREFIX}/var/locks/.nmbd', 'Where to put the nmbd socket directory' ], 'with-ntp-signd-socket-dir' : [ '${PREFIX}/var/run/ntp_signd', 'NTP signed directory'], 'with-pammodulesdir' : [ '', 'Which directory to use for PAM modules' ], 'with-piddir' : [ '${PREFIX}/var/locks', 'where to put pid files' ], @@ -34,6 +35,7 @@ dyn_cflags = { 'LOGFILEBASE' : '${LOCALSTATEDIR}', 'MODULESDIR' : '${PREFIX}/modules', 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc', + 'NMBDSOCKETDIR' : '${LOCKDIR}/.nmbd', 'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}', 'PIDDIR' : '${LOCALSTATEDIR}/run', 'PRIVATE_DIR' : '${PRIVATEDIR}', diff --git a/source3/libads/cldap.h b/source3/libads/cldap.h index afe4b35..e2d05ce 100644 --- a/source3/libads/cldap.h +++ b/source3/libads/cldap.h @@ -1,4 +1,4 @@ -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" /* The following definitions come from libads/cldap.c */ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx, diff --git a/source3/libsmb/clidgram.h b/source3/libsmb/clidgram.h index 640a590..01a8a6a 100644 --- a/source3/libsmb/clidgram.h +++ b/source3/libsmb/clidgram.h @@ -1,4 +1,4 @@ -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" /* The following definitions come from libsmb/clidgram.c */ diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index e7dd22a..64452d5 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -21,7 +21,7 @@ #include "includes.h" #include "libads/sitename_cache.h" #include "libads/dns.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" #include "librpc/gen_ndr/messaging.h" #include "lib/async_req/async_sock.h" diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index d21ad3d..7976817 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -24,7 +24,7 @@ */ #include "includes.h" -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" #include "../libcli/cldap/cldap.h" #include "../lib/tsocket/tsocket.h" #include "../libcli/security/security.h" diff --git a/source3/wscript_build b/source3/wscript_build index 7d70608..9905b88 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -49,7 +49,7 @@ LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c''' LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c' -LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c' +LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c' # this includes only the low level parse code, not stuff # that requires knowledge of security contexts @@ -147,8 +147,6 @@ LIBADS_PRINTER_SRC = '''libads/ldap_printer.c''' SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c passdb/machine_sid.c''' -LIBNBT_SRC = '''../libcli/netlogon.c''' - LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c libads/dns.c libads/sitename_cache.c''' @@ -561,9 +559,7 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c CLIENT_SRC = '''${CLIENT_SRC1}''' -LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c - ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c - lib/smbconf/smbconf_init.c''' +LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c' SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c' @@ -658,14 +654,6 @@ WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c''' WBINFO_SRC = '''../nsswitch/wbinfo.c''' -WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}''' - -WINBIND_KRB5_LOCATOR_SRC1 = '../nsswitch/winbind_krb5_locator.c' -WINBIND_KRB5_LOCATOR_SRC = '''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}''' - -POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \ - ../lib/popt/popthelp.c ../lib/popt/poptparse.c''' - NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''' NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1} @@ -705,15 +693,9 @@ samba_version.load_version(bld.env) bld.SAMBA_MKVERSION('include/version.h') bld.RECURSE('../lib/replace') -bld.RECURSE('../libcli/smbreadline') print "SBINDIR=%s" % bld.env.SBINDIR bld.RECURSE('build') -bld.RECURSE('../librpc') -bld.RECURSE('librpc/idl') -bld.RECURSE('librpc') -bld.RECURSE('../libcli/security') - ######################## SUBSYSTEMS ################################# bld.SAMBA_SUBSYSTEM('winbind-client', @@ -726,8 +708,8 @@ bld.SAMBA_LIBRARY('netapi', public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI - RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL - LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON + RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL + LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN INIT_NETLOGON INIT_SAMR''', public_headers='lib/netapi/netapi.h', @@ -823,7 +805,7 @@ bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG', bld.SAMBA_SUBSYSTEM('PARAM', source='', - deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF', + deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF', vars=locals()) bld.SAMBA_SUBSYSTEM('REGFIO', @@ -928,9 +910,9 @@ bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN', source=AFS_SETTOKEN_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('LIBSMBCONF', - source=LIBSMBCONF_SRC, - deps='REG_BASE REG_SMBCONF', +bld.SAMBA_SUBSYSTEM('LIB_SMBCONF', + source=LIB_SMBCONF_SRC, + deps='LIBSMBCONF REG_BASE REG_SMBCONF', vars=locals()) bld.SAMBA_SUBSYSTEM('SMBD_BASE', @@ -941,8 +923,8 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO - LIBSMBCONF REG_FULL FNAME_UTIL - LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS + LIB_SMBCONF REG_FULL FNAME_UTIL + LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR LIBCLI_SMB_COMMON RPC_SERVER ''', @@ -1009,8 +991,8 @@ bld.SAMBA_SUBSYSTEM('LIBNMB', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBNBT', - source=LIBNBT_SRC, - deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NDR_NETLOGON', + source='', + deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON', vars=locals()) bld.SAMBA_SUBSYSTEM('SERVICES', @@ -1097,10 +1079,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', deps='talloc', autoproto='nbtname.h') -bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', - source='../libcli/ndr_netlogon.c', - public_deps='ndr NDR_SECURITY') - bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG', source='../librpc/gen_ndr/cli_winreg.c', public_deps='RPC_NDR_WINREG') @@ -1157,8 +1135,8 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA', source=LIBCLI_LSA_SRC, deps='RPCCLI_LSA INIT_LSA') -bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', - source=LIBCLI_NETLOGON_SRC, +bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON', + source=LIBRPCCLI_NETLOGON_SRC, deps='RPCCLI_NETLOGON') bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS', @@ -1202,7 +1180,7 @@ bld.SAMBA_BINARY('winbindd/winbindd', SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info TOKEN_UTIL - LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON + 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 ''', @@ -1226,7 +1204,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient', PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO RPC_CLIENT_SCHANNEL - LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS + LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPCCLI_SRVSVC RPCCLI_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS RPCCLI_DRSUAPI RPC_NDR_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON INIT_SAMR @@ -1248,7 +1226,7 @@ bld.SAMBA_BINARY('net', LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL REGFIO NDR_NTPRINTING RPCCLI_WINREG RPC_CLIENT_SCHANNEL TOKEN_UTIL - LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS + LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPC_NDR_DSSETUP RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR ''', @@ -1478,32 +1456,39 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') ########################## INCLUDES ################################# -bld.RECURSE('../lib/socket_wrapper') -bld.RECURSE('../lib/talloc') -bld.RECURSE('../lib/tdb') -bld.RECURSE('../lib/nss_wrapper') -bld.RECURSE('../lib/tevent') -bld.RECURSE('../lib/popt') -bld.RECURSE('../lib/zlib') -bld.RECURSE('../lib/tsocket') -bld.RECURSE('../lib/iniparser/src') -bld.RECURSE('../lib/crypto') -bld.RECURSE('../lib/async_req') bld.RECURSE('../lib/addns') +bld.RECURSE('../lib/async_req') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') -bld.RECURSE('../libcli/samsync') +bld.RECURSE('../libcli/ldap') bld.RECURSE('../libcli/named_pipe_auth') +bld.RECURSE('../libcli/netlogon') +bld.RECURSE('../libcli/samsync') +bld.RECURSE('../libcli/security') bld.RECURSE('../libcli/smb') -bld.RECURSE('../libcli/ldap') +bld.RECURSE('../libcli/smbreadline') +bld.RECURSE('../lib/crypto') +bld.RECURSE('../lib/iniparser/src') +bld.RECURSE('../lib/nss_wrapper') +bld.RECURSE('../lib/popt') +bld.RECURSE('../librpc') +bld.RECURSE('../lib/smbconf') +bld.RECURSE('../lib/socket_wrapper') +bld.RECURSE('../lib/talloc') +bld.RECURSE('../lib/tdb') +bld.RECURSE('../lib/tevent') +bld.RECURSE('../lib/tsocket') +bld.RECURSE('../lib/zlib') bld.RECURSE('../nsswitch/libwbclient') -bld.RECURSE('modules') bld.RECURSE('auth') -bld.RECURSE('passdb') -bld.RECURSE('winbindd') bld.RECURSE('libgpo/gpext') +bld.RECURSE('librpc') +bld.RECURSE('librpc/idl') +bld.RECURSE('modules') bld.RECURSE('pam_smbpass') +bld.RECURSE('passdb') bld.RECURSE('rpc_server') +bld.RECURSE('winbindd') bld.ENFORCE_GROUP_ORDERING() bld.CHECK_PROJECT_RULES() diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index a5d1b94..280c27d 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../libcli/netlogon.h" +#include "../libcli/netlogon/netlogon.h" /* a datagram name request diff --git a/source4/libcli/finddc.h b/source4/libcli/finddc.h index 9ff1723..3836d12 100644 --- a/source4/libcli/finddc.h +++ b/source4/libcli/finddc.h @@ -21,7 +21,7 @@ #include "lib/messaging/messaging.h" #include "libcli/libcli.h" -#include "libcli/netlogon.h" +#include "libcli/netlogon/netlogon.h" struct finddcs { struct { diff --git a/source4/wscript_build b/source4/wscript_build index 9566d10..daf2bce 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -85,6 +85,7 @@ bld.RECURSE('../lib/async_req') bld.RECURSE('../libcli/security') bld.RECURSE('../libcli/ldap') bld.RECURSE('../libcli/nbt') +bld.RECURSE('../libcli/netlogon') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/echo') -- Samba Shared Repository