diff options
57 files changed, 189 insertions, 175 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index db683fda79..0eff955c71 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -23,8 +23,8 @@ #include "includes.h" #include "system/time.h" #include "auth/auth.h" -#include "dsdb/samdb/samdb.h" #include "db_wrap.h" +#include "dsdb/samdb/samdb.h" #include "libcli/security/proto.h" #include "libcli/ldap/ldap.h" diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c index 86f1573340..fede2a278a 100644 --- a/source4/auth/auth_util.c +++ b/source4/auth/auth_util.c @@ -25,7 +25,7 @@ #include "includes.h" #include "auth/auth.h" #include "libcli/security/proto.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /* this default function can be used by mostly all backends * which don't want to set a challlenge diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c index 4162c2a10a..01a00c3dfc 100644 --- a/source4/auth/credentials/credentials.c +++ b/source4/auth/credentials/credentials.c @@ -25,7 +25,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */ #include "auth/gensec/gensec.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /** * Create a new credentials structure diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c index 768ed9bb3f..67c73d2230 100644 --- a/source4/auth/credentials/credentials_ntlm.c +++ b/source4/auth/credentials/credentials_ntlm.c @@ -25,8 +25,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */ #include "lib/crypto/crypto.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, const char **username, diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 580b7a7be1..a1f5dc118a 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -27,6 +27,7 @@ #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "auth/auth.h" +#include "ldb.h" #include "auth/auth_sam.h" enum gensec_gssapi_sasl_state diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 200822655d..030c6f04f8 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -29,6 +29,7 @@ #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "auth/auth.h" +#include "ldb.h" #include "auth/auth_sam.h" #include "system/network.h" #include "lib/socket/socket.h" diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index d8f6155620..97505357be 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -23,6 +23,9 @@ #include "auth/credentials/credentials.h" #include "auth/kerberos/krb5_init_context.h" +#include "librpc/gen_ndr/krb5pac.h" + +struct auth_serversupplied_info; struct ccache_container { struct smb_krb5_context *smb_krb5_context; diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c index cea6eeafc1..61edcade34 100644 --- a/source4/auth/ntlm_check.c +++ b/source4/auth/ntlm_check.c @@ -23,8 +23,7 @@ #include "includes.h" #include "lib/crypto/crypto.h" #include "librpc/gen_ndr/ndr_netlogon.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /**************************************************************************** Core of smb password checking routine. diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index 721d05149e..13d89c2db6 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -185,4 +185,5 @@ struct gensec_ntlmssp_state struct auth_serversupplied_info *server_info; }; +struct auth_session_info; #include "auth/ntlmssp/proto.h" diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index acb17330fb..79f62349a6 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -27,7 +27,7 @@ #include "auth/ntlmssp/ntlmssp.h" #include "auth/ntlmssp/msrpc_parse.h" #include "lib/crypto/crypto.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /********************************************************************* Client side NTLMSSP diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 0598ff8f1d..44f7fa8b8c 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -29,7 +29,7 @@ #include "lib/crypto/crypto.h" #include "pstring.h" #include "system/filesys.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /** * Set a username on an NTLMSSP context - ensures it is talloc()ed diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index b1a00cc387..ba8da697e8 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -5,7 +5,7 @@ include samdb/ldb_modules/config.mk ################################################ # Start SUBSYSTEM SAMDB [SUBSYSTEM::SAMDB] -PRIVATE_PROTO_HEADER = samdb/samdb.h +PRIVATE_PROTO_HEADER = samdb/samdb_proto.h REQUIRED_SUBSYSTEMS = DB_WRAP LIBCLI_LDAP OBJ_FILES = \ samdb/samdb.o \ diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 66cd3fcbe0..889995ecb5 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -28,11 +28,11 @@ #include "lib/ldb/include/ldb_errors.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "dsdb/samdb/samdb.h" #include "libcli/ldap/ldap.h" #include "libcli/security/proto.h" #include "auth/auth.h" #include "db_wrap.h" +#include "dsdb/samdb/samdb.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/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 6943a5f356..32d226b2b7 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -36,8 +36,7 @@ #include "ldb/include/ldb_private.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_samr.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" #include "system/time.h" diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h new file mode 100644 index 0000000000..886dc6afd0 --- /dev/null +++ b/source4/dsdb/samdb/samdb.h @@ -0,0 +1,32 @@ +/* + Unix SMB/CIFS implementation. + + interface functions for the sam database + + Copyright (C) Andrew Tridgell 2004 + + 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 __SAMDB_H__ +#define __SAMDB_H__ + +struct auth_session_info; +struct drsuapi_DsNameInfo1; + +#include "ldb.h" +#include "dsdb/samdb/samdb_proto.h" + +#endif /* __SAMDB_H__ */ diff --git a/source4/include/includes.h b/source4/include/includes.h index 4ff67791f9..1a2ff68359 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -122,11 +122,7 @@ enum brl_type { #include "libcli/nbt/libnbt.h" #include "libcli/util/proto.h" -#undef _PRINTF_ATTRIBUTE -#define _PRINTF_ATTRIBUTE(a1, a2) - /* String routines */ - #include "util/safe_string.h" #if 0 diff --git a/source4/include/structs.h b/source4/include/structs.h index 124d97f493..19a811da9f 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -23,143 +23,10 @@ "scope is only this definition or declaration" warning */ -struct spoolss_EnumPrinters; -struct spoolss_EnumForms; -struct spoolss_EnumJobs; -struct spoolss_EnumPrinterDrivers; -struct spoolss_EnumPorts; -struct spoolss_EnumMonitors; -struct spoolss_EnumPrintProcessors; -union spoolss_PrinterInfo; -union spoolss_JobInfo; -union spoolss_DriverInfo; -union spoolss_FormInfo; -union spoolss_PortInfo; -union spoolss_MonitorInfo; -union spoolss_PrintProcessorInfo; - -struct spoolss_GetPrinterData; -struct spoolss_SetPrinterData; - -struct spoolss_DeviceMode; - -struct drsuapi_DsNameInfo1; -struct drsuapi_DsCrackNames; -struct drsuapi_DsReplicaObjectListItem; -struct drsuapi_DsReplicaObjectListItemEx; - -struct DsPrivate; - -struct PAC_LOGON_INFO; -struct PAC_DATA; -struct PAC_BUFFER; - -struct samr_ChangePasswordUser; -struct samr_OemChangePasswordUser2; -struct samr_ChangePasswordUser3; -struct samr_ChangePasswordUser2; -struct samr_CryptPassword; -struct samr_CryptPasswordEx; -struct samr_DomInfo1; - -struct netr_Credential; -struct netr_Authenticator; -union netr_Validation; - -struct iface_struct; - -struct utimbuf; - -struct auth_serversupplied_info; -struct auth_session_info; - -struct spnego_data; -struct gensec_ntlmssp_state; - struct asn1_data; - -struct ldapsrv_call; -struct ldapsrv_connection; -struct ldap_connection; - -struct rap_NetShareEnum; -struct rap_NetServerEnum2; - struct smbsrv_tcon; struct smbsrv_connection; - -struct smbsrv_request; - -struct ntvfs_module_context; - -struct dcesrv_context; -struct dcesrv_call_state; - -struct libnet_context; -struct libnet_JoinDomain; - -struct clilist_file_info; - -struct netr_LMSessionKey; - -struct ldb_dn; -struct ldb_message; -struct ldb_context; -struct ldb_parse_tree; - -struct lsa_RightSet; - -struct irpc_request; - -struct smb_composite_loadfile; -struct smb_composite_savefile; -struct smb_composite_connect; -struct smb_composite_sesssetup; -struct smb_composite_fetchfile; -struct smb_composite_appendacl; -struct smb_composite_fsinfo; - -struct nbt_dgram_socket; -struct dgram_mailslot_handler; - -struct messaging_context; -struct stream_connection; -struct task_server; -struct stream_server_ops; - -struct nbt_dc_name; -struct wb_sid_object; - -struct cldap_socket; -struct cldapd_server; - -struct websrv_context; - -struct wbsrv_call; - -struct ldb_map_attribute; -struct ldb_map_objectclass; - struct param_context; - -struct socket_address; -struct smbcli_request; struct smbcli_tree; - struct smb2_tree; - -struct IUnknown; -struct IUnknown_vtable; - -struct MprVar; - -struct registry_context; -struct nbtd_interface; -struct smbcli_session; -struct smbcli_state; - -struct model_ops; - -struct smb_wire_string; - -union smb_fileinfo; +struct socket_address; diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 7538bc04ef..0a776d46ce 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -29,9 +29,11 @@ #include "system/network.h" #include "dlinklist.h" #include "lib/ldb/include/ldb.h" +#include "heimdal/lib/krb5/krb5_locl.h" #include "heimdal/lib/krb5/krb5-private.h" #include "auth/auth.h" #include "dsdb/samdb/samdb.h" +#include "rpc_server/dcerpc_server.h" #include "rpc_server/samr/proto.h" /* hold information about one kdc socket */ diff --git a/source4/lib/db_wrap.h b/source4/lib/db_wrap.h index 1af2cd2e2a..2d7a7b7244 100644 --- a/source4/lib/db_wrap.h +++ b/source4/lib/db_wrap.h @@ -28,4 +28,8 @@ struct tdb_wrap { struct tdb_wrap *next, *prev; }; +struct auth_session_info; +struct ldb_message; +struct ldb_dn; + #include "db_wrap_proto.h" diff --git a/source4/libcli/auth/libcli_auth.h b/source4/libcli/auth/libcli_auth.h new file mode 100644 index 0000000000..f8f07e8337 --- /dev/null +++ b/source4/libcli/auth/libcli_auth.h @@ -0,0 +1,25 @@ +/* + samba -- Unix SMB/CIFS implementation. + + 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 __LIBCLI_AUTH_H__ +#define __LIBCLI_AUTH_H__ + +#include "librpc/gen_ndr/netlogon.h" +#include "auth/credentials/credentials.h" +#include "libcli/auth/proto.h" + +#endif /* __LIBCLI_AUTH_H__ */ diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index 587fb98920..24fdeff33f 100644 --- a/source4/libcli/auth/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c @@ -28,8 +28,7 @@ #include "auth/ntlmssp/ntlmssp.h" #include "auth/ntlmssp/msrpc_parse.h" #include "lib/crypto/crypto.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "pstring.h" /* diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index a718f43d96..d89d6a1568 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -24,8 +24,7 @@ #include "includes.h" #include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "libcli/smb_composite/smb_composite.h" /* diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h index d1299d77c1..6210b2b227 100644 --- a/source4/libcli/composite/composite.h +++ b/source4/libcli/composite/composite.h @@ -61,4 +61,7 @@ struct composite_context { BOOL used_wait; }; +struct irpc_request; +struct smbcli_request; + #include "libcli/composite/proto.h" diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h index 76fa13525e..c358ac5752 100644 --- a/source4/libcli/libcli.h +++ b/source4/libcli/libcli.h @@ -19,6 +19,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __LIBCLI_H__ +#define __LIBCLI_H__ + #include "smb.h" /* @@ -47,3 +50,5 @@ struct nbt_dc_name { }; #include "libcli/libcli_proto.h" + +#endif /* __LIBCLI_H__ */ diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c index a62386b672..318fc9fbed 100644 --- a/source4/libcli/smb_composite/sesssetup.c +++ b/source4/libcli/smb_composite/sesssetup.c @@ -25,8 +25,7 @@ #include "libcli/raw/libcliraw.h" #include "libcli/composite/composite.h" #include "libcli/smb_composite/smb_composite.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "auth/auth.h" #include "version.h" diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index ac34ad40ac..a7a82965e6 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -171,4 +171,6 @@ struct smb_composite_connectmulti { } out; }; +struct smbcli_session; + #include "libcli/smb_composite/proto.h" diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h index 2496eb0a54..81eb32be51 100644 --- a/source4/libnet/libnet.h +++ b/source4/libnet/libnet.h @@ -39,6 +39,7 @@ struct libnet_context { }; +#include "ldb.h" #include "libnet/libnet_passwd.h" #include "libnet/libnet_time.h" #include "libnet/libnet_rpc.h" diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h index 35460b7a0a..3b233950b0 100644 --- a/source4/libnet/libnet_join.h +++ b/source4/libnet/libnet_join.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __LIBNET_JOIN_H__ +#define __LIBNET_JOIN_H__ + #include "librpc/gen_ndr/ndr_netlogon.h" enum libnet_Join_level { @@ -76,3 +79,5 @@ struct libnet_Join { } out; }; + +#endif /* __LIBNET_JOIN_H__ */ diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index 7d738d8ee0..30012282e0 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -23,8 +23,7 @@ #include "smb.h" #include "libnet/libnet.h" #include "lib/crypto/crypto.h" -#include "auth/credentials/credentials.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" /* * do a password change using DCERPC/SAMR calls diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index e92dbc281d..93e752311f 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -23,9 +23,8 @@ #include "includes.h" #include "libnet/libnet.h" -#include "auth/credentials/credentials.h" +#include "libcli/auth/libcli_auth.h" #include "auth/gensec/schannel_proto.h" -#include "libcli/auth/proto.h" /** diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c index e868a8081c..229f359d20 100644 --- a/source4/librpc/rpc/dcerpc_schannel.c +++ b/source4/librpc/rpc/dcerpc_schannel.c @@ -25,7 +25,7 @@ #include "includes.h" #include "auth/auth.h" #include "libcli/composite/composite.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" struct schannel_key_state { diff --git a/source4/nbt_server/wins/winsdb.h b/source4/nbt_server/wins/winsdb.h index 47e11b4694..5dc9ad6975 100644 --- a/source4/nbt_server/wins/winsdb.h +++ b/source4/nbt_server/wins/winsdb.h @@ -74,5 +74,6 @@ enum wins_hook_action { WINS_HOOK_DELETE = 2 }; +struct ldb_message; #include "nbt_server/wins/winsdb_proto.h" diff --git a/source4/ntptr/ntptr.h b/source4/ntptr/ntptr.h index b8ef366022..6dace6031d 100644 --- a/source4/ntptr/ntptr.h +++ b/source4/ntptr/ntptr.h @@ -66,6 +66,14 @@ struct spoolss_StartDocPrinter; struct spoolss_EndDocPrinter; struct spoolss_StartPagePrinter; struct spoolss_EndPagePrinter; +struct spoolss_GetPrinterData; +struct spoolss_SetPrinterData; +struct spoolss_EnumPrinterDrivers; +struct spoolss_EnumMonitors; +struct spoolss_EnumPrinters; +struct spoolss_EnumForms; +struct spoolss_EnumPorts; +struct spoolss_EnumPrintProcessors; /* the ntptr operations structure - contains function pointers to the backend implementations of each operation */ diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index b652b0f530..ad5c9594d5 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -29,6 +29,7 @@ #include "dlinklist.h" #include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" +#include "libcli/rap/rap.h" #include "ntvfs/ipc/proto.h" #include "rpc_server/dcerpc_server.h" diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index b9b09890f9..0e15ee1542 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -213,4 +213,6 @@ struct ntvfs_critical_sizes { int sizeof_ntvfs_request; }; +struct messaging_context; + #include "ntvfs/ntvfs_proto.h" diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h index d0807d849d..5f0dd9127e 100644 --- a/source4/rpc_server/common/common.h +++ b/source4/rpc_server/common/common.h @@ -66,4 +66,6 @@ #define DCESRV_PULL_HANDLE(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, NT_STATUS_INVALID_HANDLE) #define DCESRV_PULL_HANDLE_WERR(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, WERR_BADFID) +struct dcesrv_context; + #include "rpc_server/common/proto.h" diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c index a5f8ce15fc..9d0a884803 100644 --- a/source4/rpc_server/common/server_info.c +++ b/source4/rpc_server/common/server_info.c @@ -22,6 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_srvsvc.h" +#include "rpc_server/dcerpc_server.h" /* Here are common server info functions used by some dcerpc server interfaces diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c index ec744a5039..c98fe98059 100644 --- a/source4/rpc_server/common/share_info.c +++ b/source4/rpc_server/common/share_info.c @@ -22,6 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_srvsvc.h" +#include "rpc_server/dcerpc_server.h" /* Here are common server info functions used by some dcerpc server interfaces diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 85449c1a60..98cee05f88 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -240,6 +240,8 @@ struct dcesrv_critical_sizes { int sizeof_dcesrv_handle; }; +struct model_ops; + #include "rpc_server/dcerpc_server_proto.h" #endif /* SAMBA_DCERPC_SERVER_H */ diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 72c53183df..3772b62b30 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -28,8 +28,9 @@ #include "dsdb/samdb/samdb.h" #include "libcli/ldap/ldap.h" #include "libcli/security/proto.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "smb.h" +#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" #include "passdb/secrets.h" #include "db_wrap.h" diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index f434086425..9f1b84f77e 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -29,7 +29,7 @@ #include "dsdb/samdb/samdb.h" #include "rpc_server/samr/proto.h" #include "db_wrap.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "auth/gensec/schannel_state.h" struct server_pipe_state { diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c index 00d2f589ae..6341dda681 100644 --- a/source4/rpc_server/samr/samr_password.c +++ b/source4/rpc_server/samr/samr_password.c @@ -32,7 +32,7 @@ #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "rpc_server/samr/proto.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #include "db_wrap.h" /* diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 3aa18dfe77..fe608524a1 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" #include "smb.h" +#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" #include <sys/types.h> diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h index f47d27643d..5954d2385e 100644 --- a/source4/scripting/ejs/smbcalls.h +++ b/source4/scripting/ejs/smbcalls.h @@ -29,4 +29,7 @@ void mprAddArray(struct MprVar *var, int i, struct MprVar v); void mprSetCFunction(struct MprVar *obj, const char *name, MprCFunction fn); void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunction fn); +struct ldb_context; +struct ldb_message; + #include "scripting/ejs/proto.h" diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h index 1c544bfe82..5f30c8141d 100644 --- a/source4/smb_server/smb2/smb2_server.h +++ b/source4/smb_server/smb2/smb2_server.h @@ -49,4 +49,6 @@ struct smb2srv_request { struct smb2_request_buffer out; }; +struct smbsrv_request; + #include "smb_server/smb2/smb2_proto.h" diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 5a0f920361..63c0a51937 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -105,7 +105,7 @@ REQUIRED_SUBSYSTEMS = \ ####################### # Start SUBSERVICE [SUBSYSTEM::service] -PRIVATE_PROTO_HEADER = service.h +PRIVATE_PROTO_HEADER = service_proto.h OBJ_FILES = \ service.o \ service_stream.o \ diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h index d525ce9cdd..27fac68bb9 100644 --- a/source4/smbd/process_model.h +++ b/source4/smbd/process_model.h @@ -22,6 +22,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __PROCESS_MODEL_H__ +#define __PROCESS_MODEL_H__ + #include "lib/socket/socket.h" /* modules can use the following to determine if the interface has changed @@ -65,3 +68,5 @@ struct process_model_critical_sizes { }; #include "smbd/process_model_proto.h" + +#endif /* __PROCESS_MODEL_H__ */ diff --git a/source4/smbd/server.c b/source4/smbd/server.c index c68c436d52..c472581a06 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -33,6 +33,7 @@ #include "ldb/include/ldb.h" #include "registry/registry.h" #include "smb.h" +#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" #include "ntptr/ntptr.h" #include "auth/gensec/gensec.h" diff --git a/source4/smbd/service.h b/source4/smbd/service.h new file mode 100644 index 0000000000..3ccd98d7a9 --- /dev/null +++ b/source4/smbd/service.h @@ -0,0 +1,31 @@ +/* + Unix SMB/CIFS implementation. + + SERVER SERVICE code + + Copyright (C) Andrew Tridgell 2003-2005 + Copyright (C) Stefan (metze) Metzmacher 2004 + + 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 __SERVICE_H__ +#define __SERVICE_H__ + +#include "smbd/service_stream.h" +#include "smbd/service_task.h" +#include "smbd/service_proto.h" + +#endif /* __SERVICE_H__ */ diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 6f1a967237..692e18bea5 100644 --- a/source4/smbd/service_stream.h +++ b/source4/smbd/service_stream.h @@ -21,6 +21,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __SERVICE_STREAM_H__ +#define __SERVICE_STREAM_H__ + /* modules can use the following to determine if the interface has changed * please increment the version number after each interface change * with a comment and maybe update struct stream_connection_critical_sizes. @@ -58,3 +61,5 @@ struct stream_server_ops { void (*recv_handler)(struct stream_connection *, uint16_t); void (*send_handler)(struct stream_connection *, uint16_t); }; + +#endif /* __SERVICE_STREAM_H__ */ diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index 84bb512455..c0adf08fd0 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __SERVICE_TASK_H__ +#define __SERVICE_TASK_H__ struct task_server { struct event_context *event_ctx; @@ -29,3 +31,4 @@ struct task_server { void *private; }; +#endif /* __SERVICE_TASK_H__ */ diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index be5739eade..cb32345c2b 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -27,7 +27,7 @@ #include "lib/cmdline/popt_common.h" #include "auth/auth.h" #include "pstring.h" -#include "libcli/auth/proto.h" +#include "libcli/auth/libcli_auth.h" #define SQUID_BUFFER_SIZE 2010 diff --git a/source4/web_server/web_server.h b/source4/web_server/web_server.h index 45617082e6..6e266cc8bc 100644 --- a/source4/web_server/web_server.h +++ b/source4/web_server/web_server.h @@ -19,7 +19,6 @@ */ #include "smbd/process_model.h" -#include "web_server/proto.h" /* context of one open web connection @@ -77,3 +76,5 @@ struct esp_data { struct tls_params *tls_params; }; +#include "web_server/proto.h" + diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index cf4c83d767..c8611e6300 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -29,8 +29,7 @@ #include "librpc/gen_ndr/ndr_irpc.h" #include "libcli/auth/credentials.h" #include "libcli/security/proto.h" -#include "libcli/auth/proto.h" -#include "auth/credentials/credentials.h" +#include "libcli/auth/libcli_auth.h" #include "winbind/wb_helper.h" @@ -555,7 +554,7 @@ struct cmd_checkmachacc_state { static void cmd_checkmachacc_recv_init(struct composite_context *ctx); -struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call) + struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call) { struct composite_context *result, *ctx; struct cmd_checkmachacc_state *state; @@ -599,14 +598,14 @@ static void cmd_checkmachacc_recv_init(struct composite_context *ctx) composite_done(state->ctx); } -NTSTATUS wb_cmd_checkmachacc_recv(struct composite_context *c) + NTSTATUS wb_cmd_checkmachacc_recv(struct composite_context *c) { NTSTATUS status = composite_wait(c); talloc_free(c); return status; } -NTSTATUS wb_cmd_checkmachacc(struct wbsrv_call *call) + NTSTATUS wb_cmd_checkmachacc(struct wbsrv_call *call) { struct composite_context *c = wb_cmd_checkmachacc_send(call); return wb_cmd_checkmachacc_recv(c); diff --git a/source4/winbind/wb_async_helpers.h b/source4/winbind/wb_async_helpers.h index 2754a8acd6..af6a52b1d1 100644 --- a/source4/winbind/wb_async_helpers.h +++ b/source4/winbind/wb_async_helpers.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __WB_ASYNC_HELPERS_H__ +#define __WB_ASYNC_HELPERS_H__ + #include "librpc/gen_ndr/lsa.h" struct wb_sid_object { @@ -29,3 +32,4 @@ struct wb_sid_object { const char *name; }; +#endif /* __WB_ASYNC_HELPERS_H__ */ diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c index 97f0845467..2967414fec 100644 --- a/source4/winbind/wb_pam_auth.c +++ b/source4/winbind/wb_pam_auth.c @@ -26,8 +26,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "libcli/auth/credentials.h" -#include "libcli/auth/proto.h" -#include "auth/credentials/credentials.h" +#include "libcli/auth/libcli_auth.h" /* Oh, there is so much to keep an eye on when authenticating a user. Oh my! */ struct pam_auth_crap_state { diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index 7906e52de6..2a2aec20ea 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -146,4 +146,5 @@ struct wbsrv_samba3_call { struct netr_LMSessionKey; struct netr_UserSessionKey; +#include "winbind/wb_async_helpers.h" #include "winbind/wb_proto.h" |