[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Mon Aug 9 09:53:48 MDT 2010
The branch, v3-6-test has been updated
via 14328a4... s3-netlogon: remove global include of netlogon.h.
via 6307164... s3: remove global include of samr.h
via aa34c9a... s3-build: no need to include privileges.h twice.
via 60b9152... s3-net: only include netapi header when needed.
via 19f1727... s3-libsmb: include nbt.h in namequery_dc code.
via 80d3012... s3-libnet: include netlogon.h in libnet samsync header.
via d3086b7... s3-smbtorture: include svcctl.h
via 41b5ba8... s3-services: include svcctl.h where needed.
via 777ac14... s3-build: remove global include of krb5pac.h.
via ecf1981... s3-krb5: include krb5pac.h where needed.
via 672be65... s3-rap: include svcctl.h where needed.
via 30e752e... s3-passdb: include samr.h where needed.
via 3cfbd84... s3-param: include svcctl headers in loadparm.
via 0cfa681... s3-nmbd: include svcctl.h where needed.
from afe0e73... s3-winbind: Fix Bug #7568: Make sure cm_connect_lsa_tcp does not reset the secure channel.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 14328a44af94422462d45712174bba7ab5a216da
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 15:14:04 2010 +0200
s3-netlogon: remove global include of netlogon.h.
This reduces precompiled headers by another 4 MB and also slightly speeds up the
build.
Guenther
(cherry picked from commit 0f8e032628865861b356755b4fbafb6fbfeddbeb)
commit 6307164deeba3ba70828436b9db286307f4aa163
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 15:03:00 2010 +0200
s3: remove global include of samr.h
Guenther
(cherry picked from commit ccd4af271f73e88abd6899a347f9ce5af69c1f1c)
commit aa34c9aa299da7237d2a36315d0db47353863c76
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 4 12:01:50 2010 +0200
s3-build: no need to include privileges.h twice.
Guenther
(cherry picked from commit a90ed3381a772c46c06aaae66ec6113d878a6029)
commit 60b9152bc8c0fac2360db49b2e3fb7f4541ac0f7
Author: Günther Deschner <gd at samba.org>
Date: Tue Aug 3 00:03:03 2010 +0200
s3-net: only include netapi header when needed.
Guenther
(cherry picked from commit 002ac5681f95760968bc5111cc39e849a0449c44)
commit 19f1727b4ab7ababa712fa28bc09aaedadc8e0ec
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 23:21:09 2010 +0200
s3-libsmb: include nbt.h in namequery_dc code.
Guenther
(cherry picked from commit 164ee0fe56af9e4b1f30c83165b0580220ac9531)
commit 80d3012bedccd8daeeeb62a3378fbf770f775366
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 23:18:53 2010 +0200
s3-libnet: include netlogon.h in libnet samsync header.
Guenther
(cherry picked from commit f9012635da311afb31ce33ef5917e9a73207d688)
commit d3086b7e65ecaab28d030dfcfe2f169bafb99fff
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 15:25:35 2010 +0200
s3-smbtorture: include svcctl.h
Guenther
(cherry picked from commit af38b5f8009ac9f0ea7fb9cc10c0565e4908b2c3)
commit 41b5ba8fae4805bf232f526ecbd4683d50eb5346
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 23:17:25 2010 +0200
s3-services: include svcctl.h where needed.
Guenther
(cherry picked from commit 441d607589afec65d9064703e6f11cc0806333bb)
commit 777ac14bae10ce012f85e2cbe3951594f5851bac
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 15:02:09 2010 +0200
s3-build: remove global include of krb5pac.h.
Put in samr and netlogon, as they were pulled in via krb5pac.h.
Guenther
(cherry picked from commit c31df3adb2775523f465fdc9d03849c540c073a0)
commit ecf1981d648a779ce800a9022aeca7b13fe6977b
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 23:12:16 2010 +0200
s3-krb5: include krb5pac.h where needed.
Guenther
(cherry picked from commit 257a1f1097576fa981341521bda15824e7fac555)
commit 672be653ef47d072b6501e8a6459e7d5ff2a65af
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 22:54:29 2010 +0200
s3-rap: include svcctl.h where needed.
Guenther
(cherry picked from commit 2523aec6d19c519280793020f6db21c65a3c95ea)
commit 30e752e390e99a87798ec35516c7bcab907dd1d9
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 22:52:00 2010 +0200
s3-passdb: include samr.h where needed.
Guenther
(cherry picked from commit ae36783c7bed73461c012d78ec3e1f3a6bc3d221)
commit 3cfbd84ac42e3de67b60804bc9f05b41d858de69
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 23:23:12 2010 +0200
s3-param: include svcctl headers in loadparm.
Guenther
(cherry picked from commit 677dcfa6782f03fa11c322b6c8e1abdc0a354604)
commit 0cfa681b9ab3a34b92c564f7c0e37407fa2d8768
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 2 22:48:16 2010 +0200
s3-nmbd: include svcctl.h where needed.
Guenther
(cherry picked from commit 728fba1233afc632fbe2b6d5262ac32db751233f)
-----------------------------------------------------------------------
Summary of changes:
source3/auth/auth_ntlmssp.c | 1 +
source3/auth/auth_unix.c | 1 +
source3/auth/server_info.c | 1 +
source3/auth/token_util.c | 2 ++
source3/include/includes.h | 1 -
source3/include/krb5_protos.h | 3 +++
source3/include/proto.h | 6 ++++++
source3/include/smb.h | 1 -
source3/lib/netapi/getdc.c | 2 +-
source3/lib/netapi/joindomain.c | 2 +-
source3/lib/netapi/netlogon.c | 2 +-
source3/lib/util_sid.c | 1 +
source3/libads/kerberos_proto.h | 2 ++
source3/libads/kerberos_verify.c | 1 +
source3/libnet/libnet_samsync.h | 1 +
source3/libsmb/clikrb5.c | 1 +
source3/libsmb/clirap2.c | 1 +
source3/libsmb/namequery_dc.c | 1 +
source3/libsmb/passchange.c | 2 +-
source3/modules/vfs_expand_msdfs.c | 1 +
source3/modules/vfs_full_audit.c | 1 +
source3/modules/vfs_recycle.c | 1 +
source3/modules/vfs_smb_traffic_analyzer.c | 1 +
source3/modules/vfs_xattr_tdb.c | 1 +
source3/nmbd/nmbd_become_dmb.c | 1 +
source3/nmbd/nmbd_become_lmb.c | 1 +
source3/nmbd/nmbd_incomingdgrams.c | 1 +
source3/nmbd/nmbd_logonnames.c | 1 +
source3/nmbd/nmbd_sendannounce.c | 1 +
source3/nmbd/nmbd_serverlistdb.c | 1 +
source3/nmbd/nmbd_synclists.c | 1 +
source3/nmbd/nmbd_workgroupdb.c | 1 +
source3/pam_smbpass/general.h | 2 ++
source3/param/loadparm.c | 1 +
source3/passdb/pdb_ads.c | 1 +
source3/passdb/pdb_interface.c | 1 +
source3/passdb/pdb_smbpasswd.c | 1 +
source3/printing/nt_printing.c | 1 +
source3/printing/printing.c | 1 +
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_samr_util.c | 1 +
source3/rpc_server/srv_spoolss_nt.c | 1 +
source3/services/services.h | 2 ++
source3/smbd/password.c | 1 +
source3/smbd/service.c | 1 +
source3/smbd/sesssetup.c | 1 +
source3/smbd/smb2_sesssetup.c | 1 +
source3/smbd/uid.c | 1 +
source3/torture/torture.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net.h | 1 -
source3/utils/net_dom.c | 1 +
source3/utils/net_rap.c | 1 +
source3/utils/net_rpc.c | 1 +
source3/utils/net_rpc_shell.c | 1 +
source3/utils/net_sam.c | 1 +
source3/utils/pdbedit.c | 1 +
source3/utils/smbpasswd.c | 1 +
source3/winbindd/winbindd_pam.c | 1 +
59 files changed, 67 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 66adc6f..e7d8657 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "../libcli/auth/ntlmssp.h"
#include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/netlogon.h"
void auth_ntlmssp_want_sign(struct auth_ntlmssp_state *auth_ntlmssp_state)
{
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index c94ec2f..053cad9 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/samr.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 782dc41..e457bd4 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "../lib/crypto/arcfour.h"
+#include "../librpc/gen_ndr/netlogon.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 7634e76..21d9af1 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -27,6 +27,8 @@
#include "includes.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/netlogon.h"
+
/****************************************************************************
Check for a SID in an NT_USER_TOKEN
****************************************************************************/
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fcc6fe0..23ea30a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -643,7 +643,6 @@ extern void *cmdline_lp_ctx;
#include "smb.h"
#include "nameserv.h"
#include "../lib/util/byteorder.h"
-#include "privileges.h"
#include "rpc_misc.h"
#include "rpc_dce.h"
#include "mapping.h"
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index 97e6871..0b8aa71 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -1,3 +1,6 @@
+struct PAC_DATA;
+struct PAC_SIGNATURE_DATA;
+
/* work around broken krb5.h on sles9 */
#ifdef SIZEOF_LONG
#undef SIZEOF_LONG
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c1d5ec1..59276a5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -182,6 +182,10 @@ NTSTATUS auth_winbind_init(void);
/* The following definitions come from auth/server_info.c */
+struct netr_SamInfo2;
+struct netr_SamInfo3;
+struct netr_SamInfo6;
+
struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx);
NTSTATUS serverinfo_to_SamInfo2(struct auth_serversupplied_info *server_info,
uint8_t *pipe_session_key,
@@ -2733,6 +2737,8 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
/* The following definitions come from libsmb/dsgetdcname.c */
+struct netr_DsRGetDCNameInfo;
+
void debug_dsdcinfo_flags(int lvl, uint32_t flags);
NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ca71245..d4e37fe 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -178,7 +178,6 @@ typedef union unid_t {
#include "librpc/gen_ndr/idmap.h"
#include "librpc/gen_ndr/epmapper.h"
-#include "librpc/gen_ndr/krb5pac.h"
#include "librpc/gen_ndr/dcerpc.h"
struct lsa_dom_info {
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index ee17672..787b258 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -19,11 +19,11 @@
#include "includes.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
/********************************************************************
********************************************************************/
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 13a06c7..89a7c93 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -20,12 +20,12 @@
#include "includes.h"
#include "ads.h"
#include "librpc/gen_ndr/libnetapi.h"
+#include "libcli/auth/libcli_auth.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "librpc/gen_ndr/libnet_join.h"
#include "libnet/libnet_join.h"
-#include "libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/cli_wkssvc.h"
#include "secrets.h"
diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index 54b9709..d58b7cc 100644
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -19,11 +19,11 @@
#include "includes.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
#include "librpc/gen_ndr/libnetapi.h"
#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/util_sid.c b/source3/lib/util_sid.c
index 74b38de..31a4c06 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/netlogon.h"
#include "../libcli/security/dom_sid.h"
/*
diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index 7be81fa..afd57fe 100644
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -1,3 +1,5 @@
+struct PAC_LOGON_INFO;
+
/* The following definitions come from libads/kerberos_verify.c */
NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index 785b020..54328fb 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -27,6 +27,7 @@
#include "smb_krb5.h"
#include "libads/kerberos_proto.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/krb5pac.h"
#ifdef HAVE_KRB5
diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index c9093ef..cc33340 100644
--- a/source3/libnet/libnet_samsync.h
+++ b/source3/libnet/libnet_samsync.h
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "../librpc/gen_ndr/netlogon.h"
enum net_samsync_mode {
NET_SAMSYNC_MODE_FETCH_PASSDB = 0,
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index fb2fdba..4eb43cf 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "smb_krb5.h"
+#include "../librpc/gen_ndr/krb5pac.h"
#ifndef KRB5_AUTHDATA_WIN2K_PAC
#define KRB5_AUTHDATA_WIN2K_PAC 128
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 225eecd..a088397 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -77,6 +77,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/rap.h"
+#include "../librpc/gen_ndr/svcctl.h"
#define WORDSIZE 2
#define DWORDSIZE 4
diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index 6458e5d..d6ff999 100644
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "libads/sitename_cache.h"
#include "ads.h"
+#include "../librpc/gen_ndr/nbt.h"
/**********************************************************************
Is this our primary domain ?
diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 88f1ca8..5117d78 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -18,8 +18,8 @@
*/
#include "includes.h"
-#include "rpc_client/cli_samr.h"
#include "../librpc/gen_ndr/ndr_samr.h"
+#include "rpc_client/cli_samr.h"
/*************************************************************
Change a password on a remote machine using IPC calls.
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index d7ae397..3d5ea96 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 9c665c8..23ca149 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -58,6 +58,7 @@
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
static int vfs_full_audit_debug_level = DBGC_VFS;
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 3cd1f9d..c6f2836 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
#define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 57d483f..3cafdc7 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -24,6 +24,7 @@
#include "vfs_smb_traffic_analyzer.h"
#include "../libcli/security/dom_sid.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
/* abstraction for the send_over_network function */
enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index b11e7ee..28b21b6 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "librpc/gen_ndr/xattr.h"
#include "librpc/gen_ndr/ndr_xattr.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index 827d56c..337eae8 100644
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c
index 8aedd2c..45476f9 100644
--- a/source3/nmbd/nmbd_become_lmb.c
+++ b/source3/nmbd/nmbd_become_lmb.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern uint16 samba_nb_type; /* Samba's NetBIOS name type. */
diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index 75ab941..5216e1a 100644
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern bool found_lm_clients;
diff --git a/source3/nmbd/nmbd_logonnames.c b/source3/nmbd/nmbd_logonnames.c
index f0350af..5f21ea0 100644
--- a/source3/nmbd/nmbd_logonnames.c
+++ b/source3/nmbd/nmbd_logonnames.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern uint16 samba_nb_type; /* Samba's NetBIOS type. */
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 8eb1da7..4140040 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -24,6 +24,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern int updatecount;
extern bool found_lm_clients;
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index f3fba51..f9b55d2 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
int updatecount = 0;
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 5da0da8..d184445 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -27,6 +27,7 @@
also allows us to have more than 1 sync going at once (tridge) */
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
struct sync_record {
struct sync_record *next, *prev;
diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 55a86c0..17cd21b 100644
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
extern uint16 samba_nb_type;
diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h
index 320bdd0..4607620 100644
--- a/source3/pam_smbpass/general.h
+++ b/source3/pam_smbpass/general.h
@@ -1,3 +1,5 @@
+#include "../librpc/gen_ndr/samr.h"
+
#ifndef LINUX
/* This is only needed by modules in the Sun implementation. */
#if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a91e82f..90699c0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -58,6 +58,7 @@
#include "lib/smbconf/smbconf_reg.h"
#include "ads.h"
+#include "../librpc/gen_ndr/svcctl.h"
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 3ca24c4..9eb5b60 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -22,6 +22,7 @@
#include "tldap_util.h"
#include "../libds/common/flags.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
struct pdb_ads_state {
struct sockaddr_un socket_address;
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index ba6725e..b11fab4 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index bfd9964..dd89c8e 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/samr.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 9ead42d..ae44d57 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -31,6 +31,7 @@
#include "rpc_server/srv_spoolss_util.h"
#include "nt_printing.h"
#include "secrets.h"
+#include "../librpc/gen_ndr/netlogon.h"
/* Map generic permissions to printer object specific permissions */
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index a273710..0412d75 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -24,6 +24,7 @@
#include "librpc/gen_ndr/messaging.h"
#include "../librpc/gen_ndr/ndr_spoolss.h"
#include "nt_printing.h"
+#include "../librpc/gen_ndr/netlogon.h"
extern struct current_user current_user;
extern userdom_struct current_user_info;
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index b94446f..7ffdba0 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -31,6 +31,7 @@
#include "includes.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list