nbt: merge in LIBCLI_NDR_NETLOGON helper into NDR_NBT.

Guenther

9 files changed, 38 insertions, 36 deletions

diff --git a/libcli/netlogon/ndr_netlogon_proto.h b/libcli/netlogon/ndr_netlogon_proto.h
deleted file mode 100644
index ca61c16138..0000000000
--- a/libcli/netlogon/ndr_netlogon_proto.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _____LIBCLI_NDR_NETLOGON_PROTO_H__
-#define _____LIBCLI_NDR_NETLOGON_PROTO_H__
-
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
-/* This file was automatically generated by mkproto.pl. DO NOT EDIT */
-
-/* this file contains prototypes for functions that are private 
- * to this subsystem or library. These functions should not be 
- * used outside this particular subsystem! */
-
-
-/* The following definitions come from ../libcli/ndr_netlogon.c  */
-
-enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_REQUEST *r);
-enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int ndr_flags, struct NETLOGON_SAM_LOGON_REQUEST *r);
-enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_RESPONSE_EX *r);
-enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_pull *ndr, int ndr_flags, struct NETLOGON_SAM_LOGON_RESPONSE_EX *r,
-								     uint32_t nt_version_flags);
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
-
-#endif /* _____LIBCLI_NDR_NETLOGON_PROTO_H__ */
-
diff --git a/libcli/netlogon/netlogon.h b/libcli/netlogon/netlogon.h
index d9589f8ce2..a68c7fab82 100644
--- a/libcli/netlogon/netlogon.h
+++ b/libcli/netlogon/netlogon.h
@@ -49,5 +49,4 @@ struct nbt_netlogon_response
 };
 
 #include "../libcli/netlogon/netlogon_proto.h"
-#include "../libcli/netlogon/ndr_netlogon_proto.h"
 #endif /* __CLDAP_SERVER_PROTO_H__ */
diff --git a/libcli/netlogon/wscript_build b/libcli/netlogon/wscript_build
index 35fb4c71c8..ad37c0c325 100644
--- a/libcli/netlogon/wscript_build
+++ b/libcli/netlogon/wscript_build
@@ -1,11 +1,6 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
-	source='ndr_netlogon.c',
-	public_deps='ndr NDR_SECURITY NDR_NBT'
-	)
-
 bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
 	source='netlogon.c',
-	public_deps='samba-util LIBCLI_NDR_NETLOGON'
+	public_deps='samba-util NDR_NBT'
 	)
diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index 227e0a46a4..cd81081267 100644
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -10,7 +10,7 @@
 
 import "misc.idl", "security.idl";
 [
-	helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"),
+	helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h", "../librpc/ndr/ndr_nbt.h"),
 	helpstring("NBT messages"),
 	uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
 ]
diff --git a/libcli/netlogon/ndr_netlogon.c b/librpc/ndr/ndr_nbt.c
index cab159f3a3..cab159f3a3 100644
--- a/libcli/netlogon/ndr_netlogon.c
+++ b/librpc/ndr/ndr_nbt.c
diff --git a/librpc/ndr/ndr_nbt.h b/librpc/ndr/ndr_nbt.h
new file mode 100644
index 0000000000..69863f0209
--- /dev/null
+++ b/librpc/ndr/ndr_nbt.h
@@ -0,0 +1,32 @@
+#/*
+   Unix SMB/CIFS implementation.
+
+   CLDAP server structures
+
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2008
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* The following definitions come from ../librpc/ndr/ndr_nbt.c  */
+
+#ifndef _LIBRPC_NDR_NDR_NBT_H
+#define _LIBRPC_NDR_NDR_NBT_H
+
+enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_REQUEST *r);
+enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int ndr_flags, struct NETLOGON_SAM_LOGON_REQUEST *r);
+enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_RESPONSE_EX *r);
+enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_pull *ndr, int ndr_flags, struct NETLOGON_SAM_LOGON_RESPONSE_EX *r,
+								     uint32_t nt_version_flags);
+#endif /* _LIBRPC_NDR_NDR_NBT_H */
diff --git a/librpc/wscript_build b/librpc/wscript_build
index dc35de5ecc..e6fde1558f 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -335,8 +335,8 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_NBT',
-	source='gen_ndr/ndr_nbt.c',
-	public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard LIBCLI_NDR_NETLOGON',
+	source='gen_ndr/ndr_nbt.c ndr/ndr_nbt.c',
+	public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard',
 	public_headers='gen_ndr/nbt.h',
         header_path='gen_ndr'
 	)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1453434730..66530c770b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -532,8 +532,8 @@ SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o passdb/machine_s
 
 LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
 	     ../libcli/netlogon/netlogon.o \
-	     ../libcli/netlogon/ndr_netlogon.o \
 	     librpc/gen_ndr/ndr_nbt.o \
+	     ../librpc/ndr/ndr_nbt.o \
 	     librpc/gen_ndr/ndr_svcctl.o \
 	     ../librpc/ndr/ndr_svcctl.o
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 7988bd1dca..54c7075fe5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -975,7 +975,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
 
 bld.SAMBA3_SUBSYSTEM('LIBNBT',
                     source='',
-                    deps='NDR_SVCCTL NDR_NBT LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
+                    deps='NDR_SVCCTL NDR_NBT LIBCLI_NETLOGON',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',