diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-17 22:04:24 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 00:44:26 +0200 |
| commit | 3b529d50be5613f37cf853714ecf78887df1d01b (patch) | |
| tree | d3253ac410fbc74898d8a6543569670b68d2f511 /source3/auth | |
| parent | 2deff342b949ef7f91134115aa77c4051e2a4c33 (diff) | |
| download | samba-3b529d50be5613f37cf853714ecf78887df1d01b.tar.gz samba-3b529d50be5613f37cf853714ecf78887df1d01b.tar.bz2 samba-3b529d50be5613f37cf853714ecf78887df1d01b.zip | |
s3-rpc_misc: clean out include/rpc_misc.h.
Well known rids don't really belong into an rpc header, just use the ones
defined in security.idl.
Guenther
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 2 | ||||
| -rw-r--r-- | source3/auth/token_util.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 5e39dca60a..1f83381606 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -697,7 +697,7 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ser return NT_STATUS_NO_MEMORY; } - sid_compose(&guest_sid, get_global_sam_sid(), DOMAIN_USER_RID_GUEST); + sid_compose(&guest_sid, get_global_sam_sid(), DOMAIN_RID_GUEST); become_root(); ret = pdb_getsampwsid(sampass, &guest_sid); diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index cf4a54143d..d60d929482 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -189,7 +189,7 @@ static NTSTATUS add_builtin_administrators(struct nt_user_token *token, } else { sid_copy(&domadm, dom_sid); } - sid_append_rid( &domadm, DOMAIN_GROUP_RID_ADMINS ); + sid_append_rid( &domadm, DOMAIN_RID_ADMINS ); /* Add Administrators if the user beloongs to Domain Admins */ @@ -280,7 +280,7 @@ NTSTATUS create_builtin_users(const DOM_SID *dom_sid) /* add domain users */ if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER)) - && sid_compose(&dom_users, dom_sid, DOMAIN_GROUP_RID_USERS)) + && sid_compose(&dom_users, dom_sid, DOMAIN_RID_USERS)) { status = add_sid_to_builtin(&global_sid_Builtin_Users, &dom_users); @@ -309,7 +309,7 @@ NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid) /* add domain admins */ if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER)) - && sid_compose(&dom_admins, dom_sid, DOMAIN_GROUP_RID_ADMINS)) + && sid_compose(&dom_admins, dom_sid, DOMAIN_RID_ADMINS)) { status = add_sid_to_builtin(&global_sid_Builtin_Administrators, &dom_admins); @@ -765,7 +765,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, sid_copy(&group_sids[0], &user_sid); sid_split_rid(&group_sids[0], &dummy); - sid_append_rid(&group_sids[0], DOMAIN_GROUP_RID_USERS); + sid_append_rid(&group_sids[0], DOMAIN_RID_USERS); if (!sid_to_gid(&group_sids[0], gid)) { DEBUG(1, ("sid_to_gid(%s) failed\n", |