[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Oct 11 23:55:01 MDT 2010
The branch, master has been updated
via f768b32 libcli/security Provide a common, top level libcli/security/security.h
from 5742f51 libcli/security Use common security.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f768b32e37788e6722217148b0a73e54c04bc03a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Oct 12 15:27:50 2010 +1100
libcli/security Provide a common, top level libcli/security/security.h
This will reduce the noise from merges of the rest of the
libcli/security code, without this commit changing what code
is actually used.
This includes (along with other security headers) dom_sid.h and
security_token.h
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
libcli/security/display_sec.c | 4 +---
libcli/security/sddl.c | 2 +-
libcli/security/secace.c | 2 +-
{source4/libcli => libcli}/security/security.h | 5 ++++-
libcli/security/security_descriptor.c | 3 +--
libgpo/gpo_ldap.c | 1 +
libgpo/gpo_sec.c | 2 +-
libgpo/gpo_util.c | 1 +
librpc/ndr/ndr_sec_helper.c | 5 +----
source3/auth/auth_util.c | 2 +-
source3/auth/server_info.c | 2 +-
source3/auth/token_util.c | 2 +-
source3/client/client.c | 1 +
source3/groupdb/mapping.c | 1 +
source3/groupdb/mapping_tdb.c | 2 +-
source3/lib/eventlog/eventlog.c | 1 +
source3/lib/idmap_cache.c | 1 +
source3/lib/netapi/group.c | 2 +-
source3/lib/netapi/localgroup.c | 2 +-
source3/lib/netapi/samr.c | 1 +
source3/lib/netapi/sid.c | 1 +
source3/lib/netapi/user.c | 2 +-
source3/lib/privileges.c | 1 +
source3/lib/secdesc.c | 2 +-
source3/lib/sharesec.c | 1 +
source3/lib/smbldap.c | 1 +
source3/lib/tldap_util.c | 1 +
source3/lib/util_nttoken.c | 2 +-
source3/lib/util_seaccess.c | 1 +
source3/lib/winbind_util.c | 1 +
source3/libads/ldap.c | 1 +
source3/libgpo/gpo_reg.c | 1 +
source3/libnet/libnet_join.c | 2 +-
source3/libnet/libnet_samsync.c | 2 +-
source3/libnet/libnet_samsync_passdb.c | 2 +-
source3/libsmb/cliquota.c | 1 +
source3/libsmb/libsmb_server.c | 1 +
source3/libsmb/libsmb_xattr.c | 3 +--
source3/libsmb/samlogon_cache.c | 1 +
source3/libsmb/trustdom_cache.c | 1 +
source3/locking/locking.c | 1 +
source3/modules/vfs_acl_common.c | 1 +
source3/modules/vfs_smb_traffic_analyzer.c | 2 +-
source3/nmbd/nmbd_processlogon.c | 2 +-
source3/passdb/account_pol.c | 1 +
source3/passdb/lookup_sid.c | 2 +-
source3/passdb/machine_sid.c | 2 +-
source3/passdb/passdb.c | 1 +
source3/passdb/pdb_ads.c | 1 +
source3/passdb/pdb_compat.c | 1 +
source3/passdb/pdb_get_set.c | 2 +-
source3/passdb/pdb_interface.c | 2 +-
source3/passdb/pdb_ldap.c | 2 +-
source3/passdb/pdb_smbpasswd.c | 2 +-
source3/passdb/pdb_tdb.c | 1 +
source3/passdb/secrets.c | 1 +
source3/passdb/util_builtin.c | 2 +-
source3/passdb/util_unixsids.c | 2 +-
source3/passdb/util_wellknown.c | 2 +-
source3/printing/nt_printing.c | 1 +
source3/printing/nt_printing_tdb.c | 1 +
source3/printing/printspoolss.c | 1 +
source3/registry/reg_dispatcher.c | 1 +
source3/registry/reg_util_token.c | 1 +
source3/rpc_client/cli_lsarpc.c | 2 +-
source3/rpc_server/srv_eventlog_nt.c | 1 +
source3/rpc_server/srv_lsa_nt.c | 2 +-
source3/rpc_server/srv_netlog_nt.c | 2 +-
source3/rpc_server/srv_samr_nt.c | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 1 +
source3/rpc_server/srv_spoolss_util.c | 2 +-
source3/rpc_server/srv_srvsvc_nt.c | 1 +
source3/rpc_server/srv_svcctl_nt.c | 1 +
source3/rpc_server/srv_wkssvc_nt.c | 1 +
source3/rpcclient/cmd_lsarpc.c | 1 +
source3/rpcclient/cmd_samr.c | 2 +-
source3/rpcclient/rpcclient.c | 1 +
source3/services/services_db.c | 1 +
source3/smbd/dir.c | 1 +
source3/smbd/file_access.c | 1 +
source3/smbd/files.c | 1 +
source3/smbd/lanman.c | 1 +
source3/smbd/nttrans.c | 1 +
source3/smbd/open.c | 1 +
source3/smbd/pipes.c | 1 +
source3/smbd/posix_acls.c | 2 +-
source3/smbd/reply.c | 1 +
source3/smbd/service.c | 1 +
source3/smbd/share_access.c | 1 +
source3/smbd/smb2_read.c | 1 +
source3/smbd/smb2_tcon.c | 1 +
source3/smbd/trans2.c | 1 +
source3/smbd/uid.c | 1 +
source3/torture/nbio.c | 1 +
source3/torture/test_posix_append.c | 1 +
source3/torture/torture.c | 2 +-
source3/torture/utable.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net_ads.c | 1 +
source3/utils/net_groupmap.c | 1 +
source3/utils/net_idmap.c | 1 +
source3/utils/net_lookup.c | 1 +
source3/utils/net_printing.c | 1 +
source3/utils/net_rpc.c | 2 +-
source3/utils/net_rpc_printer.c | 1 +
source3/utils/net_rpc_rights.c | 1 +
source3/utils/net_rpc_samsync.c | 2 +-
source3/utils/net_rpc_sh_acct.c | 1 +
source3/utils/net_sam.c | 1 +
source3/utils/net_usershare.c | 1 +
source3/utils/net_util.c | 1 +
source3/utils/pdbedit.c | 1 +
source3/utils/profiles.c | 2 +-
source3/utils/sharesec.c | 2 +-
source3/utils/smbcacls.c | 2 +-
source3/utils/smbcquotas.c | 1 +
source3/utils/status.c | 1 +
source3/web/statuspage.c | 1 +
source3/winbindd/idmap_ad.c | 2 +-
source3/winbindd/idmap_ldap.c | 2 +-
source3/winbindd/idmap_tdb.c | 1 +
source3/winbindd/idmap_util.c | 1 +
source3/winbindd/wb_getgrsid.c | 2 +-
source3/winbindd/wb_getpwsid.c | 1 +
source3/winbindd/wb_gettoken.c | 1 +
source3/winbindd/wb_gid2sid.c | 1 +
source3/winbindd/wb_group_members.c | 1 +
source3/winbindd/wb_lookupname.c | 1 +
source3/winbindd/wb_lookupsid.c | 1 +
source3/winbindd/wb_lookupusergroups.c | 1 +
source3/winbindd/wb_queryuser.c | 1 +
source3/winbindd/wb_sid2gid.c | 1 +
source3/winbindd/wb_sid2uid.c | 1 +
source3/winbindd/wb_uid2sid.c | 1 +
source3/winbindd/winbindd_ads.c | 1 +
source3/winbindd/winbindd_async.c | 1 +
source3/winbindd/winbindd_cache.c | 2 +-
source3/winbindd/winbindd_cm.c | 1 +
source3/winbindd/winbindd_creds.c | 1 +
source3/winbindd/winbindd_dual.c | 1 +
source3/winbindd/winbindd_dual_srv.c | 1 +
source3/winbindd/winbindd_getpwsid.c | 1 +
source3/winbindd/winbindd_getsidaliases.c | 1 +
source3/winbindd/winbindd_getuserdomgroups.c | 1 +
source3/winbindd/winbindd_getusersids.c | 1 +
source3/winbindd/winbindd_lookuprids.c | 1 +
source3/winbindd/winbindd_lookupsid.c | 1 +
source3/winbindd/winbindd_msrpc.c | 1 +
source3/winbindd/winbindd_pam.c | 2 +-
source3/winbindd/winbindd_rpc.c | 2 +-
source3/winbindd/winbindd_samr.c | 1 +
source3/winbindd/winbindd_sid_to_gid.c | 1 +
source3/winbindd/winbindd_sid_to_uid.c | 1 +
source3/winbindd/winbindd_util.c | 2 +-
source4/dsdb/samdb/ldb_modules/samba3sam.c | 1 -
source4/lib/policy/gp_ldap.c | 3 +--
156 files changed, 158 insertions(+), 61 deletions(-)
rename {source4/libcli => libcli}/security/security.h (97%)
Changeset truncated at 500 lines:
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index 6a82067..f45b770 100644
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -19,9 +19,7 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/secace.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
#include "librpc/ndr/libndr.h"
/****************************************************************************
diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 463a142..5b605c0 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "system/locale.h"
diff --git a/libcli/security/secace.c b/libcli/security/secace.c
index 5787e15..1577550 100644
--- a/libcli/security/secace.c
+++ b/libcli/security/secace.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
#include "lib/util/tsort.h"
#define SEC_ACE_HEADER_SIZE (2 * sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint32_t))
diff --git a/source4/libcli/security/security.h b/libcli/security/security.h
similarity index 97%
rename from source4/libcli/security/security.h
rename to libcli/security/security.h
index 009ad64..8018bee 100644
--- a/source4/libcli/security/security.h
+++ b/libcli/security/security.h
@@ -36,10 +36,13 @@ struct object_tree {
#include "libcli/security/dom_sid.h"
#include "libcli/security/secace.h"
#include "libcli/security/secacl.h"
-#include "libcli/security/proto.h"
#include "libcli/security/security_descriptor.h"
#include "libcli/security/security_token.h"
#include "libcli/security/sddl.h"
#include "libcli/security/privileges.h"
+#if _SAMBA_BUILD_ >= 4
+#include "libcli/security/proto.h"
+#endif
+
#endif
diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 4e67e0a..60f9de8 100644
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -20,8 +20,7 @@
*/
#include "includes.h"
-#include "libcli/security/security_descriptor.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
/*
return a blank security descriptor (no owners, dacl or sacl)
diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index c509642..38a0405 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -23,6 +23,7 @@
#include "libgpo/gpo_s4.h"
#include "source4/libgpo/ads_convenience.h"
#endif
+#include "../libcli/security/security.h"
/****************************************************************
parse the raw extension string into a GP_EXT structure
diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index 099dbaa..e0304d4 100644
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
#include "../libgpo/gpo.h"
#if _SAMBA_BUILD_ == 4
#include "libgpo/ads_convenience.h"
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 3320d97..9e4687d 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -21,6 +21,7 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "../libgpo/gpo.h"
+#include "../libcli/security/security.h"
#if _SAMBA_BUILD_ == 4
#include "system/filesys.h"
#include "auth/auth.h"
diff --git a/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c
index 7207c0b..ff8588d 100644
--- a/librpc/ndr/ndr_sec_helper.c
+++ b/librpc/ndr/ndr_sec_helper.c
@@ -23,10 +23,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/dom_sid.h"
-#if _SAMBA_BUILD_ == 4
-#include "libcli/security/security.h"
-#endif
+#include "../libcli/security/security.h"
/*
return the wire size of a security_ace
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 9fbc7f1..98cef79 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -26,7 +26,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../lib/crypto/arcfour.h"
#include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 690838d..344e8e9 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "../lib/crypto/arcfour.h"
#include "../librpc/gen_ndr/netlogon.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 8666f88..826801c 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -27,8 +27,8 @@
#include "includes.h"
#include "secrets.h"
#include "memcache.h"
-#include "../libcli/security/dom_sid.h"
#include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
/****************************************************************************
Check for a SID in an struct security_token
diff --git a/source3/client/client.c b/source3/client/client.c
index a24b7e3..e979ddf 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -28,6 +28,7 @@
#include "../lib/util/select.h"
#include "system/readline.h"
#include "../libcli/smbreadline/smbreadline.h"
+#include "../libcli/security/security.h"
#ifndef REGISTER
#define REGISTER 0
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 5e2e544..0c6da8c 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "groupdb/mapping.h"
+#include "../libcli/security/security.h"
static const struct mapping_backend *backend;
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index dab2520..cd9a59c 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "groupdb/mapping.h"
#include "dbwrap.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
static struct db_context *db; /* used for driver files */
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index ea7cb6d..c91258e 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "lib/eventlog/eventlog.h"
+#include "../libcli/security/security.h"
/* maintain a list of open eventlog tdbs with reference counts */
diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index bf72d91..fbe3a7e 100644
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "idmap_cache.h"
+#include "../libcli/security/security.h"
/**
* Find a sid2uid mapping
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index bf8d166..b9dd1e9 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -25,7 +25,7 @@
#include "lib/netapi/libnetapi.h"
#include "../librpc/gen_ndr/cli_samr.h"
#include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index 676f6df..b2d08b7 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -27,7 +27,7 @@
#include "../librpc/gen_ndr/cli_lsa.h"
#include "rpc_client/cli_lsarpc.h"
#include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.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/samr.c b/source3/lib/netapi/samr.c
index fb8e163..1e2620f 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -23,6 +23,7 @@
#include "../librpc/gen_ndr/cli_samr.h"
#include "rpc_client/cli_samr.h"
#include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/sid.c b/source3/lib/netapi/sid.c
index a9bca26..704964a 100644
--- a/source3/lib/netapi/sid.c
+++ b/source3/lib/netapi/sid.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "lib/netapi/netapi.h"
+#include "../libcli/security/security.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 151c24b..152b727 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -27,7 +27,7 @@
#include "rpc_client/init_samr.h"
#include "../libds/common/flags.h"
#include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index 3380d47..00dfefe 100644
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "dbwrap.h"
#include "libcli/security/privileges_private.h"
+#include "../libcli/security/security.h"
#define PRIVPREFIX "PRIV_"
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 4c84628..9ceba10 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
#define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
SECINFO_DACL|SECINFO_SACL|\
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 3c19e77..59be365 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../libcli/security/security.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "dbwrap.h"
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 6a97b60..568a7ee 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "smbldap.h"
#include "secrets.h"
+#include "../libcli/security/security.h"
/* Try not to hit the up or down server forever */
diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 5ff7961..7f1e916 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "tldap.h"
#include "tldap_util.h"
+#include "../libcli/security/security.h"
bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
int *num_values, DATA_BLOB **values)
diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c
index 680dd29..81def87 100644
--- a/source3/lib/util_nttoken.c
+++ b/source3/lib/util_nttoken.c
@@ -26,7 +26,7 @@
/* function(s) moved from auth/auth_util.c to minimize linker deps */
#include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/****************************************************************************
Duplicate a SID token.
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index 6c16fea..13032b8 100644
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "libcli/security/security.h"
/* Map generic access rights to object specific rights. This technique is
used to give meaning to assigning read, write, execute and all access to
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 9b95809..57cb3a9 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "../libcli/security/security.h"
#if defined(WITH_WINBIND)
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 32138a7..c1af5b5 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -28,6 +28,7 @@
#include "libads/dns.h"
#include "../libds/common/flags.h"
#include "smbldap.h"
+#include "../libcli/security/security.h"
#ifdef HAVE_LDAP
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 375a2d3..45bef57 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -25,6 +25,7 @@
#include "registry/reg_backend_db.h"
#include "registry/reg_api_util.h"
#include "registry/reg_init_basic.h"
+#include "../libcli/security/security.h"
/****************************************************************
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 28b2f6c..4249451 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -35,7 +35,7 @@
#include "secrets.h"
#include "rpc_client/init_lsa.h"
#include "krb5_env.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 6e416af..a464a00 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -28,7 +28,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "../librpc/gen_ndr/cli_netlogon.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/**
* Fix up the delta, dealing with encryption issues so that the final
diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index a837ecd..9d72194 100644
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "libnet/libnet_samsync.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
/* Convert a struct samu_DELTA to a struct samu. */
#define STRING_CHANGED (old_string && !new_string) ||\
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 002200d..32be011 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "fake_file.h"
+#include "../libcli/security/security.h"
NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
{
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 2150768..369e037 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -28,6 +28,7 @@
#include "libsmb_internal.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "rpc_client/cli_lsarpc.h"
+#include "libcli/security/security.h"
/*
* Check a server for being alive and well.
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index bc329bf..7086808 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -27,8 +27,7 @@
#include "libsmb_internal.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "rpc_client/cli_lsarpc.h"
-#include "../libcli/security/dom_sid.h"
-
+#include "../libcli/security/security.h"
/*
* Find an lsa pipe handle associated with a cli struct.
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 45354f1..2e7a9c6 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -23,6 +23,7 @@
#include "includes.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list