diff options
| author | Volker Lendecke <vl@samba.org> | 2009-04-18 16:58:24 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-04-19 09:27:15 +0200 |
| commit | bf196df52ff62154ecbcdf7800c7c8b058e325bc (patch) | |
| tree | 32d843cfef4a6eeb09c609840527bdc4ba1279ba /source3 | |
| parent | 386511b8e12672ec68f09838ddf6e36b7fddae04 (diff) | |
| download | samba-bf196df52ff62154ecbcdf7800c7c8b058e325bc.tar.gz samba-bf196df52ff62154ecbcdf7800c7c8b058e325bc.tar.bz2 samba-bf196df52ff62154ecbcdf7800c7c8b058e325bc.zip | |
Remove flag "builtin_domain" from samr_info
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 7246997462..e3dc5f4b9c 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -73,7 +73,6 @@ typedef struct disp_info { struct samr_info { /* for use by the \PIPE\samr policy */ DOM_SID sid; - bool builtin_domain; /* Quick flag to check if this is the builtin domain. */ uint32 status; /* some sort of flag. best to record it. comes from opnum 0x39 */ uint32 acc_granted; DISP_INFO *disp_info; @@ -394,10 +393,8 @@ static struct samr_info *get_samr_info_by_sid(TALLOC_CTX *mem_ctx, if (psid) { sid_copy( &info->sid, psid); - info->builtin_domain = sid_check_is_builtin(psid); } else { DEBUG(10,("get_samr_info_by_sid: created new info for NULL sid.\n")); - info->builtin_domain = False; } info->disp_info = get_samr_dispinfo_by_sid(psid); @@ -985,7 +982,7 @@ NTSTATUS _samr_EnumDomainUsers(pipes_struct *p, DEBUG(5,("_samr_EnumDomainUsers: %d\n", __LINE__)); - if (info->builtin_domain) { + if (sid_check_is_builtin(&info->sid)) { /* No users in builtin. */ *r->out.resume_handle = *r->in.resume_handle; DEBUG(5,("_samr_EnumDomainUsers: No users in BUILTIN\n")); @@ -1124,7 +1121,7 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p, DEBUG(5,("_samr_EnumDomainGroups: %d\n", __LINE__)); - if (info->builtin_domain) { + if (sid_check_is_builtin(&info->sid)) { /* No groups in builtin. */ *r->out.resume_handle = *r->in.resume_handle; DEBUG(5,("_samr_EnumDomainGroups: No groups in BUILTIN\n")); @@ -1467,7 +1464,7 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p, if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info)) return NT_STATUS_INVALID_HANDLE; - if (info->builtin_domain) { + if (sid_check_is_builtin(&info->sid)) { DEBUG(5,("_samr_QueryDisplayInfo: Nothing in BUILTIN\n")); return NT_STATUS_OK; } |