From af300a9fcb96f99b37cbf3a47332a135bfe9722f Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Thu, 24 Mar 2011 13:46:20 +0100 Subject: [PATCH] s3-auth: smbd needs auth.h Guenther --- source3/smbd/close.c | 1 + source3/smbd/connection.c | 1 + source3/smbd/fake_file.c | 1 + source3/smbd/lanman.c | 1 + source3/smbd/msdfs.c | 1 + source3/smbd/msg_idmap.c | 1 + source3/smbd/negprot.c | 1 + source3/smbd/nttrans.c | 1 + source3/smbd/open.c | 1 + source3/smbd/password.c | 1 + source3/smbd/posix_acls.c | 1 + source3/smbd/process.c | 1 + source3/smbd/reply.c | 1 + source3/smbd/seal.c | 1 + source3/smbd/sec_ctx.c | 1 + source3/smbd/server.c | 1 + source3/smbd/server_reload.c | 1 + source3/smbd/service.c | 1 + source3/smbd/session.c | 1 + source3/smbd/sesssetup.c | 1 + source3/smbd/share_access.c | 1 + source3/smbd/smb2_sesssetup.c | 1 + source3/smbd/smb2_tcon.c | 1 + source3/smbd/trans2.c | 1 + source3/smbd/uid.c | 1 + 25 files changed, 25 insertions(+) diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 72d2736b68d..eb531ffaa9f 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -27,6 +27,7 @@ #include "smbd/globals.h" #include "fake_file.h" #include "transfer_file.h" +#include "auth.h" /**************************************************************************** Run a file if it is a magic script. diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index 7ac24c809a4..8560a5d211b 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -21,6 +21,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "dbwrap.h" +#include "auth.h" /**************************************************************************** Delete a connection record. diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c index 801bf268b92..81f7686726b 100644 --- a/source3/smbd/fake_file.c +++ b/source3/smbd/fake_file.c @@ -20,6 +20,7 @@ #include "includes.h" #include "smbd/smbd.h" #include "fake_file.h" +#include "auth.h" struct fake_file_type { const char *name; diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index c435cd8e341..bf2987f9077 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -43,6 +43,7 @@ #include "../libcli/security/security.h" #include "printing.h" #include "passdb/machine_sid.h" +#include "auth.h" #ifdef CHECK_TYPES #undef CHECK_TYPES diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index df574ffa7c1..ab67ac8596d 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -26,6 +26,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "msdfs.h" +#include "auth.h" /********************************************************************** Parse a DFS pathname of the form \hostname\service\reqpath diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c index 6819a6eb0e7..1a3ccb19508 100644 --- a/source3/smbd/msg_idmap.c +++ b/source3/smbd/msg_idmap.c @@ -34,6 +34,7 @@ #include "../librpc/gen_ndr/ndr_security.h" #include "idmap_cache.h" #include "passdb/lookup_sid.h" +#include "auth.h" struct id { union { diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index ce4b834409f..e53504933c4 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -23,6 +23,7 @@ #include "smbd/globals.h" #include "../libcli/auth/spnego.h" #include "serverid.h" +#include "auth.h" extern fstring remote_proto; diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 0676db743ea..e981165fe15 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -26,6 +26,7 @@ #include "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" #include "passdb/lookup_sid.h" +#include "auth.h" extern const struct generic_mapping file_generic_mapping; diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 64660c0b04b..ae56bf8485d 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -28,6 +28,7 @@ #include "librpc/gen_ndr/messaging.h" #include "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" +#include "auth.h" extern const struct generic_mapping file_generic_mapping; diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 647168bc7b4..4b38de7ecaf 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -23,6 +23,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "../librpc/gen_ndr/netlogon.h" +#include "auth.h" /* Fix up prototypes for OSX 10.4, where they're missing */ #ifndef HAVE_SETNETGRENT_PROTOTYPE diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 1544ca88b57..1d287160b1d 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -25,6 +25,7 @@ #include "../libcli/security/security.h" #include "trans2.h" #include "passdb/lookup_sid.h" +#include "auth.h" extern const struct generic_mapping file_generic_mapping; diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 1d6396d46bd..6060cc7b0b7 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -30,6 +30,7 @@ #include "printing/pcap.h" #include "system/select.h" #include "passdb.h" +#include "auth.h" extern bool global_machine_password_needs_changing; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 8a0f77989a1..5697594ac6a 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -36,6 +36,7 @@ #include "rpc_server/rpc_ncacn_np.h" #include "libcli/security/security.h" #include "libsmb/nmblib.h" +#include "auth.h" /**************************************************************************** Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 6b3f30f00bc..b3dd84264a8 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -25,6 +25,7 @@ #include "ntlmssp_wrap.h" #include "smb_crypt.h" #include "../lib/util/asn1.h" +#include "auth.h" /****************************************************************************** Server side encryption. diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c index d2f09790cb5..8da1db41f43 100644 --- a/source3/smbd/sec_ctx.c +++ b/source3/smbd/sec_ctx.c @@ -21,6 +21,7 @@ #include "smbd/smbd.h" #include "smbd/globals.h" #include "libcli/security/security_token.h" +#include "auth.h" extern struct current_user current_user; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 3e2e1c3a8c8..c8b45c12c8b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -39,6 +39,7 @@ #include "printing.h" #include "serverid.h" #include "passdb.h" +#include "auth.h" extern void start_epmd(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx); diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index eab11d45362..4d7c3376ea1 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -28,6 +28,7 @@ #include "nt_printing.h" #include "printing/pcap.h" #include "printing/load.h" +#include "auth.h" /**************************************************************************** purge stale printers and reload from pre-populated pcap cache diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 430a1e46fef..f48cfcaa5db 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -25,6 +25,7 @@ #include "../libcli/security/security.h" #include "printing/pcap.h" #include "passdb/lookup_sid.h" +#include "auth.h" extern userdom_struct current_user_info; diff --git a/source3/smbd/session.c b/source3/smbd/session.c index 7ac2c1b806e..f3a678b2055 100644 --- a/source3/smbd/session.c +++ b/source3/smbd/session.c @@ -31,6 +31,7 @@ #include "smbd/globals.h" #include "dbwrap.h" #include "session.h" +#include "auth.h" /******************************************************************** called when a session is created diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 3ac4af2a2fa..4bbd790736b 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -32,6 +32,7 @@ #include "../librpc/gen_ndr/krb5pac.h" #include "libads/kerberos_proto.h" #include "../lib/util/asn1.h" +#include "auth.h" /* For split krb5 SPNEGO blobs. */ struct pending_auth_data { diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c index de56fc784ee..2a4775d2dd3 100644 --- a/source3/smbd/share_access.c +++ b/source3/smbd/share_access.c @@ -22,6 +22,7 @@ #include "smbd/globals.h" #include "../libcli/security/security.h" #include "passdb/lookup_sid.h" +#include "auth.h" /* * No prefix means direct username diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 2b7a860b017..6649cfb59a2 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -29,6 +29,7 @@ #include "../librpc/gen_ndr/krb5pac.h" #include "libads/kerberos_proto.h" #include "../lib/util/asn1.h" +#include "auth.h" static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req, uint64_t in_session_id, diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index fb5897257eb..bdd18d5d07e 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -23,6 +23,7 @@ #include "smbd/globals.h" #include "../libcli/smb/smb_common.h" #include "../libcli/security/security.h" +#include "auth.h" static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, const char *in_path, diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 04a97cdfe44..4890de3a5ce 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -33,6 +33,7 @@ #include "../librpc/gen_ndr/ndr_security.h" #include "libcli/security/security.h" #include "trans2.h" +#include "auth.h" #define DIR_ENTRY_SAFETY_MARGIN 4096 diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index 7a2359d7c7e..d85f92cf01b 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/netlogon.h" #include "libcli/security/security.h" #include "passdb/lookup_sid.h" +#include "auth.h" /* what user is current? */ extern struct current_user current_user; -- 2.34.1