summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/cldap.h2
-rw-r--r--source3/libsmb/clidgram.h2
-rw-r--r--source3/libsmb/namequery.c2
-rw-r--r--source3/nmbd/nmbd_processlogon.c2
-rw-r--r--source3/wscript_build11
5 files changed, 7 insertions, 12 deletions
diff --git a/source3/libads/cldap.h b/source3/libads/cldap.h
index afe4b35b5d..e2d05ce731 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 640a590248..01a8a6a404 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 e7dd22ad10..64452d53a2 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 d21ad3d4b2..7976817664 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 6b21540e5b..9905b88589 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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'''
@@ -993,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',
@@ -1081,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')
@@ -1468,6 +1462,7 @@ bld.RECURSE('../libcli/auth')
bld.RECURSE('../libcli/drsuapi')
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')