[SCM] Samba Shared Repository - branch v3-5-test updated
Günther Deschner
gd at samba.org
Thu Nov 26 13:21:06 MST 2009
The branch, v3-5-test has been updated
via 54994ab... s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry.
via 821e466... s3-rpc: running minimal_includes.pl on rpc_client and rpc_server.
via 5b051c7... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.
via f583a0c... s3-passdb: move some defines out of rpc headers (they really belong to passdb).
via b3bf9c6... s3-winbind: properly include netlogon.idl in wbint.idl.
via 0509a99... s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels.
via ec7929a... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
via a1a49c7... s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more.
via 358f3c3... s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics.
from dbef841... tevent: Fix a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 54994ab1f681ca9c48afcf2bf983117e3890e688
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 20:26:01 2009 +0100
s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry.
Guenther
(cherry picked from commit 89e02ef1f395d9662c20623bb81e40ba25d10bb4)
commit 821e4667e6f496d97e52dd75475ef1a5eaa009cd
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 20:17:07 2009 +0100
s3-rpc: running minimal_includes.pl on rpc_client and rpc_server.
Guenther
(cherry picked from commit 5d706a2fd4d5d0489b55d79250c68154600c4102)
commit 5b051c7accf5f88e46d86e9afa4da0e4152f0fd3
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
(cherry picked from commit 3d679a3b5fc208d8521217f6a4b4d9037b609b9b)
commit f583a0c75fd30aabec7728d574589f7c71370d91
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 18:15:39 2009 +0100
s3-passdb: move some defines out of rpc headers (they really belong to passdb).
Guenther
(cherry picked from commit 86f4536b7a128922b5d5808557e70fa243442361)
commit b3bf9c66e68722addd6bcd66d7cf5a9e17ff122f
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 18:58:36 2009 +0100
s3-winbind: properly include netlogon.idl in wbint.idl.
Guenther
(cherry picked from commit 4d0fca4472500b92cccff8de5a467fe09eb25455)
commit 0509a99cbfa0bfed92a04f731056a475b670755c
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 18:57:24 2009 +0100
s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels.
Guenther
(cherry picked from commit 85b6461174fd43acd7360c79cebe9b73366a8ff9)
commit ec7929a8c783d85a4d30b41b1a9152586bdf2132
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 10:15:45 2009 +0100
s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
Based on patch from Allan <allan at archlinux.org>.
Also should fix the FreeBSD build on the buildfarm.
Guenther
(cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)
commit a1a49c704b2496006abc8c759023f889dd7986fe
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 01:25:56 2009 +0100
s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more.
Guenther
(cherry picked from commit 60419a0eb72c2e07c4b882727b2ccb01b73c52e6)
commit 358f3c309b02eb4fee62be4ebbbab2b625cfe7e6
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 00:32:47 2009 +0100
s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics.
Guenther
(cherry picked from commit d22eb75a13a294cb31a3f253356853eab48b41d5)
-----------------------------------------------------------------------
Summary of changes:
nsswitch/winbind_krb5_locator.c | 6 +-
source3/client/client.c | 3 +-
source3/configure.in | 6 +-
source3/include/includes.h | 1 -
source3/include/ntdomain.h | 2 +
source3/include/passdb.h | 15 ++
source3/include/proto.h | 18 +--
source3/include/rpc_client.h | 44 ------
source3/include/rpc_misc.h | 16 --
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/librpc/gen_ndr/ndr_wbint.c | 1 +
source3/librpc/gen_ndr/wbint.h | 1 +
source3/librpc/idl/wbint.idl | 2 +-
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_pipe.c | 2 -
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 | 3 +-
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_netlog_nt.c | 3 +-
source3/rpc_server/srv_ntsvcs_nt.c | 1 +
source3/rpc_server/srv_pipe.c | 2 -
source3/rpc_server/srv_samr_nt.c | 1 +
source3/rpc_server/srv_spoolss_nt.c | 210 ++++++++++++++--------------
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 | 14 ++
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 +
source4/torture/rpc/samr.c | 223 +++++++++++++++++-------------
85 files changed, 364 insertions(+), 293 deletions(-)
delete mode 100644 source3/include/rpc_client.h
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c
index 272e7db..db6e8d0 100644
--- a/nsswitch/winbind_krb5_locator.c
+++ b/nsswitch/winbind_krb5_locator.c
@@ -26,7 +26,11 @@
#if defined(HAVE_KRB5) && defined(HAVE_KRB5_LOCATE_PLUGIN_H)
-#include <krb5/krb5.h>
+#if HAVE_COM_ERR_H
+#include <com_err.h>
+#endif
+
+#include <krb5.h>
#include <krb5/locate_plugin.h>
#ifndef KRB5_PLUGIN_NO_HANDLE
diff --git a/source3/client/client.c b/source3/client/client.c
index f81762a..a462470 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/configure.in b/source3/configure.in
index 70a85a4..1e69b2e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3279,7 +3279,7 @@ if test x"$with_ads_support" != x"no"; then
# now check for krb5.h. Some systems have the libraries without the headers!
# note that this check is done here to allow for different kerberos
# include paths
- AC_CHECK_HEADERS(krb5.h krb5/krb5.h)
+ AC_CHECK_HEADERS(krb5.h)
if test x"$ac_cv_header_krb5_h" = x"no"; then
@@ -3301,8 +3301,8 @@ if test x"$with_ads_support" != x"no"; then
LDFLAGS=$ac_save_LDFLAGS
fi
AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
-[[#ifdef HAVE_KRB5_KRB5_H
- #include <krb5/krb5.h>
+[[#ifdef HAVE_KRB5_H
+ #include <krb5.h>
#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/passdb.h b/source3/include/passdb.h
index c8e4bc2..9be2a69 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -23,6 +23,21 @@
#ifndef _PASSDB_H
#define _PASSDB_H
+/**********************************************************************
+ * Masks for mappings between unix uid and gid types and
+ * NT RIDS.
+ **********************************************************************/
+
+#define BASE_RID (0x000003E8L)
+
+/* Take the bottom bit. */
+#define RID_TYPE_MASK 1
+#define RID_MULTIPLIER 2
+
+/* The two common types. */
+#define USER_RID_TYPE 0
+#define GROUP_RID_TYPE 1
+
/*
* bit flags representing initialized fields in struct samu
*/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3ec7ce1..a2df1ab 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2088,21 +2088,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/include/rpc_misc.h b/source3/include/rpc_misc.h
index 58ea916..e86c47f 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -66,22 +66,6 @@
#define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x0000022aL)
-/**********************************************************************
- * Masks for mappings between unix uid and gid types and
- * NT RIDS.
- **********************************************************************/
-
-#define BASE_RID (0x000003E8L)
-
-/* Take the bottom bit. */
-#define RID_TYPE_MASK 1
-#define RID_MULTIPLIER 2
-
-/* The two common types. */
-#define USER_RID_TYPE 0
-#define GROUP_RID_TYPE 1
-
-
/**********************************************************************
* RPC policy handle used pretty much everywhere
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/librpc/gen_ndr/ndr_wbint.c b/source3/librpc/gen_ndr/ndr_wbint.c
index 7c6aac9..97b2976 100644
--- a/source3/librpc/gen_ndr/ndr_wbint.c
+++ b/source3/librpc/gen_ndr/ndr_wbint.c
@@ -4,6 +4,7 @@
#include "librpc/gen_ndr/ndr_wbint.h"
#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
_PUBLIC_ enum ndr_err_code ndr_push_wbint_userinfo(struct ndr_push *ndr, int ndr_flags, const struct wbint_userinfo *r)
{
if (ndr_flags & NDR_SCALARS) {
diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h
index 1c6cdbc..962a87e 100644
--- a/source3/librpc/gen_ndr/wbint.h
+++ b/source3/librpc/gen_ndr/wbint.h
@@ -5,6 +5,7 @@
#include "libcli/util/ntstatus.h"
#include "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/netlogon.h"
#ifndef _HEADER_wbint
#define _HEADER_wbint
diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl
index 1f0192e..e44f179 100644
--- a/source3/librpc/idl/wbint.idl
+++ b/source3/librpc/idl/wbint.idl
@@ -1,5 +1,5 @@
#include "idl_types.h"
-import "lsa.idl";
+import "lsa.idl", "netlogon.idl";
[
uuid("bf09192c-ed60-4928-9dff-d0d7bcb03ed8"),
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_pipe.c b/source3/rpc_client/cli_pipe.c
index 084bbef..5bfcba3 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -18,11 +18,9 @@
*/
#include "includes.h"
-#include "../libcli/auth/libcli_auth.h"
#include "librpc/gen_ndr/cli_epmapper.h"
#include "../librpc/gen_ndr/ndr_schannel.h"
#include "../libcli/auth/schannel.h"
-#include "../libcli/auth/schannel_proto.h"
#include "../libcli/auth/spnego.h"
#undef DBGC_CLASS
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 5a0dff2..ca7a6b4 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -23,6 +23,7 @@
--
Samba Shared Repository
More information about the samba-cvs
mailing list