[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri May 21 02:42:24 MDT 2010
The branch, master has been updated
via cba7f8b... s3:dom_sid Global replace of DOM_SID with struct dom_sid
from a92b653... s3:passdb Remove use of uint8 uint16 and uint32 in favour of C99 types
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cba7f8b8273e661d3c43652900d93e5a8eab4e5f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 21 11:25:01 2010 +1000
s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to,
and removes one more of the old-style named structures, and
the need to know that is is just an alias for struct dom_sid.
Andrew Bartlett
Signed-off-by: Günther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
examples/pdb/test.c | 2 +-
libgpo/gpo_ldap.c | 10 +-
source3/auth/auth_util.c | 20 +-
source3/auth/server_info.c | 10 +-
source3/auth/token_util.c | 48 ++--
source3/groupdb/mapping.c | 48 ++--
source3/groupdb/mapping.h | 18 +-
source3/groupdb/mapping_tdb.c | 48 ++--
source3/include/ads_protos.h | 14 +-
source3/include/auth.h | 2 +-
source3/include/mapping.h | 2 +-
source3/include/nss_info.h | 4 +-
source3/include/ntquotas.h | 2 +-
source3/include/passdb.h | 50 ++--
source3/include/proto.h | 296 ++++++++++++------------
source3/include/secrets.h | 2 +-
source3/include/smb.h | 61 +++---
source3/include/smbldap.h | 2 +-
source3/include/trans2.h | 2 +-
source3/lib/afs.c | 2 +-
source3/lib/netapi/samr.c | 2 +-
source3/lib/netapi/user.c | 2 +-
source3/lib/privileges.c | 30 ++--
source3/lib/secdesc.c | 22 +-
source3/lib/sharesec.c | 2 +-
source3/lib/substitute.c | 2 +-
source3/lib/util_nttoken.c | 4 +-
source3/lib/util_sid.c | 128 +++++-----
source3/lib/winbind_util.c | 46 ++--
source3/libads/ldap.c | 44 ++--
source3/libads/ldap_utils.c | 2 +-
source3/libgpo/gpo_proto.h | 4 +-
source3/libgpo/gpo_reg.c | 14 +-
source3/libnet/libnet_samsync_passdb.c | 16 +-
source3/libsmb/clidgram.c | 2 +-
source3/libsmb/cliquota.c | 4 +-
source3/libsmb/libsmb_xattr.c | 24 +-
source3/libsmb/samlogon_cache.c | 8 +-
source3/libsmb/trustdom_cache.c | 8 +-
source3/libsmb/trusts_util.c | 4 +-
source3/modules/nfs4_acls.c | 16 +-
source3/modules/onefs_acl.c | 18 +-
source3/modules/vfs_afsacl.c | 20 +-
source3/passdb/lookup_sid.c | 52 ++--
source3/passdb/machine_sid.c | 22 +-
source3/passdb/passdb.c | 4 +-
source3/passdb/pdb_ads.c | 56 +++---
source3/passdb/pdb_compat.c | 8 +-
source3/passdb/pdb_get_set.c | 22 +-
source3/passdb/pdb_interface.c | 88 ++++----
source3/passdb/pdb_ldap.c | 102 ++++----
source3/passdb/pdb_smbpasswd.c | 2 +-
source3/passdb/pdb_tdb.c | 2 +-
source3/passdb/pdb_wbc_sam.c | 40 ++--
source3/passdb/secrets.c | 4 +-
source3/passdb/util_builtin.c | 6 +-
source3/passdb/util_unixsids.c | 20 +-
source3/passdb/util_wellknown.c | 14 +-
source3/printing/nt_printing.c | 12 +-
source3/rpc_client/cli_lsarpc.c | 20 +-
source3/rpc_client/cli_lsarpc.h | 10 +-
source3/rpc_server/srv_lsa_nt.c | 34 ++--
source3/rpc_server/srv_samr_nt.c | 50 ++--
source3/rpc_server/srv_spoolss_util.c | 4 +-
source3/rpcclient/cmd_lsarpc.c | 30 ++--
source3/rpcclient/cmd_samr.c | 8 +-
source3/rpcclient/rpcclient.c | 2 +-
source3/smbd/ntquotas.c | 6 +-
source3/smbd/nttrans.c | 6 +-
source3/smbd/posix_acls.c | 38 ++--
source3/smbd/service.c | 4 +-
source3/smbd/share_access.c | 2 +-
source3/utils/net.c | 8 +-
source3/utils/net.h | 4 +-
source3/utils/net_ads.c | 4 +-
source3/utils/net_groupmap.c | 28 ++--
source3/utils/net_idmap.c | 2 +-
source3/utils/net_lookup.c | 4 +-
source3/utils/net_printing.c | 2 +-
source3/utils/net_proto.h | 52 ++--
source3/utils/net_rpc.c | 126 +++++-----
source3/utils/net_rpc_audit.c | 10 +-
source3/utils/net_rpc_join.c | 2 +-
source3/utils/net_rpc_printer.c | 22 +-
source3/utils/net_rpc_registry.c | 20 +-
source3/utils/net_rpc_rights.c | 22 +-
source3/utils/net_rpc_samsync.c | 10 +-
source3/utils/net_rpc_service.c | 16 +-
source3/utils/net_sam.c | 38 ++--
source3/utils/net_usershare.c | 2 +-
source3/utils/net_util.c | 4 +-
source3/utils/netlookup.c | 6 +-
source3/utils/pdbedit.c | 16 +-
source3/utils/profiles.c | 4 +-
source3/utils/sharesec.c | 4 +-
source3/utils/smbcacls.c | 20 +-
source3/utils/smbcquotas.c | 6 +-
source3/winbindd/idmap_ad.c | 8 +-
source3/winbindd/idmap_adex/cell_util.c | 2 +-
source3/winbindd/idmap_adex/domain_util.c | 2 +-
source3/winbindd/idmap_adex/gc_util.c | 4 +-
source3/winbindd/idmap_adex/idmap_adex.c | 4 +-
source3/winbindd/idmap_adex/idmap_adex.h | 16 +-
source3/winbindd/idmap_adex/likewise_cell.c | 2 +-
source3/winbindd/idmap_adex/provider_unified.c | 20 +-
source3/winbindd/idmap_hash/idmap_hash.c | 10 +-
source3/winbindd/idmap_ldap.c | 4 +-
source3/winbindd/idmap_tdb.c | 4 +-
source3/winbindd/idmap_util.c | 8 +-
source3/winbindd/nss_info.c | 2 +-
source3/winbindd/nss_info_template.c | 2 +-
source3/winbindd/winbindd.h | 36 ++--
source3/winbindd/winbindd_ads.c | 48 ++--
source3/winbindd/winbindd_async.c | 6 +-
source3/winbindd/winbindd_cache.c | 64 +++---
source3/winbindd/winbindd_creds.c | 8 +-
source3/winbindd/winbindd_pam.c | 10 +-
source3/winbindd/winbindd_passdb.c | 28 ++--
source3/winbindd/winbindd_proto.h | 48 ++--
source3/winbindd/winbindd_reconnect.c | 18 +-
source3/winbindd/winbindd_rpc.c | 30 ++--
source3/winbindd/winbindd_util.c | 24 +-
source4/torture/unix/whoami.c | 2 +-
testsuite/printing/psec.c | 6 +-
testsuite/smbd/se_access_check_utils.c | 6 +-
125 files changed, 1290 insertions(+), 1297 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/pdb/test.c b/examples/pdb/test.c
index b5ddefc..568b448 100644
--- a/examples/pdb/test.c
+++ b/examples/pdb/test.c
@@ -67,7 +67,7 @@ static NTSTATUS testsam_getsampwnam (struct pdb_methods *methods, struct samu *u
Search by sid
**************************************************************************/
-static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, struct samu *user, const DOM_SID *sid)
+static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, struct samu *user, const struct dom_sid *sid)
{
DEBUG(10, ("testsam_getsampwsid called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index fe14c5e..66e90fb 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -622,11 +622,11 @@ ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads,
NT_USER_TOKEN **token)
{
ADS_STATUS status;
- DOM_SID object_sid;
- DOM_SID primary_group_sid;
- DOM_SID *ad_token_sids;
+ struct dom_sid object_sid;
+ struct dom_sid primary_group_sid;
+ struct dom_sid *ad_token_sids;
size_t num_ad_token_sids = 0;
- DOM_SID *token_sids;
+ struct dom_sid *token_sids;
size_t num_token_sids = 0;
NT_USER_TOKEN *new_token = NULL;
int i;
@@ -638,7 +638,7 @@ ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads,
return status;
}
- token_sids = TALLOC_ARRAY(mem_ctx, DOM_SID, 1);
+ token_sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, 1);
ADS_ERROR_HAVE_NO_MEMORY(token_sids);
status = ADS_ERROR_NT(add_sid_to_array_unique(mem_ctx,
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 34c8190..ad454b6 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -35,7 +35,7 @@
****************************************************************************/
static void sort_sid_array_for_smbd(struct auth_serversupplied_info *result,
- const DOM_SID *pgroup_sid)
+ const struct dom_sid *pgroup_sid)
{
unsigned int i;
@@ -504,7 +504,7 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
for (i=1; i<server_info->ptok->num_sids; i++) {
gid_t gid;
- DOM_SID *sid = &server_info->ptok->user_sids[i];
+ struct dom_sid *sid = &server_info->ptok->user_sids[i];
if (!sid_to_gid(sid, &gid)) {
DEBUG(10, ("Could not convert SID %s to gid, "
@@ -573,7 +573,7 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
gid_t *gids;
char *qualified_name = NULL;
TALLOC_CTX *mem_ctx = NULL;
- DOM_SID u_sid;
+ struct dom_sid u_sid;
enum lsa_SidType type;
struct auth_serversupplied_info *result;
@@ -689,7 +689,7 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ser
{
NTSTATUS status;
struct samu *sampass = NULL;
- DOM_SID guest_sid;
+ struct dom_sid guest_sid;
bool ret;
static const char zeros[16] = {0, };
fstring tmp;
@@ -1052,8 +1052,8 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
const char *nt_domain;
const char *nt_username;
struct samu *sam_account = NULL;
- DOM_SID user_sid;
- DOM_SID group_sid;
+ struct dom_sid user_sid;
+ struct dom_sid group_sid;
bool username_was_mapped;
uid_t uid = (uid_t)-1;
@@ -1301,8 +1301,8 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
const char *nt_domain;
const char *nt_username;
struct samu *sam_account = NULL;
- DOM_SID user_sid;
- DOM_SID group_sid;
+ struct dom_sid user_sid;
+ struct dom_sid group_sid;
bool username_was_mapped;
uint32_t i;
@@ -1489,7 +1489,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
/* Create a 'combined' list of all SIDs we might want in the SD */
result->num_sids = info->num_sids - 2;
- result->sids = talloc_array(result, DOM_SID, result->num_sids);
+ result->sids = talloc_array(result, struct dom_sid, result->num_sids);
if (result->sids == NULL) {
TALLOC_FREE(result);
return NT_STATUS_NO_MEMORY;
@@ -1537,7 +1537,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
bool is_trusted_domain(const char* dom_name)
{
- DOM_SID trustdom_sid;
+ struct dom_sid trustdom_sid;
bool ret;
/* no trusted domains for a standalone server */
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 767ae5e..9d593fa 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -60,9 +60,9 @@ struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
********************************************************************/
static NTSTATUS nt_token_to_group_list(TALLOC_CTX *mem_ctx,
- const DOM_SID *domain_sid,
+ const struct dom_sid *domain_sid,
size_t num_sids,
- const DOM_SID *sids,
+ const struct dom_sid *sids,
int *numgroups,
struct samr_RidWithAttribute **pgids)
{
@@ -99,9 +99,9 @@ static NTSTATUS serverinfo_to_SamInfo_base(TALLOC_CTX *mem_ctx,
{
struct samu *sampw;
struct samr_RidWithAttribute *gids = NULL;
- const DOM_SID *user_sid = NULL;
- const DOM_SID *group_sid = NULL;
- DOM_SID domain_sid;
+ const struct dom_sid *user_sid = NULL;
+ const struct dom_sid *group_sid = NULL;
+ struct dom_sid domain_sid;
uint32 user_rid, group_rid;
NTSTATUS status;
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 8e710fd..d2a03b4 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -30,7 +30,7 @@
Check for a SID in an NT_USER_TOKEN
****************************************************************************/
-bool nt_token_check_sid ( const DOM_SID *sid, const NT_USER_TOKEN *token )
+bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token )
{
int i;
@@ -47,7 +47,7 @@ bool nt_token_check_sid ( const DOM_SID *sid, const NT_USER_TOKEN *token )
bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
{
- DOM_SID domain_sid;
+ struct dom_sid domain_sid;
/* if we are a domain member, the get the domain SID, else for
a DC or standalone server, use our own SID */
@@ -78,7 +78,7 @@ bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
NT_USER_TOKEN *get_root_nt_token( void )
{
struct nt_user_token *token, *for_cache;
- DOM_SID u_sid, g_sid;
+ struct dom_sid u_sid, g_sid;
struct passwd *pw;
void *cache_data;
@@ -124,7 +124,7 @@ NT_USER_TOKEN *get_root_nt_token( void )
* Add alias SIDs from memberships within the partially created token SID list
*/
-NTSTATUS add_aliases(const DOM_SID *domain_sid,
+NTSTATUS add_aliases(const struct dom_sid *domain_sid,
struct nt_user_token *token)
{
uint32 *aliases;
@@ -151,7 +151,7 @@ NTSTATUS add_aliases(const DOM_SID *domain_sid,
}
for (i=0; i<num_aliases; i++) {
- DOM_SID alias_sid;
+ struct dom_sid alias_sid;
sid_compose(&alias_sid, domain_sid, aliases[i]);
status = add_sid_to_array_unique(token, &alias_sid,
&token->user_sids,
@@ -171,9 +171,9 @@ done:
*******************************************************************/
static NTSTATUS add_builtin_administrators(struct nt_user_token *token,
- const DOM_SID *dom_sid)
+ const struct dom_sid *dom_sid)
{
- DOM_SID domadm;
+ struct dom_sid domadm;
NTSTATUS status;
/* nothing to do if we aren't in a domain */
@@ -215,7 +215,7 @@ static NTSTATUS add_builtin_administrators(struct nt_user_token *token,
static NTSTATUS create_builtin(uint32 rid)
{
NTSTATUS status = NT_STATUS_OK;
- DOM_SID sid;
+ struct dom_sid sid;
gid_t gid;
if (!sid_compose(&sid, &global_sid_Builtin, rid)) {
@@ -238,8 +238,8 @@ static NTSTATUS create_builtin(uint32 rid)
* @param[in] dom_sid sid to add as a member of builtin_sid.
* @return Normal NTSTATUS return
*/
-static NTSTATUS add_sid_to_builtin(const DOM_SID *builtin_sid,
- const DOM_SID *dom_sid)
+static NTSTATUS add_sid_to_builtin(const struct dom_sid *builtin_sid,
+ const struct dom_sid *dom_sid)
{
NTSTATUS status = NT_STATUS_OK;
@@ -267,10 +267,10 @@ static NTSTATUS add_sid_to_builtin(const DOM_SID *builtin_sid,
/*******************************************************************
*******************************************************************/
-NTSTATUS create_builtin_users(const DOM_SID *dom_sid)
+NTSTATUS create_builtin_users(const struct dom_sid *dom_sid)
{
NTSTATUS status;
- DOM_SID dom_users;
+ struct dom_sid dom_users;
status = create_builtin(BUILTIN_RID_USERS);
if ( !NT_STATUS_IS_OK(status) ) {
@@ -292,10 +292,10 @@ NTSTATUS create_builtin_users(const DOM_SID *dom_sid)
/*******************************************************************
*******************************************************************/
-NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid)
+NTSTATUS create_builtin_administrators(const struct dom_sid *dom_sid)
{
NTSTATUS status;
- DOM_SID dom_admins, root_sid;
+ struct dom_sid dom_admins, root_sid;
fstring root_name;
enum lsa_SidType type;
TALLOC_CTX *ctx;
@@ -341,16 +341,16 @@ NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid)
*******************************************************************/
struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
- const DOM_SID *user_sid,
+ const struct dom_sid *user_sid,
bool is_guest,
int num_groupsids,
- const DOM_SID *groupsids)
+ const struct dom_sid *groupsids)
{
struct nt_user_token *result = NULL;
int i;
NTSTATUS status;
gid_t gid;
- DOM_SID dom_sid;
+ struct dom_sid dom_sid;
DEBUG(10, ("Create local NT token for %s\n",
sid_string_dbg(user_sid)));
@@ -585,11 +585,11 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
{
NTSTATUS result = NT_STATUS_NO_SUCH_USER;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
- DOM_SID user_sid;
+ struct dom_sid user_sid;
enum lsa_SidType type;
gid_t *gids;
- DOM_SID *group_sids;
- DOM_SID unix_group_sid;
+ struct dom_sid *group_sids;
+ struct dom_sid unix_group_sid;
size_t num_group_sids;
size_t num_gids;
size_t i;
@@ -715,7 +715,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
}
if (num_group_sids) {
- group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
+ group_sids = TALLOC_ARRAY(tmp_ctx, struct dom_sid, num_group_sids);
if (group_sids == NULL) {
DEBUG(1, ("TALLOC_ARRAY failed\n"));
result = NT_STATUS_NO_MEMORY;
@@ -756,7 +756,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
}
num_group_sids = 1;
- group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
+ group_sids = TALLOC_ARRAY(tmp_ctx, struct dom_sid, num_group_sids);
if (group_sids == NULL) {
DEBUG(1, ("TALLOC_ARRAY failed\n"));
result = NT_STATUS_NO_MEMORY;
@@ -829,7 +829,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
member of a particular group.
***************************************************************************/
-bool user_in_group_sid(const char *username, const DOM_SID *group_sid)
+bool user_in_group_sid(const char *username, const struct dom_sid *group_sid)
{
NTSTATUS status;
uid_t uid;
@@ -858,7 +858,7 @@ bool user_in_group_sid(const char *username, const DOM_SID *group_sid)
bool user_in_group(const char *username, const char *groupname)
{
TALLOC_CTX *mem_ctx = talloc_stackframe();
- DOM_SID group_sid;
+ struct dom_sid group_sid;
bool ret;
ret = lookup_name(mem_ctx, groupname, LOOKUP_NAME_ALL,
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index da5a866..4cfe995 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -65,8 +65,8 @@ NTSTATUS add_initial_entry(gid_t gid, const char *sid, enum lsa_SidType sid_name
return pdb_add_group_mapping_entry(&map);
}
-static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
- DOM_SID **sids, size_t *num)
+static NTSTATUS alias_memberships(const struct dom_sid *members, size_t num_members,
+ struct dom_sid **sids, size_t *num)
{
size_t i;
@@ -82,8 +82,8 @@ static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
}
struct aliasmem_closure {
- const DOM_SID *alias;
- DOM_SID **sids;
+ const struct dom_sid *alias;
+ struct dom_sid **sids;
size_t *num;
};
@@ -101,7 +101,7 @@ struct aliasmem_closure {
/* get a domain group from it's SID */
-bool get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map)
+bool get_domain_group_from_sid(struct dom_sid sid, GROUP_MAP *map)
{
struct group *grp;
bool ret;
@@ -381,7 +381,7 @@ int smb_delete_user_group(const char *unix_group, const char *unix_user)
NTSTATUS pdb_default_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
- DOM_SID sid)
+ struct dom_sid sid)
{
if (!init_group_mapping()) {
DEBUG(0,("failed to initialize group mapping\n"));
@@ -436,7 +436,7 @@ NTSTATUS pdb_default_update_group_mapping_entry(struct pdb_methods *methods,
}
NTSTATUS pdb_default_delete_group_mapping_entry(struct pdb_methods *methods,
- DOM_SID sid)
+ struct dom_sid sid)
{
if (!init_group_mapping()) {
DEBUG(0,("failed to initialize group mapping\n"));
@@ -447,7 +447,7 @@ NTSTATUS pdb_default_delete_group_mapping_entry(struct pdb_methods *methods,
}
NTSTATUS pdb_default_enum_group_mapping(struct pdb_methods *methods,
- const DOM_SID *sid, enum lsa_SidType sid_name_use,
+ const struct dom_sid *sid, enum lsa_SidType sid_name_use,
GROUP_MAP **pp_rmap, size_t *p_num_entries,
bool unix_only)
{
@@ -462,7 +462,7 @@ NTSTATUS pdb_default_enum_group_mapping(struct pdb_methods *methods,
NTSTATUS pdb_default_create_alias(struct pdb_methods *methods,
const char *name, uint32 *rid)
{
- DOM_SID sid;
+ struct dom_sid sid;
enum lsa_SidType type;
uint32 new_rid;
gid_t gid;
@@ -521,13 +521,13 @@ NTSTATUS pdb_default_create_alias(struct pdb_methods *methods,
}
NTSTATUS pdb_default_delete_alias(struct pdb_methods *methods,
- const DOM_SID *sid)
+ const struct dom_sid *sid)
{
return pdb_delete_group_mapping_entry(*sid);
}
NTSTATUS pdb_default_get_aliasinfo(struct pdb_methods *methods,
- const DOM_SID *sid,
+ const struct dom_sid *sid,
struct acct_info *info)
{
GROUP_MAP map;
@@ -550,7 +550,7 @@ NTSTATUS pdb_default_get_aliasinfo(struct pdb_methods *methods,
}
NTSTATUS pdb_default_set_aliasinfo(struct pdb_methods *methods,
- const DOM_SID *sid,
+ const struct dom_sid *sid,
struct acct_info *info)
{
GROUP_MAP map;
@@ -565,7 +565,7 @@ NTSTATUS pdb_default_set_aliasinfo(struct pdb_methods *methods,
}
NTSTATUS pdb_default_add_aliasmem(struct pdb_methods *methods,
- const DOM_SID *alias, const DOM_SID *member)
+ const struct dom_sid *alias, const struct dom_sid *member)
{
if (!init_group_mapping()) {
DEBUG(0,("failed to initialize group mapping\n"));
@@ -575,7 +575,7 @@ NTSTATUS pdb_default_add_aliasmem(struct pdb_methods *methods,
}
NTSTATUS pdb_default_del_aliasmem(struct pdb_methods *methods,
- const DOM_SID *alias, const DOM_SID *member)
+ const struct dom_sid *alias, const struct dom_sid *member)
{
if (!init_group_mapping()) {
DEBUG(0,("failed to initialize group mapping\n"));
@@ -585,8 +585,8 @@ NTSTATUS pdb_default_del_aliasmem(struct pdb_methods *methods,
}
NTSTATUS pdb_default_enum_aliasmem(struct pdb_methods *methods,
- const DOM_SID *alias, TALLOC_CTX *mem_ctx,
- DOM_SID **pp_members, size_t *p_num_members)
+ const struct dom_sid *alias, TALLOC_CTX *mem_ctx,
+ struct dom_sid **pp_members, size_t *p_num_members)
{
if (!init_group_mapping()) {
DEBUG(0,("failed to initialize group mapping\n"));
@@ -598,13 +598,13 @@ NTSTATUS pdb_default_enum_aliasmem(struct pdb_methods *methods,
NTSTATUS pdb_default_alias_memberships(struct pdb_methods *methods,
TALLOC_CTX *mem_ctx,
- const DOM_SID *domain_sid,
- const DOM_SID *members,
+ const struct dom_sid *domain_sid,
+ const struct dom_sid *members,
size_t num_members,
uint32 **pp_alias_rids,
size_t *p_num_alias_rids)
{
- DOM_SID *alias_sids;
+ struct dom_sid *alias_sids;
size_t i, num_alias_sids;
NTSTATUS result;
@@ -650,7 +650,7 @@ NTSTATUS pdb_default_alias_memberships(struct pdb_methods *methods,
*********************************************************************/
NTSTATUS pdb_nop_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
- DOM_SID sid)
+ struct dom_sid sid)
{
return NT_STATUS_UNSUCCESSFUL;
}
@@ -680,7 +680,7 @@ NTSTATUS pdb_nop_update_group_mapping_entry(struct pdb_methods *methods,
}
NTSTATUS pdb_nop_delete_group_mapping_entry(struct pdb_methods *methods,
- DOM_SID sid)
+ struct dom_sid sid)
{
return NT_STATUS_UNSUCCESSFUL;
}
@@ -696,7 +696,7 @@ NTSTATUS pdb_nop_enum_group_mapping(struct pdb_methods *methods,
/****************************************************************************
These need to be redirected through pdb_interface.c
****************************************************************************/
-bool pdb_get_dom_grp_info(const DOM_SID *sid, struct acct_info *info)
+bool pdb_get_dom_grp_info(const struct dom_sid *sid, struct acct_info *info)
{
GROUP_MAP map;
bool res;
@@ -714,7 +714,7 @@ bool pdb_get_dom_grp_info(const DOM_SID *sid, struct acct_info *info)
return True;
--
Samba Shared Repository
More information about the samba-cvs
mailing list