[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Mon May 31 03:47:43 MDT 2010
The branch, master has been updated
via fbb7814... s3: only use netlogon/nbt header when needed.
via f9f8007... s3-build: only use ndr_security.h where needed.
via c00407b... libcli/nbt/lmhosts: fix missing prototype warning.
from 7426cf4... s3: remove prototype of non-existsing function idmap_tdb_tdb_close().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fbb7814f91f85e95769a5e23506825167b44139f
Author: Günther Deschner <gd at samba.org>
Date: Tue May 18 19:40:31 2010 +0200
s3: only use netlogon/nbt header when needed.
Guenther
commit f9f8007361583c1d38be7e15eeae6b58a09614b3
Author: Günther Deschner <gd at samba.org>
Date: Fri May 28 02:19:32 2010 +0200
s3-build: only use ndr_security.h where needed.
Guenther
commit c00407bd3589e9a459014ddb0efd986b15d2eecc
Author: Günther Deschner <gd at samba.org>
Date: Fri May 28 03:04:45 2010 +0200
libcli/nbt/lmhosts: fix missing prototype warning.
Andrew, please check.
Guenther
-----------------------------------------------------------------------
Summary of changes:
libcli/nbt/lmhosts.c | 1 +
libgpo/gpo_util.c | 1 +
source3/include/client.h | 2 ++
source3/include/includes.h | 1 -
source3/include/proto.h | 25 -------------------------
source3/lib/secdesc.c | 1 +
source3/lib/sharesec.c | 1 +
source3/lib/util_sid.c | 1 +
source3/libads/cldap.c | 1 +
source3/libads/cldap.h | 12 ++++++++++++
source3/libads/ldap.c | 1 +
source3/libsmb/clidgram.c | 1 +
source3/libsmb/clidgram.h | 16 ++++++++++++++++
source3/libsmb/cliquota.c | 1 +
source3/libsmb/dsgetdcname.c | 2 ++
source3/libsmb/namequery.c | 1 +
source3/modules/vfs_acl_common.c | 2 ++
source3/nmbd/nmbd_lmhosts.c | 1 +
source3/passdb/lookup_sid.c | 1 +
source3/printing/nt_printing.c | 1 +
source3/registry/reg_api.c | 1 +
source3/registry/regfio.c | 1 +
source3/rpc_server/srv_spoolss_util.c | 1 +
source3/rpc_server/srv_srvsvc_nt.c | 1 +
source3/rpc_server/srv_svcctl_nt.c | 1 +
source3/smbd/file_access.c | 1 +
source3/smbd/nttrans.c | 1 +
source3/smbd/open.c | 1 +
source3/smbd/smb2_create.c | 1 +
source3/smbd/trans2.c | 1 +
source3/utils/net_ads.c | 1 +
source3/utils/net_printing.c | 1 +
source3/utils/net_rpc_registry.c | 1 +
source3/winbindd/idmap_adex/gc_util.c | 1 +
source3/winbindd/wb_group_members.c | 1 +
source3/winbindd/winbindd_cm.c | 1 +
source3/winbindd/winbindd_ndr.c | 1 +
37 files changed, 64 insertions(+), 26 deletions(-)
create mode 100644 source3/libads/cldap.h
create mode 100644 source3/libsmb/clidgram.h
Changeset truncated at 500 lines:
diff --git a/libcli/nbt/lmhosts.c b/libcli/nbt/lmhosts.c
index 317ccc5..3e746f0 100644
--- a/libcli/nbt/lmhosts.c
+++ b/libcli/nbt/lmhosts.c
@@ -26,6 +26,7 @@
#include "lib/util/util_net.h"
#include "system/filesys.h"
#include "system/network.h"
+#include "../libcli/nbt/libnbt.h"
/********************************************************
Start parsing the lmhosts file.
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index ef16329..0afed55 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -19,6 +19,7 @@
#define TALLOC_DEPRECATED 1
#include "includes.h"
#include "librpc/gen_ndr/ndr_misc.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#include "../libgpo/gpo.h"
#if _SAMBA_BUILD_ == 4
#include "system/filesys.h"
diff --git a/source3/include/client.h b/source3/include/client.h
index 71232b3..c245f55 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -22,6 +22,8 @@
#ifndef _CLIENT_H
#define _CLIENT_H
+#include "../librpc/ndr/libndr.h"
+
/* the client asks for a smaller buffer to save ram and also to get more
overlap on the wire. This size gives us a nice read/write size, which
will be a multiple of the page size on almost any system */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index be3b66f..de1d419 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -656,7 +656,6 @@ struct ntlmssp_state;
#include "auth.h"
#include "ntdomain.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
#include "librpc/rpc/dcerpc.h"
#include "nt_printing.h"
#include "idmap.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5589eee..ee6f09a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1759,17 +1759,6 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
const char *impersonate_princ_s,
struct PAC_LOGON_INFO **logon_info);
-/* The following definitions come from libads/cldap.c */
-bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
- const char *server,
- const char *realm,
- uint32_t nt_version,
- struct netlogon_samlogon_response **reply);
-bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
- const char *server,
- const char *realm,
- struct NETLOGON_SAM_LOGON_RESPONSE_EX *reply5);
-
/* The following definitions come from libads/disp_sec.c */
void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_descriptor *sd);
@@ -2176,20 +2165,6 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
const char *username,
const char *password,
const char *domain);
-/* The following definitions come from libsmb/clidgram.c */
-
-bool send_getdc_request(TALLOC_CTX *mem_ctx,
- struct messaging_context *msg_ctx,
- struct sockaddr_storage *dc_ss,
- const char *domain_name,
- const struct dom_sid *sid,
- uint32_t nt_version);
-bool receive_getdc_response(TALLOC_CTX *mem_ctx,
- struct sockaddr_storage *dc_ss,
- const char *domain_name,
- uint32_t *nt_version,
- const char **dc_name,
- struct netlogon_samlogon_response **reply);
/* The following definitions come from libsmb/clientgen.c */
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index a1599a8..fc40b9e 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/* Map generic permissions to file object specific permissions */
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 67a0357..f84c8c5 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/*******************************************************************
Create the share security tdb.
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 2a77be7..bbb1b53 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/*
* Some useful sids, more well known sids can be found at
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index db5f664..5d2e900 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "../libcli/cldap/cldap.h"
#include "../lib/tsocket/tsocket.h"
+#include "libads/cldap.h"
/*******************************************************************
do a cldap netlogon query. Always 389/udp
diff --git a/source3/libads/cldap.h b/source3/libads/cldap.h
new file mode 100644
index 0000000..afe4b35
--- /dev/null
+++ b/source3/libads/cldap.h
@@ -0,0 +1,12 @@
+#include "../libcli/netlogon.h"
+
+/* The following definitions come from libads/cldap.c */
+bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
+ const char *server,
+ const char *realm,
+ uint32_t nt_version,
+ struct netlogon_samlogon_response **reply);
+bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
+ const char *server,
+ const char *realm,
+ struct NETLOGON_SAM_LOGON_RESPONSE_EX *reply5);
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 8d4b86c..98da8ff 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "libads/sitename_cache.h"
+#include "libads/cldap.h"
#ifdef HAVE_LDAP
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 1b72e33..f1f0bcb 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "librpc/gen_ndr/messaging.h"
+#include "libsmb/clidgram.h"
/*
* cli_send_mailslot, send a mailslot for client code ...
diff --git a/source3/libsmb/clidgram.h b/source3/libsmb/clidgram.h
new file mode 100644
index 0000000..ff98f3b
--- /dev/null
+++ b/source3/libsmb/clidgram.h
@@ -0,0 +1,16 @@
+#include "../libcli/netlogon.h"
+
+/* The following definitions come from libsmb/clidgram.c */
+
+bool send_getdc_request(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
+ struct sockaddr_storage *dc_ss,
+ const char *domain_name,
+ const struct dom_sid *sid,
+ uint32_t nt_version);
+bool receive_getdc_response(TALLOC_CTX *mem_ctx,
+ struct sockaddr_storage *dc_ss,
+ const char *domain_name,
+ uint32_t *nt_version,
+ const char **dc_name,
+ struct netlogon_samlogon_response **reply);
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 3cd4edf..6642cf0 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
{
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 6e322e9..6af2eeb 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -23,6 +23,8 @@
#include "includes.h"
#include "libads/sitename_cache.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "libads/cldap.h"
+#include "libsmb/clidgram.h"
#define DSGETDCNAME_FMT "DSGETDCNAME/DOMAIN/%s"
/* 15 minutes */
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index a77f5e4..20ba341 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "libads/sitename_cache.h"
+#include "../libcli/netlogon.h"
/* nmbd.c sets this to True. */
bool global_in_nmbd = False;
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 46d54c2..a3f2077 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -19,6 +19,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "../librpc/gen_ndr/ndr_security.h"
+
static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
DATA_BLOB *pblob,
uint16_t hash_type,
diff --git a/source3/nmbd/nmbd_lmhosts.c b/source3/nmbd/nmbd_lmhosts.c
index 75c03bb..227d7a3 100644
--- a/source3/nmbd/nmbd_lmhosts.c
+++ b/source3/nmbd/nmbd_lmhosts.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../libcli/nbt/libnbt.h"
/****************************************************************************
Load a lmhosts file.
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 181b17a..14494cb 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/*****************************************************************
Dissect a user-provided name into domain, name, sid and type.
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 42ea5fb..78f4375 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -24,6 +24,7 @@
#include "printing/pcap.h"
#include "registry.h"
#include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
static TDB_CONTEXT *tdb_forms; /* used for forms files */
static TDB_CONTEXT *tdb_drivers; /* used for driver files */
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 4f3b7a2..e380a0d 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -71,6 +71,7 @@
#include "reg_dispatcher.h"
#include "reg_util_marshalling.h"
#include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 60a0504..d64eab8 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "regfio.h"
#include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index eeae1de..0ebe0ba 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -23,6 +23,7 @@
#include "srv_spoolss_util.h"
#include "../librpc/gen_ndr/srv_winreg.h"
#include "../librpc/gen_ndr/cli_winreg.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
#define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 3888061..40c26f6 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -26,6 +26,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/srv_srvsvc.h"
#include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_security.h"
extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 24c67d3..bc751e7 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -27,6 +27,7 @@
#include "services/services.h"
#include "registry.h"
#include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 065f2b6..b487afb 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_ACLS
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 84a20ae..577a7e4 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "smbd/globals.h"
+#include "../librpc/gen_ndr/ndr_security.h"
extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ce69157..ca5b133 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "smbd/globals.h"
#include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_security.h"
extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 77fd607..37acfac 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "smbd/globals.h"
#include "../libcli/smb/smb_common.h"
+#include "../librpc/gen_ndr/ndr_security.h"
int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
{
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4032120..2c0bca9 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -28,6 +28,7 @@
#include "smbd/globals.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/xattr.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#define DIR_ENTRY_SAFETY_MARGIN 4096
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 9665a3a..4aea9a7 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -25,6 +25,7 @@
#include "librpc/gen_ndr/ndr_krb5pac.h"
#include "../librpc/gen_ndr/cli_spoolss.h"
#include "nsswitch/libwbclient/wbclient.h"
+#include "libads/cldap.h"
#ifdef HAVE_ADS
diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index c7a2624..81e0515 100644
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -24,6 +24,7 @@
#include "librpc/gen_ndr/ndr_ntprinting.h"
#include "librpc/gen_ndr/cli_spoolss.h"
#include "rpc_client/cli_spoolss.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#define FORMS_PREFIX "FORMS/"
#define DRIVERS_PREFIX "DRIVERS/"
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 7f8f5bb..59971af 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -25,6 +25,7 @@
#include "../librpc/gen_ndr/cli_winreg.h"
#include "registry/reg_util_marshalling.h"
#include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/*******************************************************************
connect to a registry hive root (open a registry policy)
diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c
index 634fd98..9b4ce77 100644
--- a/source3/winbindd/idmap_adex/gc_util.c
+++ b/source3/winbindd/idmap_adex/gc_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "idmap_adex.h"
+#include "libads/cldap.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c
index 0a42e79..2649926 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "winbindd.h"
#include "librpc/gen_ndr/cli_wbint.h"
+#include "../librpc/gen_ndr/ndr_security.h"
/*
* We have 3 sets of routines here:
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 64dd690..19b73bc 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -69,6 +69,7 @@
#include "../librpc/gen_ndr/cli_dssetup.h"
#include "libads/sitename_cache.h"
#include "librpc/gen_ndr/messaging.h"
+#include "libsmb/clidgram.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 9ab44f0..396aa06 100644
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "winbindd.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
--
Samba Shared Repository
More information about the samba-cvs
mailing list