From 146c1aac99b20afff30567e80fca7540853c446a Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 24 Mar 2011 12:08:15 +0100
Subject: [PATCH] s3-auth: rpc_server needs auth.h

Guenther
---
 source3/librpc/rpc/dcerpc_ep.c                 | 1 +
 source3/rpc_client/cli_winreg_int.h            | 2 ++
 source3/rpc_server/dcesrv_gssapi.c             | 1 +
 source3/rpc_server/dcesrv_ntlmssp.c            | 1 +
 source3/rpc_server/dfs/srv_dfs_nt.c            | 1 +
 source3/rpc_server/epmapper/srv_epmapper.c     | 1 +
 source3/rpc_server/eventlog/srv_eventlog_nt.c  | 1 +
 source3/rpc_server/eventlog/srv_eventlog_reg.c | 1 +
 source3/rpc_server/lsa/srv_lsa_nt.c            | 1 +
 source3/rpc_server/netlogon/srv_netlog_nt.c    | 1 +
 source3/rpc_server/rpc_handles.c               | 1 +
 source3/rpc_server/rpc_ncacn_np.c              | 1 +
 source3/rpc_server/rpc_server.c                | 1 +
 source3/rpc_server/samr/srv_samr_chgpasswd.c   | 1 +
 source3/rpc_server/samr/srv_samr_nt.c          | 1 +
 source3/rpc_server/spoolss/srv_spoolss_nt.c    | 1 +
 source3/rpc_server/spoolss/srv_spoolss_util.h  | 1 +
 source3/rpc_server/srv_pipe.c                  | 1 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c      | 1 +
 source3/rpc_server/svcctl/srv_svcctl_nt.c      | 1 +
 source3/rpc_server/svcctl/srv_svcctl_reg.c     | 1 +
 source3/rpc_server/winreg/srv_winreg_nt.c      | 1 +
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c      | 1 +
 source3/services/svc_winreg_glue.h             | 2 ++
 24 files changed, 26 insertions(+)

diff --git a/source3/librpc/rpc/dcerpc_ep.c b/source3/librpc/rpc/dcerpc_ep.c
index 1fce63acd21..76f7e91fb05 100644
--- a/source3/librpc/rpc/dcerpc_ep.c
+++ b/source3/librpc/rpc/dcerpc_ep.c
@@ -22,6 +22,7 @@
 #include "librpc/rpc/dcerpc_ep.h"
 #include "../librpc/gen_ndr/ndr_epmapper_c.h"
 #include "rpc_client/cli_pipe.h"
+#include "auth.h"
 
 #define EPM_MAX_ANNOTATION_SIZE 64
 
diff --git a/source3/rpc_client/cli_winreg_int.h b/source3/rpc_client/cli_winreg_int.h
index b9799888820..f175c17f5c9 100644
--- a/source3/rpc_client/cli_winreg_int.h
+++ b/source3/rpc_client/cli_winreg_int.h
@@ -22,6 +22,8 @@
 #ifndef CLI_WINREG_INT_H
 #define CLI_WINREG_INT_H
 
+struct auth_serversupplied_info;
+
 /**
  * @brief Connect to the interal winreg server and open the given key.
  *
diff --git a/source3/rpc_server/dcesrv_gssapi.c b/source3/rpc_server/dcesrv_gssapi.c
index 60cfca9b86d..f60f6ce2451 100644
--- a/source3/rpc_server/dcesrv_gssapi.c
+++ b/source3/rpc_server/dcesrv_gssapi.c
@@ -22,6 +22,7 @@
 #include "rpc_server/dcesrv_gssapi.h"
 #include "../librpc/gen_ndr/ndr_krb5pac.h"
 #include "librpc/crypto/gse.h"
+#include "auth.h"
 
 NTSTATUS gssapi_server_auth_start(TALLOC_CTX *mem_ctx,
 				  bool do_sign,
diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c
index 75bb2ed1471..e43bba732bb 100644
--- a/source3/rpc_server/dcesrv_ntlmssp.c
+++ b/source3/rpc_server/dcesrv_ntlmssp.c
@@ -22,6 +22,7 @@
 #include "rpc_server/dcesrv_ntlmssp.h"
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
+#include "auth.h"
 
 NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx,
 				   bool do_sign,
diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index f4bf3bf74ac..ee9ac469c9a 100644
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/srv_dfs.h"
 #include "msdfs.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_MSDFS
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 4fc8ecdeb8e..530b0b7cc7f 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/srv_epmapper.h"
 #include "srv_epmapper.h"
+#include "auth.h"
 
 typedef uint32_t error_status_t;
 
diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index a047db6b27b..cc935a51e84 100644
--- a/source3/rpc_server/eventlog/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
@@ -29,6 +29,7 @@
 #include "rpc_client/cli_winreg_int.h"
 #include "rpc_client/cli_winreg.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/eventlog/srv_eventlog_reg.c b/source3/rpc_server/eventlog/srv_eventlog_reg.c
index 8021c2bfad3..1493d4f62c9 100644
--- a/source3/rpc_server/eventlog/srv_eventlog_reg.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_reg.c
@@ -27,6 +27,7 @@
 #include "rpc_client/cli_winreg_int.h"
 #include "rpc_client/cli_winreg.h"
 #include "rpc_server/eventlog/srv_eventlog_reg.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 07d7fd46dd5..3142e2dbf7d 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -42,6 +42,7 @@
 #include "../libcli/security/dom_sid.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "passdb.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index 90e8c6c6e36..dad4fcbdc7a 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -44,6 +44,7 @@
 #include "nsswitch/libwbclient/wbclient.h"
 #include "../libcli/registry/util_reg.h"
 #include "passdb.h"
+#include "auth.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index 223d32b9a8a..ac84566f62a 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index df9799b1e67..9afc16ff503 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/auth.h"
 #include "../auth/auth_sam_reply.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 9a6b933ccd5..abbe5fa3895 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -25,6 +25,7 @@
 #include "lib/tsocket/tsocket.h"
 #include "libcli/named_pipe_auth/npa_tstream.h"
 #include "../auth/auth_sam_reply.h"
+#include "auth.h"
 
 #define SERVER_TCP_LOW_PORT  1024
 #define SERVER_TCP_HIGH_PORT 1300
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index c5394edec0e..083b048afe0 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -53,6 +53,7 @@
 #include "../lib/crypto/arcfour.h"
 #include "rpc_server/samr/srv_samr_util.h"
 #include "passdb.h"
+#include "auth.h"
 
 #ifndef ALLOW_CHANGE_PASSWORD
 #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 6759f238a3b..14d7750ff13 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -42,6 +42,7 @@
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 1b83528d74c..4a114464cdc 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -47,6 +47,7 @@
 #include "serverid.h"
 #include "../libcli/registry/util_reg.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.h b/source3/rpc_server/spoolss/srv_spoolss_util.h
index 4588db54a7f..49a46ee4a7c 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.h
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.h
@@ -22,6 +22,7 @@
 #ifndef _SRV_SPOOLSS_UITL_H
 #define _SRV_SPOOLSS_UITL_H
 
+struct auth_serversupplied_info;
 
 enum spoolss_PrinterInfo2Mask {
 	SPOOLSS_PRINTER_INFO_ATTRIBUTES      = (int)(0x00000001),
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index e8e5bc3d609..a8236777643 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -39,6 +39,7 @@
 #include "rpc_server.h"
 #include "rpc_dce.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 5af92c45b0e..01f3914827d 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -33,6 +33,7 @@
 #include "session.h"
 #include "../lib/util/util_pw.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index e8890e062b6..62184bbe84b 100644
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
@@ -28,6 +28,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "services/services.h"
 #include "services/svc_winreg_glue.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/svcctl/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c
index fb97c13fa5b..d262ff83b78 100644
--- a/source3/rpc_server/svcctl/srv_svcctl_reg.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_reg.c
@@ -29,6 +29,7 @@
 #include "rpc_client/cli_winreg_int.h"
 #include "rpc_client/cli_winreg.h"
 #include "rpc_server/svcctl/srv_svcctl_reg.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c
index b97c1e3f41e..081ddad390b 100644
--- a/source3/rpc_server/winreg/srv_winreg_nt.c
+++ b/source3/rpc_server/winreg/srv_winreg_nt.c
@@ -27,6 +27,7 @@
 #include "registry/reg_api_regf.h"
 #include "registry/reg_perfcount.h"
 #include "rpc_misc.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index 639fe8fdb63..a4092201992 100644
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -30,6 +30,7 @@
 #include "../libcli/security/security.h"
 #include "session.h"
 #include "smbd/smbd.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/services/svc_winreg_glue.h b/source3/services/svc_winreg_glue.h
index a4a1628cd3c..4ff9e27c402 100644
--- a/source3/services/svc_winreg_glue.h
+++ b/source3/services/svc_winreg_glue.h
@@ -24,6 +24,8 @@
 #ifndef SVC_WINREG_GLUE_H
 #define SVC_WINREG_GLUE_H
 
+struct auth_serversupplied_info;
+
 struct security_descriptor* svcctl_gen_service_sd(TALLOC_CTX *mem_ctx);
 
 struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
-- 
2.11.4.GIT