netlogon: move netlogon helpers to ../libcli/netlogon.

Guenther

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;

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',

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)

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)

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__ */

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'
+	)

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")
 ]

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,

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  */
 

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"
 

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"

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')

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

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 {

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')