[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Nov 26 12:03:57 MST 2009
The branch, master has been updated
via 3d679a3... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.
from 86f4536... s3-passdb: move some defines out of rpc headers (they really belong to passdb).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d679a3b5fc208d8521217f6a4b4d9037b609b9b
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 18:21:28 2009 +0100
s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/client/client.c | 3 +-
source3/include/includes.h | 1 -
source3/include/ntdomain.h | 2 +
source3/include/proto.h | 18 ++----------
source3/include/rpc_client.h | 44 ------------------------------
source3/lib/netapi/file.c | 1 +
source3/lib/netapi/getdc.c | 1 +
source3/lib/netapi/group.c | 1 +
source3/lib/netapi/joindomain.c | 1 +
source3/lib/netapi/localgroup.c | 2 +
source3/lib/netapi/netlogon.c | 1 +
source3/lib/netapi/samr.c | 1 +
source3/lib/netapi/serverinfo.c | 1 +
source3/lib/netapi/share.c | 1 +
source3/lib/netapi/shutdown.c | 1 +
source3/lib/netapi/user.c | 1 +
source3/libads/ldap_printer.c | 1 +
source3/libnet/libnet_dssync.c | 1 +
source3/libnet/libnet_join.c | 2 +
source3/libnet/libnet_samsync.c | 1 +
source3/libsmb/libsmb_dir.c | 2 +-
source3/libsmb/trusts_util.c | 1 +
source3/rpc_client/cli_lsarpc.c | 1 +
source3/rpc_client/cli_netlogon.c | 1 +
source3/rpc_client/cli_samr.c | 1 +
source3/rpc_client/cli_spoolss.c | 2 +-
source3/rpc_server/srv_dfs_nt.c | 1 +
source3/rpc_server/srv_dssetup_nt.c | 1 +
source3/rpc_server/srv_echo_nt.c | 1 +
source3/rpc_server/srv_eventlog_nt.c | 1 +
source3/rpc_server/srv_initshutdown_nt.c | 2 +
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_netlog_nt.c | 1 +
source3/rpc_server/srv_ntsvcs_nt.c | 1 +
source3/rpc_server/srv_samr_nt.c | 1 +
source3/rpc_server/srv_spoolss_nt.c | 2 +
source3/rpc_server/srv_srvsvc_nt.c | 1 +
source3/rpc_server/srv_svcctl_nt.c | 1 +
source3/rpc_server/srv_winreg_nt.c | 1 +
source3/rpc_server/srv_wkssvc_nt.c | 1 +
source3/rpcclient/cmd_dfs.c | 1 +
source3/rpcclient/cmd_drsuapi.c | 1 +
source3/rpcclient/cmd_dssetup.c | 1 +
source3/rpcclient/cmd_echo.c | 1 +
source3/rpcclient/cmd_epmapper.c | 1 +
source3/rpcclient/cmd_eventlog.c | 1 +
source3/rpcclient/cmd_lsarpc.c | 1 +
source3/rpcclient/cmd_netlogon.c | 1 +
source3/rpcclient/cmd_ntsvcs.c | 1 +
source3/rpcclient/cmd_samr.c | 1 +
source3/rpcclient/cmd_spoolss.c | 1 +
source3/rpcclient/cmd_srvsvc.c | 1 +
source3/rpcclient/cmd_test.c | 1 +
source3/rpcclient/cmd_wkssvc.c | 1 +
source3/rpcclient/rpcclient.c | 1 +
source3/smbd/lanman.c | 2 +
source3/smbd/process.c | 15 ++++++++++
source3/utils/net_ads.c | 1 +
source3/utils/net_dom.c | 1 +
source3/utils/net_rpc.c | 7 +++++
source3/utils/net_rpc_audit.c | 1 +
source3/utils/net_rpc_join.c | 2 +
source3/utils/net_rpc_printer.c | 1 +
source3/utils/net_rpc_registry.c | 1 +
source3/utils/net_rpc_rights.c | 1 +
source3/utils/net_rpc_service.c | 2 +-
source3/utils/net_rpc_sh_acct.c | 1 +
source3/utils/net_util.c | 2 +
source3/utils/smbtree.c | 1 +
source3/winbindd/winbindd_ads.c | 1 +
source3/winbindd/winbindd_cm.c | 4 +++
source3/winbindd/winbindd_dual_srv.c | 1 +
source3/winbindd/winbindd_misc.c | 1 +
source3/winbindd/winbindd_pam.c | 2 +
source3/winbindd/winbindd_rpc.c | 2 +
75 files changed, 109 insertions(+), 64 deletions(-)
delete mode 100644 source3/include/rpc_client.h
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 6773e6d..ca2f9a8 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -23,7 +23,8 @@
#include "includes.h"
#include "client/client_proto.h"
-#include "include/rpc_client.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
+
#ifndef REGISTER
#define REGISTER 0
#endif
diff --git a/source3/include/includes.h b/source3/include/includes.h
index cbf30d6..438b346 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -687,7 +687,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "mangle.h"
#include "module.h"
#include "nsswitch/winbind_client.h"
-#include "rpc_client.h"
#include "dbwrap.h"
#include "packet.h"
#include "ctdbd_conn.h"
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index bbe653b..3204e2e 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -28,6 +28,8 @@
* in the NTDOM branch - it didn't belong there.
*/
+#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
+
typedef struct _prs_struct {
bool io; /* parsing in or out of data stream */
/*
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6b68f95..9e0f3a2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2089,21 +2089,9 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
#include "librpc/gen_ndr/ndr_svcctl.h"
#include "librpc/gen_ndr/ndr_winreg.h"
#include "librpc/gen_ndr/ndr_wkssvc.h"
-
-#include "librpc/gen_ndr/srv_dfs.h"
-#include "librpc/gen_ndr/srv_dssetup.h"
-#include "librpc/gen_ndr/srv_echo.h"
-#include "librpc/gen_ndr/srv_eventlog.h"
-#include "librpc/gen_ndr/srv_initshutdown.h"
-#include "librpc/gen_ndr/srv_lsa.h"
-#include "librpc/gen_ndr/srv_netlogon.h"
-#include "librpc/gen_ndr/srv_ntsvcs.h"
-#include "librpc/gen_ndr/srv_samr.h"
-#include "librpc/gen_ndr/srv_srvsvc.h"
-#include "librpc/gen_ndr/srv_svcctl.h"
-#include "librpc/gen_ndr/srv_winreg.h"
-#include "librpc/gen_ndr/srv_wkssvc.h"
-#include "librpc/gen_ndr/srv_spoolss.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
+#include "librpc/gen_ndr/ndr_initshutdown.h"
#include "librpc/ndr/libndr.h"
diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
deleted file mode 100644
index 84ac8b1..0000000
--- a/source3/include/rpc_client.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SMB parameters and setup
- Copyright (C) Gerald (Jerry) Carter 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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RPC_CLIENT_H
-#define _RPC_CLIENT_H
-
-/* autogenerated client stubs */
-
-#include "librpc/gen_ndr/cli_echo.h"
-#include "librpc/gen_ndr/cli_lsa.h"
-#include "librpc/gen_ndr/cli_svcctl.h"
-#include "librpc/gen_ndr/cli_wkssvc.h"
-#include "librpc/gen_ndr/cli_eventlog.h"
-#include "librpc/gen_ndr/cli_dfs.h"
-#include "librpc/gen_ndr/cli_initshutdown.h"
-#include "librpc/gen_ndr/cli_winreg.h"
-#include "librpc/gen_ndr/cli_srvsvc.h"
-#include "librpc/gen_ndr/cli_samr.h"
-#include "librpc/gen_ndr/cli_netlogon.h"
-#include "librpc/gen_ndr/cli_dssetup.h"
-#include "librpc/gen_ndr/cli_ntsvcs.h"
-#include "librpc/gen_ndr/cli_epmapper.h"
-#include "librpc/gen_ndr/cli_drsuapi.h"
-#include "librpc/gen_ndr/cli_spoolss.h"
-
-#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
-
-#endif /* _RPC_CLIENT_H */
diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 0d1bc08..1c3ef6d 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index d3f58f6..9af01ce 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -24,6 +24,7 @@
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
/********************************************************************
********************************************************************/
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 77ed2e8..e707c0c 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 9970a06..4936d77 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -25,6 +25,7 @@
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
#include "libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index d389c1f..b9c0b4c 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -23,6 +23,8 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *pipe_cli,
diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index 082938c..54b9709 100644
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
static WERROR construct_data(enum netr_LogonControlCode function_code,
const uint8_t *data_in,
diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index dbcef38..bef02c4 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
+#include "../librpc/gen_ndr/cli_samr.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index cc2ff52..f537802 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -24,6 +24,7 @@
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "libnet/libnet.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index 84c2752..65bcd9a 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/shutdown.c b/source3/lib/netapi/shutdown.c
index f9eb93b..4c274d6 100644
--- a/source3/lib/netapi/shutdown.c
+++ b/source3/lib/netapi/shutdown.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_initshutdown.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index f95750f..1ad4a6f 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -23,6 +23,7 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index a529029..b5a3e6b 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
#ifdef HAVE_ADS
diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 0b61b16..5213be0 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "libnet/libnet.h"
#include "../libcli/drsuapi/drsuapi.h"
+#include "../librpc/gen_ndr/cli_drsuapi.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index aa5f54a..736a919 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -21,6 +21,8 @@
#include "includes.h"
#include "libnet/libnet.h"
#include "libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index df7e875..26ecdc5 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -26,6 +26,7 @@
#include "../lib/crypto/crypto.h"
#include "../libcli/samsync/samsync.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
/**
* Fix up the delta, dealing with encryption issues so that the final
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 73bbf82..6c0b1b4 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "libsmbclient.h"
#include "libsmb_internal.h"
-
+#include "../librpc/gen_ndr/cli_srvsvc.h"
/*
* Routine to open a directory
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index e127c9a..8acdc0f 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
/*********************************************************
Change the domain password on the PDC.
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 74fd082..caa2583 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
/** @defgroup lsa LSA - Local Security Architecture
* @ingroup rpc_client
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 191a0b0..0388447 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
/****************************************************************************
Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index df22ecb..21cc2f6 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
/* User change password */
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 6d6d5df..a4622d0 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-#include "rpc_client.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
/**********************************************************************
convencience wrapper around rpccli_spoolss_OpenPrinterEx
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index bef8d83..dfa33c2 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -22,6 +22,7 @@
/* This is the implementation of the dfs pipe. */
#include "includes.h"
+#include "../librpc/gen_ndr/srv_dfs.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_MSDFS
diff --git a/source3/rpc_server/srv_dssetup_nt.c b/source3/rpc_server/srv_dssetup_nt.c
index 2b18e6b..148e182 100644
--- a/source3/rpc_server/srv_dssetup_nt.c
+++ b/source3/rpc_server/srv_dssetup_nt.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/srv_dssetup.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c
index bf29766..248ca0b 100644
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/srv_echo_nt.c
@@ -22,6 +22,7 @@
/* This is the interface to the rpcecho pipe. */
#include "includes.h"
+#include "../librpc/gen_ndr/srv_echo.h"
#ifdef DEVELOPER
diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index 8e3922d..52ecc89 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/srv_eventlog.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c
index 8b3ef52..0425f82 100644
--- a/source3/rpc_server/srv_initshutdown_nt.c
+++ b/source3/rpc_server/srv_initshutdown_nt.c
@@ -22,6 +22,8 @@
#include "includes.h"
#include "regfio.h"
+#include "../librpc/gen_ndr/srv_initshutdown.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 08d6911..e903f0e 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -29,6 +29,7 @@
/* This is the implementation of the lsa server code. */
#include "includes.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 39912ac..7854c44 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -28,6 +28,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../libcli/auth/schannel_state.h"
#include "../libcli/auth/schannel.h"
+#include "../librpc/gen_ndr/srv_netlogon.h"
extern userdom_struct current_user_info;
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index 357478f..ec0c884 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/srv_ntsvcs.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3ba24e8..2bfd6c3 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -34,6 +34,7 @@
#include "includes.h"
#include "smbd/globals.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/srv_samr.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 55fc1c1..a40bb02 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -27,6 +27,8 @@
up, all the errors returned are DOS errors, not NT status codes. */
#include "includes.h"
+#include "../librpc/gen_ndr/srv_spoolss.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
/* macros stolen from s4 spoolss server */
#define SPOOLSS_BUFFER_UNION(fn,ic,info,level) \
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index f7f51d1..d35557e 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list