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

Guenther

diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index d05e5b993687b5de5dfb246340d0a674be0ef34a..d1197481fb5fb74e7f493b31e876622d762a2d6c 100644 (file)
--- 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 9cae6e01955fb9e6e961cdf91ec82c7583862534..7229d12e2ed7adf5d9cb9ce5f41c2eede01fa9b7 100644 (file)
--- 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 d15154d2c98ee82245435291a767fe91b13b36e0..7d6aa974b0c71a96dfcae1bccb33b2167fd4a1da 100644 (file)
--- 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 ceb1c85c56b53cf4fb42f7e3aadd3425d275c2e2..d82a2013b8f07032cdec4edc9c50b92fcf0f9998 100644 (file)
--- 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 3e626ed40dc1760b7abed8c70d7ad1c21be47ab4..9bf346af26dce35ae06e0532f429a40f67f156e9 100644 (file)
--- 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 (file)
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 246dfeb7c4dca38d95f095f6554964a5839b5237..cbfa9666701bb3862b88c440428e077d4cbb5c7f 100644 (file)
--- 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/libads/cldap.h b/source3/libads/cldap.h
index afe4b35b5d9f78a8b0bfefa121274af27dfb02b2..e2d05ce73130afed7fa7b095126c8943077e97ee 100644 (file)
--- 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 640a590248b66b85860015ad83895bbf6aed5685..01a8a6a4049f479499f6df62d97aa80ef0b19ded 100644 (file)
--- 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 e7dd22ad108edfb9ac8a3d15aad2d53fd61342b0..64452d53a2aa9beac05e83e42a6e61f60c2cfcee 100644 (file)
--- 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 d21ad3d4b200d29a39e3af2b3b774c4cb268ea13..7976817664700afe1e8205f969631d281a6ca4d7 100644 (file)
--- 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 6b21540e5b6616ca531029e6d3de9a4a651293f1..9905b88589fe06e0fb4c43e7c2fac882bf6b2de0 100644 (file)
--- 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')

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index a5d1b94e3aa946ea2f17d2ccb80667f5fdd0c8c5..280c27d41d1f0f23336aee9e5d02878d6b1e2caa 100644 (file)
--- 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 9ff17236c08798ef1249dbd70dad359faf54b5a3..3836d127026b1559b42d9345b2d12e0de6cf602d 100644 (file)
--- 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 9566d10d941c8f00f3338c3f88a444425203798d..daf2bce03d87200a7f41b030a80cff8877b8e163 100644 (file)
--- 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')