diff options
92 files changed, 146 insertions, 17 deletions
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 3ed5c9907e..0328d0dfea 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -25,6 +25,7 @@ #include "auth/auth.h" #include "lib/events/events.h" #include "build.h" +#include "librpc/rpc/dcerpc.h" /* the list of currently registered GENSEC backends */ static struct gensec_security_ops **generic_security_ops; diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 8d1cef1cbd..c08b96083c 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -29,6 +29,7 @@ #include "auth/auth.h" #include "lib/ldb/include/ldb.h" #include "auth/auth_sam.h" +#include "librpc/rpc/dcerpc.h" enum gensec_gssapi_sasl_state { diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 48f748cb19..9f5d38a01b 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -33,6 +33,7 @@ #include "auth/auth_sam.h" #include "system/network.h" #include "lib/socket/socket.h" +#include "librpc/rpc/dcerpc.h" enum GENSEC_KRB5_STATE { GENSEC_KRB5_SERVER_START, diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c index 8c9b1d8acc..983b76eafc 100644 --- a/source4/auth/gensec/schannel.c +++ b/source4/auth/gensec/schannel.c @@ -27,6 +27,7 @@ #include "auth/gensec/schannel.h" #include "auth/gensec/schannel_state.h" #include "auth/gensec/schannel_proto.h" +#include "librpc/rpc/dcerpc.h" static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size) { diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c index 9d97e3d709..6ede774cc8 100644 --- a/source4/auth/gensec/spnego.c +++ b/source4/auth/gensec/spnego.c @@ -25,6 +25,7 @@ #include "includes.h" #include "auth/auth.h" #include "auth/gensec/spnego_proto.h" +#include "librpc/gen_ndr/ndr_dcerpc.h" enum spnego_state_position { SPNEGO_SERVER_START, diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c index fbca803d3b..dfef892976 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -26,6 +26,7 @@ #include "auth/auth.h" #include "auth/ntlmssp/ntlmssp.h" #include "auth/ntlmssp/msrpc_parse.h" +#include "librpc/gen_ndr/ndr_dcerpc.h" /** * Callbacks for NTLMSSP - for both client and server operating modes diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index d2a9390a60..e29cdfe505 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -26,6 +26,7 @@ #include "lib/socket/socket.h" #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" +#include "librpc/gen_ndr/ndr_misc.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "db_wrap.h" diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 8ccab1df3d..2f27dc6aee 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -33,6 +33,7 @@ #include "auth/auth.h" #include "db_wrap.h" #include "dsdb/samdb/samdb.h" +#include "librpc/gen_ndr/ndr_security.h" static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx, struct smb_krb5_context *smb_krb5_context, diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index ea6c124699..292307f423 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -26,6 +26,7 @@ struct auth_session_info; struct drsuapi_DsNameInfo1; +#include "librpc/gen_ndr/security.h" #include "lib/ldb/include/ldb.h" #include "dsdb/samdb/samdb_proto.h" diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c index 3f818dae76..f5830cc8d7 100644 --- a/source4/gtk/common/gtk-smb.c +++ b/source4/gtk/common/gtk-smb.c @@ -23,6 +23,8 @@ #include "gtk/common/gtk-smb.h" #include "gtk/common/select.h" #include "version.h" +#include "librpc/rpc/dcerpc.h" +#include "auth/credentials/credentials.h" void gtk_show_werror(GtkWidget *win, const char *message, WERROR err) { diff --git a/source4/gtk/common/gtk-smb.h b/source4/gtk/common/gtk-smb.h index 98916d19ec..16dbfaf5d6 100644 --- a/source4/gtk/common/gtk-smb.h +++ b/source4/gtk/common/gtk-smb.h @@ -71,6 +71,7 @@ int gtk_event_loop(void); struct event_context; struct event_context *gtk_event_context(void); +struct cli_credentials; void cli_credentials_set_gtk_callbacks(struct cli_credentials *creds); #endif diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c index 6a05b5ef0c..76c7dfa08a 100644 --- a/source4/gtk/tools/gregedit.c +++ b/source4/gtk/tools/gregedit.c @@ -21,8 +21,9 @@ #include "includes.h" #include "lib/registry/registry.h" -#include "lib/registry/reg_backend_rpc.h" #include "gtk/common/gtk-smb.h" +#include "lib/events/events.h" +#include "lib/registry/reg_backend_rpc.h" #include "auth/credentials/credentials.h" static GtkTreeStore *store_keys; diff --git a/source4/include/includes.h b/source4/include/includes.h index 22dc922d1b..b87e6acff7 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -106,9 +106,9 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE; #include "param/param.h" #include "libcli/util/nterr.h" #include "libcli/util/doserr.h" -#include "librpc/ndr/libndr.h" -#include "librpc/rpc/dcerpc.h" -#include "libcli/nbt/libnbt.h" +#include "librpc/gen_ndr/misc.h" + +struct smbcli_tree; #include "libcli/util/proto.h" /* String routines */ diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h index df6c5889e6..f0d2479a25 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc.h @@ -28,6 +28,7 @@ #include "kdc/pac-glue.h" struct kdc_server; +struct socket_address; NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, krb5_context context, struct HDB **db, const char *arg); diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h index 438bf8b9f7..65a4d0f6e9 100644 --- a/source4/lib/com/dcom/dcom.h +++ b/source4/lib/com/dcom/dcom.h @@ -21,6 +21,9 @@ #ifndef _DCOM_H /* _DCOM_H */ #define _DCOM_H +struct cli_credentials; +struct dcerpc_pipe; + #include "lib/com/com.h" #include "librpc/gen_ndr/orpc.h" #include "lib/com/dcom/proto.h" diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c index 661f5d0b37..d9989ecdbe 100644 --- a/source4/lib/com/tables.c +++ b/source4/lib/com/tables.c @@ -21,6 +21,7 @@ #include "includes.h" #include "dlinklist.h" #include "lib/com/com.h" +#include "librpc/gen_ndr/ndr_misc.h" /* Specific implementation of one or more interfaces */ struct com_class diff --git a/source4/lib/db_wrap.h b/source4/lib/db_wrap.h index 2d7a7b7244..cf60494b92 100644 --- a/source4/lib/db_wrap.h +++ b/source4/lib/db_wrap.h @@ -31,5 +31,6 @@ struct tdb_wrap { struct auth_session_info; struct ldb_message; struct ldb_dn; +struct cli_credentials; #include "db_wrap_proto.h" diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h index 3570229715..8c1b7cda21 100644 --- a/source4/lib/events/events.h +++ b/source4/lib/events/events.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __EVENTS_H__ +#define __EVENTS_H__ + struct event_context; struct event_ops; struct fd_event; @@ -64,3 +67,5 @@ struct event_context *event_context_find(TALLOC_CTX *mem_ctx); event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE) #define EVENT_FD_NOT_READABLE(fde) \ event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ) + +#endif /* __EVENTS_H__ */ diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 8432eadf5e..5680060ee4 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -31,6 +31,7 @@ #include "db_wrap.h" #include "lib/tdb/include/tdbutil.h" #include "util/unix_privs.h" +#include "librpc/rpc/dcerpc.h" /* change the message version with any incompatible changes in the protocol */ #define MESSAGING_VERSION 1 diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index 7f57a9244d..efe22573c2 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -22,6 +22,9 @@ #ifndef _REGISTRY_H /* _REGISTRY_H */ #define _REGISTRY_H +#include "librpc/gen_ndr/security.h" +#include "auth/credentials/credentials.h" + /* Handles for the predefined keys */ #define HKEY_CLASSES_ROOT 0x80000000 #define HKEY_CURRENT_USER 0x80000001 diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c index f1c5db1598..ae617bbe84 100644 --- a/source4/lib/registry/tools/regdiff.c +++ b/source4/lib/registry/tools/regdiff.c @@ -21,6 +21,7 @@ #include "includes.h" #include "lib/registry/registry.h" +#include "lib/events/events.h" #include "lib/registry/reg_backend_rpc.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c index 713d4b32cc..9392e66192 100644 --- a/source4/lib/registry/tools/regpatch.c +++ b/source4/lib/registry/tools/regpatch.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "lib/events/events.h" #include "lib/registry/registry.h" #include "lib/cmdline/popt_common.h" #include "lib/registry/reg_backend_rpc.h" diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index c0bffa78e5..0812cad73f 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -22,6 +22,7 @@ #include "includes.h" #include "lib/registry/registry.h" #include "lib/cmdline/popt_common.h" +#include "lib/events/events.h" #include "lib/registry/reg_backend_rpc.h" #include "system/time.h" #include "lib/replace/readline.h" diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index ccdb24a4cc..a4fb69f073 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -21,6 +21,7 @@ #include "includes.h" #include "lib/registry/registry.h" +#include "lib/events/events.h" #include "lib/registry/reg_backend_rpc.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index f3e3ba8341..a50fb87619 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -21,6 +21,8 @@ #ifndef _SAMBA_SOCKET_H #define _SAMBA_SOCKET_H +#include "lib/events/events.h" + struct socket_context; enum socket_type { diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index c8d6cd136a..9a745e3013 100644 --- a/source4/libcli/composite/composite.c +++ b/source4/libcli/composite/composite.c @@ -26,6 +26,8 @@ #include "libcli/raw/libcliraw.h" #include "libcli/composite/composite.h" #include "lib/messaging/irpc.h" +#include "librpc/rpc/dcerpc.h" +#include "libcli/nbt/libnbt.h" /* block until a composite function has completed, then return the status diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h index 6210b2b227..dc04f5a883 100644 --- a/source4/libcli/composite/composite.h +++ b/source4/libcli/composite/composite.h @@ -63,5 +63,7 @@ struct composite_context { struct irpc_request; struct smbcli_request; +struct rpc_request; +struct nbt_name_request; #include "libcli/composite/proto.h" diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 465146ec17..dbeae51807 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -80,7 +80,7 @@ OBJ_FILES = \ REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS [SUBSYSTEM::LIBCLI_RESOLVE] -PRIVATE_PROTO_HEADER = resolve/resolve.h +PRIVATE_PROTO_HEADER = resolve/proto.h OBJ_FILES = \ resolve/resolve.o \ resolve/nbtlist.o \ diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h index 1deabf0b10..ba0f801832 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/ldap.h @@ -247,6 +247,10 @@ struct ldap_message { struct ldb_control **controls; }; +struct event_context; +struct cli_credentials; +struct dom_sid; + #include "libcli/ldap/ldap_proto.h" #endif diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index 21d0b0dcdb..2b856aa52b 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -31,6 +31,8 @@ struct smbcli_request; /* forward declare */ struct smbcli_session; /* forward declare */ struct smbcli_transport; /* forward declare */ +struct cli_credentials; + /* default timeout for all smb requests */ #define SMB_REQUEST_TIMEOUT 60 diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index 7188faba7b..a8ca2ced8b 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -29,6 +29,7 @@ #include "system/network.h" #include "netif/netif.h" #include "librpc/gen_ndr/ndr_nbt.h" +#include "libcli/nbt/libnbt.h" struct nbtlist_state { struct nbt_name name; diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h new file mode 100644 index 0000000000..ad479bab4b --- /dev/null +++ b/source4/libcli/resolve/resolve.h @@ -0,0 +1,29 @@ +/* + Unix SMB/CIFS implementation. + + general name resolution interface + + Copyright (C) Andrew Tridgell 2005 + + 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 2 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, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef __RESOLVE_H__ +#define __RESOLVE_H__ + +#include "libcli/nbt/libnbt.h" +#include "libcli/resolve/proto.h" + +#endif /* __RESOLVE_H__ */ diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c index f11033ae4f..6478710682 100644 --- a/source4/libcli/resolve/wins.c +++ b/source4/libcli/resolve/wins.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "libcli/nbt/libnbt.h" #include "libcli/resolve/resolve.h" /* diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c index 9d565363e6..1617963998 100644 --- a/source4/libcli/security/access_check.c +++ b/source4/libcli/security/access_check.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/security.h" #include "libcli/security/proto.h" diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c index b5ced9fcc2..131d1afa9c 100644 --- a/source4/libcli/security/dom_sid.c +++ b/source4/libcli/security/dom_sid.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/security.h" /***************************************************************** Compare the auth portion of two sids. diff --git a/source4/libcli/security/privilege.c b/source4/libcli/security/privilege.c index fec8c1278c..202a418f6b 100644 --- a/source4/libcli/security/privilege.c +++ b/source4/libcli/security/privilege.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/security.h" static const struct { diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c index 862a25e20d..38192fc60c 100644 --- a/source4/libcli/security/sddl.c +++ b/source4/libcli/security/sddl.c @@ -22,8 +22,8 @@ #include "includes.h" #include "system/iconv.h" -#include "libcli/security/proto.h" #include "librpc/gen_ndr/ndr_security.h" +#include "libcli/security/proto.h" struct flag_map { const char *name; diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c index 20cdeb0ba7..1da3e2e750 100644 --- a/source4/libcli/security/security_descriptor.c +++ b/source4/libcli/security/security_descriptor.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/security.h" #include "libcli/security/proto.h" /* diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index af1730aeee..b6f8fdef71 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -363,4 +363,6 @@ struct smb2_flush { } in; }; +struct cli_credentials; +struct event_context; #include "libcli/smb2/smb2_proto.h" diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 4f75d784f6..5985a4864f 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -32,6 +32,7 @@ #include "db_wrap.h" #include "libcli/security/proto.h" #include "librpc/gen_ndr/ndr_security.h" +#include "librpc/rpc/dcerpc.h" struct samsync_ldb_secret { struct samsync_ldb_secret *prev, *next; diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c index 75efc0562d..444a9ba485 100644 --- a/source4/libnet/libnet_site.c +++ b/source4/libnet/libnet_site.c @@ -23,6 +23,7 @@ #include "libcli/cldap/cldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" +#include "librpc/rpc/dcerpc.h" /* * 1. Setup a CLDAP socket. diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 8f229c04e1..5c5407df3e 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -24,6 +24,7 @@ #include "includes.h" #include "libnet/libnet.h" #include "libcli/auth/libcli_auth.h" +#include "auth/gensec/gensec.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/userinfo.c b/source4/libnet/userinfo.c index 5fcdd614e2..444a188457 100644 --- a/source4/libnet/userinfo.c +++ b/source4/libnet/userinfo.c @@ -24,6 +24,7 @@ #include "includes.h" #include "libcli/composite/composite.h" +#include "librpc/gen_ndr/security.h" #include "libcli/security/proto.h" #include "libnet/composite.h" #include "libnet/userinfo.h" diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 1f626df13b..68252fbc72 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -28,7 +28,9 @@ */ #include "includes.h" +#include "librpc/ndr/libndr.h" #include "dlinklist.h" +#include "librpc/gen_ndr/dcerpc.h" #define NDR_BASE_MARSHALL_SIZE 1024 diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 780931efb1..4b0444f00b 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/network.h" +#include "librpc/ndr/libndr.h" #define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs)) #define NDR_IVAL(ndr, ofs) (NDR_BE(ndr)?RIVAL(ndr->data,ofs):IVAL(ndr->data,ofs)) diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c index fb04a1799a..fabfd73704 100644 --- a/source4/librpc/ndr/ndr_compression.c +++ b/source4/librpc/ndr/ndr_compression.c @@ -22,6 +22,7 @@ #include "includes.h" #include "lib/compression/mszip.h" +#include "librpc/ndr/libndr.h" static NTSTATUS ndr_pull_compression_mszip_chunk(struct ndr_pull *ndrpull, struct ndr_push *ndrpush, diff --git a/source4/librpc/ndr/ndr_misc.c b/source4/librpc/ndr/ndr_misc.c index 5cffd33b46..8f131c471e 100644 --- a/source4/librpc/ndr/ndr_misc.c +++ b/source4/librpc/ndr/ndr_misc.c @@ -25,6 +25,7 @@ #include "includes.h" #include "system/network.h" +#include "librpc/ndr/libndr.h" _PUBLIC_ void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct ipv4_addr *_ip) { diff --git a/source4/librpc/ndr/ndr_obfuscate.c b/source4/librpc/ndr/ndr_obfuscate.c index 3b10e172b7..242b6dc074 100644 --- a/source4/librpc/ndr/ndr_obfuscate.c +++ b/source4/librpc/ndr/ndr_obfuscate.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/ndr/libndr.h" /* handle obfuscated subcontext buffers, which in midl land are user-marshalled, but diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index 164c6d4a03..84c08b9656 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/ndr/libndr.h" /** pull a general string from the wire diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 796511ef00..16721b4b03 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -24,8 +24,9 @@ #include "includes.h" #include "dlinklist.h" #include "lib/events/events.h" -#include "librpc/gen_ndr/ndr_dcerpc.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_dcerpc.h" #include "libcli/composite/composite.h" #include "auth/gensec/gensec.h" diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 24f8df7d8b..7fcaa9d922 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -26,6 +26,7 @@ #include "core.h" #include "librpc/gen_ndr/dcerpc.h" +#include "librpc/ndr/libndr.h" enum dcerpc_transport_t { NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c index 4f11667365..88132b15fe 100644 --- a/source4/librpc/rpc/dcerpc_auth.c +++ b/source4/librpc/rpc/dcerpc_auth.c @@ -25,6 +25,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "auth/gensec/gensec.h" +#include "librpc/rpc/dcerpc.h" /* do a non-athenticated dcerpc bind diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 6e0fc0c743..2b40935be6 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -31,6 +31,7 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" #include "auth/credentials/credentials.h" +#include "librpc/rpc/dcerpc.h" struct dcerpc_pipe_connect; diff --git a/source4/librpc/rpc/dcerpc_error.c b/source4/librpc/rpc/dcerpc_error.c index d5a456c221..1b77c2d9d3 100644 --- a/source4/librpc/rpc/dcerpc_error.c +++ b/source4/librpc/rpc/dcerpc_error.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "librpc/rpc/dcerpc.h" struct dcerpc_fault_table { const char *errstr; diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 6700e2f243..e16142d5c2 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -24,6 +24,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "libcli/composite/composite.h" +#include "librpc/rpc/dcerpc.h" /* transport private information used by SMB pipe transport */ struct smb_private { diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c index d22ef6a9f2..01fd783e6f 100644 --- a/source4/librpc/rpc/dcerpc_smb2.c +++ b/source4/librpc/rpc/dcerpc_smb2.c @@ -26,6 +26,7 @@ #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" #include "libcli/raw/ioctl.h" +#include "librpc/rpc/dcerpc.h" /* transport private information used by SMB2 pipe transport */ struct smb2_private { diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 7b6b45d2dd..0385a70d3c 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -27,6 +27,7 @@ #include "lib/socket/socket.h" #include "lib/stream/packet.h" #include "libcli/composite/composite.h" +#include "librpc/rpc/dcerpc.h" /* transport private information used by general socket pipe transports */ struct sock_private { diff --git a/source4/librpc/rpc/table.c b/source4/librpc/rpc/table.c index 21809ccc1c..9492b2b925 100644 --- a/source4/librpc/rpc/table.c +++ b/source4/librpc/rpc/table.c @@ -23,6 +23,7 @@ #include "includes.h" #include "dlinklist.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_table.h" struct dcerpc_interface_list *dcerpc_pipes = NULL; diff --git a/source4/librpc/tables.pl b/source4/librpc/tables.pl index 9f30674de8..3dbb58853d 100644 --- a/source4/librpc/tables.pl +++ b/source4/librpc/tables.pl @@ -75,6 +75,7 @@ print TABLEC <<EOF; /* Automatically generated by tables.pl. DO NOT EDIT */ #include "includes.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_table.h" EOF diff --git a/source4/main.mk b/source4/main.mk index f3c79277ea..26bcab1039 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -234,14 +234,11 @@ lib/charset/charset.h: lib/charset/charset_proto.h include/includes.h: \ include/config.h \ - librpc/ndr/libndr.h \ - librpc/rpc/dcerpc.h \ - auth/credentials/credentials_proto.h \ - libcli/nbt/libnbt.h \ lib/util/util_proto.h \ lib/charset/charset.h \ param/proto.h \ - libcli/util/proto.h + libcli/util/proto.h \ + librpc/gen_ndr/misc.h clean_pch: -rm -f include/includes.h.gch diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c index f683082d58..3f415c9293 100644 --- a/source4/ntvfs/ipc/ipc_rap.c +++ b/source4/ntvfs/ipc/ipc_rap.c @@ -23,6 +23,7 @@ #include "smb.h" #include "libcli/rap/rap.h" #include "ntvfs/ipc/proto.h" +#include "librpc/ndr/libndr.h" #define NERR_Success 0 #define NERR_badpass 86 diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 13147d5c19..cfb5515203 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -265,5 +265,5 @@ struct ntvfs_critical_sizes { }; struct messaging_context; - +#include "librpc/gen_ndr/security.h" #include "ntvfs/ntvfs_proto.h" diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm index d5e1405c30..e24fb54b96 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm @@ -797,6 +797,7 @@ sub Parse($$) pidl " /* EJS wrapper functions auto-generated by pidl */ #include \"includes.h\" +#include \"librpc/rpc/dcerpc.h\" #include \"lib/appweb/ejs/ejs.h\" #include \"scripting/ejs/ejsrpc.h\" #include \"scripting/ejs/smbcalls.h\" diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 9ee553b928..f2b92c346a 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -26,7 +26,7 @@ #include "core.h" #include "librpc/gen_ndr/misc.h" -#include "librpc/gen_ndr/dcerpc.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/ndr/libndr.h" /* modules can use the following to determine if the interface has changed diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h index 80674fc43b..a320392201 100644 --- a/source4/scripting/ejs/ejsrpc.h +++ b/source4/scripting/ejs/ejsrpc.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "librpc/gen_ndr/security.h" +#include "librpc/rpc/dcerpc.h" + struct ejs_rpc { int eid; const char *callname; diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h index 5954d2385e..5d5f6841d9 100644 --- a/source4/scripting/ejs/smbcalls.h +++ b/source4/scripting/ejs/smbcalls.h @@ -31,5 +31,6 @@ void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunct struct ldb_context; struct ldb_message; +struct cli_credentials; #include "scripting/ejs/proto.h" diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c index 043b9cca09..9920c06958 100644 --- a/source4/scripting/ejs/smbcalls_rand.c +++ b/source4/scripting/ejs/smbcalls_rand.c @@ -24,6 +24,7 @@ #include "scripting/ejs/smbcalls.h" #include "lib/appweb/ejs/ejs.h" #include "system/passwd.h" +#include "librpc/gen_ndr/ndr_misc.h" /* usage: diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c index 0d2d34a478..29346f2586 100644 --- a/source4/scripting/ejs/smbcalls_rpc.c +++ b/source4/scripting/ejs/smbcalls_rpc.c @@ -31,6 +31,7 @@ #include "lib/events/events.h" #include "librpc/rpc/dcerpc_table.h" #include "auth/credentials/credentials.h" +#include "librpc/rpc/dcerpc.h" /* state of a irpc 'connection' diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c index 29589ce074..0edee86a60 100644 --- a/source4/smb_server/smb/sesssetup.c +++ b/source4/smb_server/smb/sesssetup.c @@ -28,6 +28,7 @@ #include "auth/auth.h" #include "smb_server/smb_server.h" #include "smbd/service_stream.h" +#include "librpc/gen_ndr/nbt.h" /* setup the OS, Lanman and domain portions of a session setup reply diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c index d2bb4ad4e3..e4a18d7cbd 100644 --- a/source4/torture/com/simple.c +++ b/source4/torture/com/simple.c @@ -24,6 +24,7 @@ #include "lib/com/dcom/dcom.h" #include "librpc/gen_ndr/com_dcom.h" #include "lib/cmdline/popt_common.h" +#include "librpc/rpc/dcerpc.h" #include "torture/torture.h" #define DEFAULT_TRANS 4096 diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c index 6011d5492c..eed8541f9a 100644 --- a/source4/torture/libnet/libnet_lookup.c +++ b/source4/torture/libnet/libnet_lookup.c @@ -22,6 +22,7 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" #include "libnet/libnet.h" +#include "librpc/gen_ndr/nbt.h" BOOL torture_lookup(void) diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c index 4f9348ee4b..b3efa35b46 100644 --- a/source4/torture/libnet/libnet_rpc.c +++ b/source4/torture/libnet/libnet_rpc.c @@ -24,6 +24,7 @@ #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_samr.h" +#include "librpc/rpc/dcerpc.h" static BOOL test_lsa_connect(struct libnet_context *ctx) diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c index 12637608c6..2d180a09ef 100644 --- a/source4/torture/local/binding_string.c +++ b/source4/torture/local/binding_string.c @@ -22,6 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/epmapper.h" +#include "librpc/rpc/dcerpc.h" static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding) { diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index 4a91997817..324ee489c1 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -25,6 +25,7 @@ #include "torture/torture.h" #include "system/iconv.h" #include "system/time.h" +#include "libcli/raw/libcliraw.h" #include "torture/util.h" #if HAVE_NATIVE_ICONV diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c index d1570dda68..305f75f9c0 100644 --- a/source4/torture/local/ndr.c +++ b/source4/torture/local/ndr.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" +#include "librpc/ndr/libndr.h" BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx) { diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c index 5f956808d1..11e6ae1fd5 100644 --- a/source4/torture/local/sddl.c +++ b/source4/torture/local/sddl.c @@ -21,8 +21,8 @@ */ #include "includes.h" -#include "libcli/security/proto.h" #include "librpc/gen_ndr/ndr_security.h" +#include "libcli/security/proto.h" /* diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 78edf21820..bdc2d0d764 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -25,6 +25,7 @@ #include "libcli/rap/rap.h" #include "libcli/raw/libcliraw.h" #include "libcli/libcli.h" +#include "librpc/ndr/libndr.h" struct rap_call { uint16_t callno; diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 237136c3f7..53b21c2829 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -28,6 +28,7 @@ #include "libcli/security/proto.h" #include "libcli/composite/composite.h" #include "libcli/smb_composite/smb_composite.h" +#include "librpc/gen_ndr/ndr_misc.h" #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/security.h" #include "torture/util.h" diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c index 62cfcf758d..5333dddd3e 100644 --- a/source4/torture/rpc/alter_context.c +++ b/source4/torture/rpc/alter_context.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_dssetup.h" +#include "librpc/rpc/dcerpc.h" #include "torture/rpc/rpc.h" BOOL torture_rpc_alter_context(void) diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index 2a6cb53979..a9ea255a02 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -25,6 +25,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "lib/cmdline/popt_common.h" +#include "librpc/rpc/dcerpc.h" #include "torture/rpc/rpc.h" /* diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c index 8ad5241ada..1290b53dc6 100644 --- a/source4/torture/rpc/countcalls.c +++ b/source4/torture/rpc/countcalls.c @@ -22,6 +22,7 @@ #include "includes.h" #include "torture/torture.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_table.h" #include "torture/rpc/rpc.h" diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c index eb0efc906b..0dc3c38916 100644 --- a/source4/torture/rpc/lsa_lookup.c +++ b/source4/torture/rpc/lsa_lookup.c @@ -22,11 +22,11 @@ #include "includes.h" #include "torture/torture.h" #include "lib/events/events.h" -#include "libcli/security/proto.h" #include "libnet/libnet_join.h" #include "torture/rpc/rpc.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "librpc/gen_ndr/ndr_security.h" +#include "libcli/security/proto.h" static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p, struct policy_handle **handle) diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index be3ce283cc..34bd05e008 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -22,6 +22,7 @@ #include "includes.h" #include "auth/credentials/credentials.h" #include "lib/cmdline/popt_common.h" +#include "librpc/rpc/dcerpc.h" #include "torture/rpc/rpc.h" #include "torture/torture.h" #include "librpc/rpc/dcerpc_table.h" diff --git a/source4/torture/rpc/rpc.h b/source4/torture/rpc/rpc.h index e851287218..78d0860f23 100644 --- a/source4/torture/rpc/rpc.h +++ b/source4/torture/rpc/rpc.h @@ -25,6 +25,7 @@ #include "auth/credentials/credentials.h" #include "torture/rpc/drsuapi.h" #include "libnet/libnet_join.h" +#include "librpc/rpc/dcerpc.h" #include "torture/rpc/proto.h" #endif /* __TORTURE_RPC_H__ */ diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index 7472493894..10b7046375 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -22,9 +22,9 @@ #include "includes.h" #include "smb.h" +#include "librpc/gen_ndr/security.h" #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" - #include "torture/smb2/proto.h" /* diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index e7079293f7..c2f4f84fac 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -37,6 +37,7 @@ #include "torture/torture.h" #include "build.h" #include "dlinklist.h" +#include "librpc/rpc/dcerpc.h" #define MAX_COLS 80 /* FIXME: Determine this at run-time */ diff --git a/source4/torture/torture.c b/source4/torture/torture.c index a663a03beb..47b031f677 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -35,6 +35,7 @@ #include "librpc/gen_ndr/ndr_nbt.h" #include "torture/raw/proto.h" +#include "libcli/smb2/smb2.h" #include "torture/smb2/proto.h" #include "torture/rap/proto.h" #include "torture/auth/proto.h" diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c index 3c3e7f733b..b923209ed8 100644 --- a/source4/utils/ndrdump.c +++ b/source4/utils/ndrdump.c @@ -22,6 +22,7 @@ #include "lib/cmdline/popt_common.h" #include "system/iconv.h" #include "system/filesys.h" +#include "librpc/rpc/dcerpc.h" #include "librpc/rpc/dcerpc_table.h" static const struct dcerpc_interface_call *find_function( diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c index 303449c742..a6015f7c34 100644 --- a/source4/utils/net/net.c +++ b/source4/utils/net/net.c @@ -45,6 +45,7 @@ #include "utils/net/net.h" #include "lib/cmdline/popt_common.h" #include "lib/ldb/include/ldb.h" +#include "librpc/rpc/dcerpc.h" /* run a function from a function table. If not found then diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 938fb02966..400201f083 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -28,6 +28,8 @@ #include "lib/socket/socket.h" #include "system/network.h" #include "netif/netif.h" +#include "librpc/gen_ndr/nbt.h" +#include "libcli/nbt/libnbt.h" /* command line options */ static struct { diff --git a/source4/winbind/wb_cmd_userdomgroups.c b/source4/winbind/wb_cmd_userdomgroups.c index b118f9c9c5..65c7093455 100644 --- a/source4/winbind/wb_cmd_userdomgroups.c +++ b/source4/winbind/wb_cmd_userdomgroups.c @@ -22,6 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" +#include "librpc/gen_ndr/security.h" #include "libcli/security/proto.h" #include "winbind/wb_server.h" #include "winbind/wb_helper.h" diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h index c8dfcc64bd..d244887602 100644 --- a/source4/wrepl_server/wrepl_server.h +++ b/source4/wrepl_server/wrepl_server.h @@ -310,5 +310,6 @@ struct wreplsrv_service { } scavenging; }; +struct socket_context; #include "wrepl_server/wrepl_out_helpers.h" #include "wrepl_server/wrepl_server_proto.h" |