From 8528016978b084213ef53d66e1b6e831b1a01acc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 16 Mar 2006 00:23:11 +0000 Subject: r14464: Don't include ndr_BASENAME.h files unless strictly required, instead try to include just the BASENAME.h files (containing only structs) (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd) --- source4/libnet/composite.h | 2 +- source4/libnet/libnet_join.c | 2 ++ source4/libnet/libnet_join.h | 2 +- source4/libnet/libnet_passwd.c | 1 + source4/libnet/libnet_rpc.c | 1 + source4/libnet/libnet_samdump.c | 1 + source4/libnet/libnet_samsync_ldb.c | 1 + source4/libnet/libnet_share.c | 1 + source4/libnet/libnet_share.h | 2 +- source4/libnet/libnet_time.c | 1 + source4/libnet/libnet_user.c | 1 + source4/libnet/libnet_vampire.c | 1 + source4/libnet/libnet_vampire.h | 2 +- 13 files changed, 14 insertions(+), 4 deletions(-) (limited to 'source4/libnet') diff --git a/source4/libnet/composite.h b/source4/libnet/composite.h index 515db2a792..916e306124 100644 --- a/source4/libnet/composite.h +++ b/source4/libnet/composite.h @@ -22,7 +22,7 @@ composite function io definitions */ -#include "librpc/gen_ndr/ndr_samr.h" +#include "librpc/gen_ndr/samr.h" /* * Monitor structure and message types definitions. Composite function monitoring diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 3b0d861e01..a517aa3733 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -31,7 +31,9 @@ #include "db_wrap.h" #include "libcli/security/proto.h" #include "auth/credentials/credentials.h" +#include "librpc/gen_ndr/ndr_samr.h" #include "librpc/gen_ndr/ndr_samr_c.h" +#include "librpc/gen_ndr/ndr_security.h" /* * complete a domain join, when joining to a AD domain: diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h index 3b233950b0..aa0b244f6d 100644 --- a/source4/libnet/libnet_join.h +++ b/source4/libnet/libnet_join.h @@ -23,7 +23,7 @@ #ifndef __LIBNET_JOIN_H__ #define __LIBNET_JOIN_H__ -#include "librpc/gen_ndr/ndr_netlogon.h" +#include "librpc/gen_ndr/netlogon.h" enum libnet_Join_level { LIBNET_JOIN_AUTOMATIC, diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index e5059c5f08..c8c80db183 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -24,6 +24,7 @@ #include "libnet/libnet.h" #include "lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" +#include "librpc/gen_ndr/ndr_samr.h" #include "librpc/gen_ndr/ndr_samr_c.h" /* diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c index 3e9f069fb5..b9d493fdf8 100644 --- a/source4/libnet/libnet_rpc.c +++ b/source4/libnet/libnet_rpc.c @@ -22,6 +22,7 @@ #include "includes.h" #include "libnet/libnet.h" #include "libcli/libcli.h" +#include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_lsa_c.h" /** diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c index 8936d6829a..0f97263b47 100644 --- a/source4/libnet/libnet_samdump.c +++ b/source4/libnet/libnet_samdump.c @@ -25,6 +25,7 @@ #include "libnet/libnet.h" #include "dlinklist.h" #include "samba3/samba3.h" +#include "librpc/gen_ndr/ndr_security.h" struct samdump_secret { diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 8cc0cada83..4f75d784f6 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -31,6 +31,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "db_wrap.h" #include "libcli/security/proto.h" +#include "librpc/gen_ndr/ndr_security.h" struct samsync_ldb_secret { struct samsync_ldb_secret *prev, *next; diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c index 35980fdcbb..08a5b599e2 100644 --- a/source4/libnet/libnet_share.c +++ b/source4/libnet/libnet_share.c @@ -20,6 +20,7 @@ #include "includes.h" #include "libnet/libnet.h" +#include "librpc/gen_ndr/ndr_srvsvc.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" diff --git a/source4/libnet/libnet_share.h b/source4/libnet/libnet_share.h index efe5474271..fdf162a066 100644 --- a/source4/libnet/libnet_share.h +++ b/source4/libnet/libnet_share.h @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "librpc/gen_ndr/ndr_srvsvc.h" +#include "librpc/gen_ndr/srvsvc.h" enum libnet_ListShares_level { LIBNET_LIST_SHARES_GENERIC, diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c index d1d8298e3c..211cbc9e7f 100644 --- a/source4/libnet/libnet_time.c +++ b/source4/libnet/libnet_time.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libnet/libnet.h" #include "system/time.h" +#include "librpc/gen_ndr/ndr_srvsvc.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" /* diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c index ba9fd0cc83..1fca102d17 100644 --- a/source4/libnet/libnet_user.c +++ b/source4/libnet/libnet_user.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libnet/libnet.h" +#include "librpc/gen_ndr/ndr_samr.h" NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_CreateUser *r) diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 352dde27e6..8f229c04e1 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -25,6 +25,7 @@ #include "libnet/libnet.h" #include "libcli/auth/libcli_auth.h" #include "auth/gensec/schannel_proto.h" +#include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" diff --git a/source4/libnet/libnet_vampire.h b/source4/libnet/libnet_vampire.h index fcd93c3654..a3735d1848 100644 --- a/source4/libnet/libnet_vampire.h +++ b/source4/libnet/libnet_vampire.h @@ -18,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "librpc/gen_ndr/ndr_netlogon.h" +#include "librpc/gen_ndr/netlogon.h" struct libnet_SamSync_state { struct libnet_context *machine_net_ctx; -- cgit