SA_RIGHT_USER_CHANGE_PASSWORD | \
SA_RIGHT_USER_SET_LOC_COM )
+#define DISP_INFO_CACHE_TIMEOUT 30
+
extern rid_name domain_group_rids[];
extern rid_name domain_alias_rids[];
extern rid_name builtin_alias_rids[];
typedef struct disp_info {
+ struct disp_info *next, *prev;
+ TALLOC_CTX *mem_ctx;
+ DOM_SID sid; /* identify which domain this is. */
struct pdb_search *users; /* querydispinfo 1 and 4 */
struct pdb_search *machines; /* querydispinfo 2 */
struct pdb_search *groups; /* querydispinfo 3 and 5, enumgroups */
uint16 enum_acb_mask;
struct pdb_search *enum_users; /* enumusers with a mask */
+
+ smb_event_id_t di_cache_timeout_event; /* cache idle timeout handler. */
} DISP_INFO;
+/* We keep a static list of these by SID as modern clients close down
+ all resources between each request in a complete enumeration. */
+
+static DISP_INFO *disp_info_list;
+
struct samr_info {
/* for use by the \PIPE\samr policy */
DOM_SID sid;
uint32 acc_granted;
uint16 acb_mask;
BOOL only_machines;
- DISP_INFO disp_info;
-
+ DISP_INFO *disp_info;
TALLOC_CTX *mem_ctx;
};
return NT_STATUS_ACCESS_DENIED;
}
+/*******************************************************************
+ Fetch or create a dispinfo struct.
+********************************************************************/
+
+static DISP_INFO *get_samr_dispinfo_by_sid(DOM_SID *psid, const char *sid_str)
+{
+ TALLOC_CTX *mem_ctx;
+ DISP_INFO *dpi;
+
+ for (dpi = disp_info_list; dpi; dpi = dpi->next) {
+ if (sid_equal(psid, &dpi->sid)) {
+ return dpi;
+ }
+ }
+
+ /* This struct is never free'd - I'm using talloc so we
+ can get a list out of smbd using smbcontrol. There will
+ be one of these per SID we're authorative for. JRA. */
+
+ mem_ctx = talloc_init("DISP_INFO for domain sid %s", sid_str);
+
+ if ((dpi = TALLOC_ZERO_P(mem_ctx, DISP_INFO)) == NULL)
+ return NULL;
+
+ dpi->mem_ctx = mem_ctx;
+ if (psid) {
+ sid_copy( &dpi->sid, psid);
+ }
+
+ DLIST_ADD(disp_info_list, dpi);
+
+ return dpi;
+}
/*******************************************************************
Create a samr_info struct.
DEBUG(10,("get_samr_info_by_sid: created new info for NULL sid.\n"));
}
info->mem_ctx = mem_ctx;
+
+ info->disp_info = get_samr_dispinfo_by_sid(psid, sid_str);
+
+ if (!info->disp_info) {
+ talloc_destroy(mem_ctx);
+ return NULL;
+ }
+
return info;
}
/*******************************************************************
- Function to free the per handle data.
+ Function to free the per SID data.
********************************************************************/
+static void free_samr_cache(DISP_INFO *disp_info)
+{
+ DEBUG(10,("free_samr_cache: deleting cache\n"));
+
+ if (disp_info->users) {
+ DEBUG(10,("free_samr_cache: deleting users cache\n"));
+ pdb_search_destroy(disp_info->users);
+ disp_info->users = NULL;
+ }
+ if (disp_info->machines) {
+ DEBUG(10,("free_samr_cache: deleting machines cache\n"));
+ pdb_search_destroy(disp_info->machines);
+ disp_info->machines = NULL;
+ }
+ if (disp_info->groups) {
+ DEBUG(10,("free_samr_cache: deleting groups cache\n"));
+ pdb_search_destroy(disp_info->groups);
+ disp_info->groups = NULL;
+ }
+ if (disp_info->aliases) {
+ DEBUG(10,("free_samr_cache: deleting aliases cache\n"));
+ pdb_search_destroy(disp_info->aliases);
+ disp_info->aliases = NULL;
+ }
+ if (disp_info->builtins) {
+ DEBUG(10,("free_samr_cache: deleting builtins cache\n"));
+ pdb_search_destroy(disp_info->builtins);
+ disp_info->builtins = NULL;
+ }
+ if (disp_info->enum_users) {
+ DEBUG(10,("free_samr_cache: deleting enum_users cache\n"));
+ pdb_search_destroy(disp_info->enum_users);
+ disp_info->enum_users = NULL;
+ }
+ disp_info->enum_acb_mask = 0;
+}
+
/*******************************************************************
Function to free the per handle data.
********************************************************************/
-static void free_samr_db(struct samr_info *info)
-{
- pdb_search_destroy(info->disp_info.users);
- info->disp_info.users = NULL;
- pdb_search_destroy(info->disp_info.machines);
- info->disp_info.machines = NULL;
- pdb_search_destroy(info->disp_info.groups);
- info->disp_info.groups = NULL;
- pdb_search_destroy(info->disp_info.aliases);
- info->disp_info.aliases = NULL;
- pdb_search_destroy(info->disp_info.builtins);
- info->disp_info.builtins = NULL;
- pdb_search_destroy(info->disp_info.enum_users);
- info->disp_info.enum_users = NULL;
-}
-
static void free_samr_info(void *ptr)
{
struct samr_info *info=(struct samr_info *) ptr;
- free_samr_db(info);
+ /* Only free the dispinfo cache if no one bothered to set up
+ a timeout. */
+
+ if (info->disp_info && info->disp_info->di_cache_timeout_event == (smb_event_id_t)0) {
+ free_samr_cache(info->disp_info);
+ }
+
talloc_destroy(info->mem_ctx);
}
+/*******************************************************************
+ Idle event handler. Throw away the disp info cache.
+ ********************************************************************/
+
+static void disp_info_cache_idle_timeout_handler(void **private_data,
+ time_t *ev_interval,
+ time_t ev_now)
+{
+ DISP_INFO *disp_info = (DISP_INFO *)(*private_data);
+
+ free_samr_cache(disp_info);
+
+ /* Remove the event. */
+ smb_unregister_idle_event(disp_info->di_cache_timeout_event);
+ disp_info->di_cache_timeout_event = (smb_event_id_t)0;
+
+ DEBUG(10,("disp_info_cache_idle_timeout_handler: caching timed out at %u\n",
+ (unsigned int)ev_now));
+}
+
+/*******************************************************************
+ Setup cache removal idle event handler.
+ ********************************************************************/
+
+static void set_disp_info_cache_timeout(DISP_INFO *disp_info, time_t secs_fromnow)
+{
+ /* Remove any pending timeout and update. */
+
+ if (disp_info->di_cache_timeout_event) {
+ smb_unregister_idle_event(disp_info->di_cache_timeout_event);
+ disp_info->di_cache_timeout_event = (smb_event_id_t)0;
+ }
+
+ DEBUG(10,("set_disp_info_cache_timeout: caching enumeration for %u seconds\n",
+ (unsigned int)secs_fromnow ));
+
+ disp_info->di_cache_timeout_event =
+ smb_register_idle_event(disp_info_cache_idle_timeout_handler,
+ disp_info,
+ secs_fromnow);
+}
+
+/*******************************************************************
+ Remove the cache removal idle event handler.
+ ********************************************************************/
+
+static void clear_disp_info_cache_timeout(DISP_INFO *disp_info)
+{
+ if (disp_info->di_cache_timeout_event) {
+ smb_unregister_idle_event(disp_info->di_cache_timeout_event);
+ disp_info->di_cache_timeout_event = (smb_event_id_t)0;
+ DEBUG(10,("clear_disp_info_cache_timeout: clearing idle event.\n"));
+ }
+}
+
+/*******************************************************************
+ Force flush any cache. We do this on any samr_set_xxx call.
+ ********************************************************************/
+
+static void force_flush_samr_cache(DISP_INFO *disp_info)
+{
+ if (disp_info) {
+ clear_disp_info_cache_timeout(disp_info);
+ free_samr_cache(disp_info);
+ }
+}
+
/*******************************************************************
Ensure password info is never given out. Paranioa... JRA.
********************************************************************/
static uint32 count_sam_users(struct disp_info *info, uint16 acct_flags)
{
struct samr_displayentry *entry;
- if (info->users == NULL)
+ if (info->users == NULL) {
info->users = pdb_search_users(acct_flags);
- if (info->users == NULL)
- return 0;
+ if (info->users == NULL) {
+ return 0;
+ }
+ }
/* Fetch the last possible entry, thus trigger an enumeration */
pdb_search_entries(info->users, 0xffffffff, 1, &entry);
+
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info, DISP_INFO_CACHE_TIMEOUT);
+
return info->users->num_entries;
}
static uint32 count_sam_groups(struct disp_info *info)
{
struct samr_displayentry *entry;
- if (info->groups == NULL)
+ if (info->groups == NULL) {
info->groups = pdb_search_groups();
- if (info->groups == NULL)
- return 0;
+ if (info->groups == NULL) {
+ return 0;
+ }
+ }
/* Fetch the last possible entry, thus trigger an enumeration */
pdb_search_entries(info->groups, 0xffffffff, 1, &entry);
+
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info, DISP_INFO_CACHE_TIMEOUT);
+
return info->groups->num_entries;
}
return NT_STATUS_NOT_IMPLEMENTED;
}
-
/*******************************************************************
********************************************************************/
static BOOL get_lsa_policy_samr_sid( pipes_struct *p, POLICY_HND *pol,
- DOM_SID *sid, uint32 *acc_granted)
+ DOM_SID *sid, uint32 *acc_granted,
+ DISP_INFO **ppdisp_info)
{
struct samr_info *info = NULL;
*sid = info->sid;
*acc_granted = info->acc_granted;
+ if (ppdisp_info) {
+ *ppdisp_info = info->disp_info;
+ }
+
return True;
}
r_u->status = NT_STATUS_OK;
/* Get the SID. */
- if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &pol_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &pol_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
-
-
DEBUG(10,("_samr_query_sec_obj: querying security on SID: %s\n", sid_to_string(str_sid, &pol_sid)));
/* Check what typ of SID is beeing queried (e.g Domain SID, User SID, Group SID) */
/* To query the security of the SAM it self an invalid SID with S-0-0 is passed to this function */
- if (pol_sid.sid_rev_num == 0)
- {
+ if (pol_sid.sid_rev_num == 0) {
DEBUG(5,("_samr_query_sec_obj: querying security on SAM\n"));
r_u->status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &sam_generic_mapping, NULL, 0);
- }
- else if (sid_equal(&pol_sid,get_global_sam_sid())) /* check if it is our domain SID */
-
- {
+ } else if (sid_equal(&pol_sid,get_global_sam_sid())) {
+ /* check if it is our domain SID */
DEBUG(5,("_samr_query_sec_obj: querying security on Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
r_u->status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0);
- }
- else if (sid_equal(&pol_sid,&global_sid_Builtin)) /* check if it is the Builtin Domain */
- {
+ } else if (sid_equal(&pol_sid,&global_sid_Builtin)) {
+ /* check if it is the Builtin Domain */
/* TODO: Builtin probably needs a different SD with restricted write access*/
DEBUG(5,("_samr_query_sec_obj: querying security on Builtin Domain with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
r_u->status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0);
- }
- else if (sid_check_is_in_our_domain(&pol_sid) ||
- sid_check_is_in_builtin(&pol_sid))
- {
+ } else if (sid_check_is_in_our_domain(&pol_sid) ||
+ sid_check_is_in_builtin(&pol_sid)) {
/* TODO: different SDs have to be generated for aliases groups and users.
Currently all three get a default user SD */
DEBUG(10,("_samr_query_sec_obj: querying security on Object with SID: %s\n", sid_to_string(str_sid, &pol_sid)));
r_u->status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping, &pol_sid, SAMR_USR_RIGHTS_WRITE_PW);
+ } else {
+ return NT_STATUS_OBJECT_TYPE_MISMATCH;
}
- else return NT_STATUS_OBJECT_TYPE_MISMATCH;
if ((r_u->buf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
return NT_STATUS_NO_MEMORY;
DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
become_root();
- if ((info->disp_info.enum_users != NULL) &&
- (info->disp_info.enum_acb_mask != q_u->acb_mask)) {
- pdb_search_destroy(info->disp_info.enum_users);
- info->disp_info.enum_users = NULL;
+
+ /* AS ROOT !!!! */
+
+ if ((info->disp_info->enum_users != NULL) &&
+ (info->disp_info->enum_acb_mask != q_u->acb_mask)) {
+ pdb_search_destroy(info->disp_info->enum_users);
+ info->disp_info->enum_users = NULL;
}
- if (info->disp_info.enum_users == NULL) {
- info->disp_info.enum_users = pdb_search_users(q_u->acb_mask);
- info->disp_info.enum_acb_mask = q_u->acb_mask;
+ if (info->disp_info->enum_users == NULL) {
+ info->disp_info->enum_users = pdb_search_users(q_u->acb_mask);
+ info->disp_info->enum_acb_mask = q_u->acb_mask;
}
- if (info->disp_info.enum_users == NULL)
+
+ if (info->disp_info->enum_users == NULL) {
+ /* END AS ROOT !!!! */
+ unbecome_root();
return NT_STATUS_ACCESS_DENIED;
- num_account = pdb_search_entries(info->disp_info.enum_users,
+ }
+
+ num_account = pdb_search_entries(info->disp_info->enum_users,
enum_context, max_entries,
&entries);
+
+ /* END AS ROOT !!!! */
+
unbecome_root();
if (num_account == 0) {
if (!NT_STATUS_IS_OK(r_u->status))
return r_u->status;
- if (max_entries <= num_account)
+ if (max_entries <= num_account) {
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
r_u->status = STATUS_MORE_ENTRIES;
+ } else {
+ clear_disp_info_cache_timeout(info->disp_info);
+ }
DEBUG(5, ("_samr_enum_dom_users: %d\n", __LINE__));
/* the domain group array is being allocated in the function below */
become_root();
- if (info->disp_info.groups == NULL)
- info->disp_info.groups = pdb_search_groups();
- unbecome_root();
- if (info->disp_info.groups == NULL)
- return NT_STATUS_ACCESS_DENIED;
+ if (info->disp_info->groups == NULL) {
+ info->disp_info->groups = pdb_search_groups();
- become_root();
- num_groups = pdb_search_entries(info->disp_info.groups, q_u->start_idx,
+ if (info->disp_info->groups == NULL) {
+ unbecome_root();
+ return NT_STATUS_ACCESS_DENIED;
+ }
+ }
+
+ num_groups = pdb_search_entries(info->disp_info->groups, q_u->start_idx,
MAX_SAM_ENTRIES, &groups);
unbecome_root();
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
+
make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name,
num_groups, groups);
sid_string_static(&info->sid)));
if (sid_check_is_domain(&info->sid))
- search = &info->disp_info.aliases;
+ search = &info->disp_info->aliases;
if (sid_check_is_builtin(&info->sid))
- search = &info->disp_info.builtins;
+ search = &info->disp_info->builtins;
if (search == NULL)
return NT_STATUS_INVALID_HANDLE;
become_root();
- if (*search == NULL)
- *search = pdb_search_aliases(&info->sid);
- unbecome_root();
- if (*search == NULL)
- return NT_STATUS_ACCESS_DENIED;
+ if (*search == NULL) {
+ *search = pdb_search_aliases(&info->sid);
+ if (*search == NULL) {
+ unbecome_root();
+ return NT_STATUS_ACCESS_DENIED;
+ }
+ }
- become_root();
num_aliases = pdb_search_entries(*search, q_u->start_idx,
MAX_SAM_ENTRIES, &aliases);
unbecome_root();
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
+
make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name,
num_aliases, aliases);
become_root();
+ /* THe following done as ROOT. Don't return without unbecome_root(). */
+
switch (q_u->switch_level) {
case 0x1:
case 0x4:
- if (info->disp_info.users == NULL)
- info->disp_info.users = pdb_search_users(ACB_NORMAL);
- if (info->disp_info.users == NULL)
- return NT_STATUS_ACCESS_DENIED;
- num_account = pdb_search_entries(info->disp_info.users,
+ if (info->disp_info->users == NULL) {
+ info->disp_info->users = pdb_search_users(ACB_NORMAL);
+ if (info->disp_info->users == NULL) {
+ unbecome_root();
+ return NT_STATUS_ACCESS_DENIED;
+ }
+ DEBUG(10,("samr_reply_query_dispinfo: starting user enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ } else {
+ DEBUG(10,("samr_reply_query_dispinfo: using cached user enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ }
+
+ num_account = pdb_search_entries(info->disp_info->users,
enum_context, max_entries,
&entries);
break;
case 0x2:
- if (info->disp_info.machines == NULL)
- info->disp_info.machines =
+ if (info->disp_info->machines == NULL) {
+ info->disp_info->machines =
pdb_search_users(ACB_WSTRUST|ACB_SVRTRUST);
- if (info->disp_info.machines == NULL)
- return NT_STATUS_ACCESS_DENIED;
- num_account = pdb_search_entries(info->disp_info.machines,
+ if (info->disp_info->machines == NULL) {
+ unbecome_root();
+ return NT_STATUS_ACCESS_DENIED;
+ }
+ DEBUG(10,("samr_reply_query_dispinfo: starting machine enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ } else {
+ DEBUG(10,("samr_reply_query_dispinfo: using cached machine enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ }
+
+ num_account = pdb_search_entries(info->disp_info->machines,
enum_context, max_entries,
&entries);
break;
case 0x3:
case 0x5:
- if (info->disp_info.groups == NULL)
- info->disp_info.groups = pdb_search_groups();
- if (info->disp_info.groups == NULL)
- return NT_STATUS_ACCESS_DENIED;
- num_account = pdb_search_entries(info->disp_info.groups,
+ if (info->disp_info->groups == NULL) {
+ info->disp_info->groups = pdb_search_groups();
+ if (info->disp_info->groups == NULL) {
+ unbecome_root();
+ return NT_STATUS_ACCESS_DENIED;
+ }
+ DEBUG(10,("samr_reply_query_dispinfo: starting group enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ } else {
+ DEBUG(10,("samr_reply_query_dispinfo: using cached group enumeration at index %u\n",
+ (unsigned int)enum_context ));
+ }
+
+ num_account = pdb_search_entries(info->disp_info->groups,
enum_context, max_entries,
&entries);
break;
default:
+ unbecome_root();
smb_panic("info class changed");
break;
}
/* calculate the total size */
total_data_size=num_account*struct_size;
- if (num_account)
+ if (num_account) {
+ /* Ensure we cache this enumeration. */
+ set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
r_u->status = STATUS_MORE_ENTRIES;
- else
+ } else {
+ clear_disp_info_cache_timeout(info->disp_info);
r_u->status = NT_STATUS_OK;
+ }
DEBUG(5, ("_samr_query_dispinfo: %d\n", __LINE__));
DEBUG(5,("_samr_query_aliasinfo: %d\n", __LINE__));
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_LOOKUP_INFO, "_samr_query_aliasinfo"))) {
return r_u->status;
ZERO_ARRAY(rid);
ZERO_ARRAY(type);
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted)) {
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted, NULL)) {
init_samr_r_lookup_names(p->mem_ctx, r_u, 0, NULL, NULL, NT_STATUS_OBJECT_TYPE_MISMATCH);
return r_u->status;
}
DEBUG(5,("_samr_lookup_rids: %d\n", __LINE__));
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &pol_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (num_rids > 1000) {
/* find the domain policy handle and get domain SID / access bits in the domain policy. */
- if ( !get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted) )
+ if ( !get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted, NULL) )
return NT_STATUS_INVALID_HANDLE;
nt_status = access_check_samr_function( acc_granted,
DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__));
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_USER_GET_GROUPS, "_samr_query_usergroups"))) {
/* AS ROOT !!! */
- num_users=count_sam_users(&info->disp_info,
+ num_users=count_sam_users(info->disp_info,
ACB_NORMAL);
- num_groups=count_sam_groups(&info->disp_info);
+ num_groups=count_sam_groups(info->disp_info);
pdb_get_account_policy(AP_TIME_TO_LOGOUT, &account_policy_temp);
u_logout = account_policy_temp;
uint32 des_access = GENERIC_RIGHTS_USER_ALL_ACCESS;
BOOL can_add_account = False;
SE_PRIV se_rights;
+ DISP_INFO *disp_info = NULL;
/* Get the domain SID stored in the domain policy */
- if (!get_lsa_policy_samr_sid(p, &dom_pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &dom_pol, &sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(nt_status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_USER, "_samr_create_user"))) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
+ /* After a "set" ensure we have no cached display info. */
+ force_flush_samr_cache(info->disp_info);
+
r_u->user_rid=pdb_get_user_rid(sam_pass);
r_u->access_granted = acc_granted;
/* find the domain policy and get the SID / access bits stored in the domain policy */
- if ( !get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted) )
+ if ( !get_lsa_policy_samr_sid(p, &domain_pol, &sid, &acc_granted, NULL) )
return NT_STATUS_INVALID_HANDLE;
status = access_check_samr_function(acc_granted,
BOOL ret;
BOOL has_enough_rights = False;
uint32 acb_info;
+ DISP_INFO *disp_info = NULL;
DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
r_u->status = NT_STATUS_OK;
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
/* observed when joining an XP client to a Samba domain */
/* ================ END SeMachineAccountPrivilege BLOCK ================ */
+ if (NT_STATUS_IS_OK(r_u->status)) {
+ force_flush_samr_cache(disp_info);
+ }
+
return r_u->status;
}
BOOL ret;
BOOL has_enough_rights = False;
uint32 acb_info;
+ DISP_INFO *disp_info = NULL;
DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
r_u->status = NT_STATUS_OK;
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
/* observed when joining XP client to Samba domain */
/* ================ END SeMachineAccountPrivilege BLOCK ================ */
+ if (NT_STATUS_IS_OK(r_u->status)) {
+ force_flush_samr_cache(disp_info);
+ }
+
return r_u->status;
}
uint32 acc_granted;
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status =
NTSTATUS result;
/* find the policy handle. open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_GET_MEMBERS, "_samr_query_groupmem"))) {
SE_PRIV se_rights;
BOOL can_add_accounts;
BOOL ret;
-
+ DISP_INFO *disp_info = NULL;
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_ADD_MEMBER, "_samr_add_aliasmem"))) {
/******** END SeAddUsers BLOCK *********/
+ if (ret) {
+ force_flush_samr_cache(disp_info);
+ }
+
return ret ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
}
SE_PRIV se_rights;
BOOL can_add_accounts;
BOOL ret;
+ DISP_INFO *disp_info = NULL;
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_REMOVE_MEMBER, "_samr_del_aliasmem"))) {
/******** END SeAddUsers BLOCK *********/
+ if (ret) {
+ force_flush_samr_cache(disp_info);
+ }
+
return ret ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
}
uint32 acc_granted;
SE_PRIV se_rights;
BOOL can_add_accounts;
+ DISP_INFO *disp_info = NULL;
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_ADD_MEMBER, "_samr_add_groupmem"))) {
}
passwd_free(&pwd);
+
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
uint32 acc_granted;
SE_PRIV se_rights;
BOOL can_add_accounts;
+ DISP_INFO *disp_info = NULL;
/*
* delete the group member named q_u->rid
*/
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_REMOVE_MEMBER, "_samr_del_groupmem"))) {
}
pdb_free_sam(&sam_pass);
+
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
uint32 acc_granted;
BOOL can_add_accounts;
BOOL ret;
+ DISP_INFO *disp_info = NULL;
DEBUG(5, ("_samr_delete_dom_user: %d\n", __LINE__));
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &user_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->user_pol, &user_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_user"))) {
if (!close_policy_hnd(p, &q_u->user_pol))
return NT_STATUS_OBJECT_NAME_INVALID;
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
SE_PRIV se_rights;
BOOL can_add_accounts;
BOOL ret;
+ DISP_INFO *disp_info = NULL;
DEBUG(5, ("samr_delete_dom_group: %d\n", __LINE__));
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->group_pol, &group_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_group"))) {
if (!close_policy_hnd(p, &q_u->group_pol))
return NT_STATUS_OBJECT_NAME_INVALID;
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
SE_PRIV se_rights;
BOOL can_add_accounts;
BOOL ret;
+ DISP_INFO *disp_info = NULL;
DEBUG(5, ("_samr_delete_dom_alias: %d\n", __LINE__));
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS, "_samr_delete_dom_alias"))) {
if (!close_policy_hnd(p, &q_u->alias_pol))
return NT_STATUS_OBJECT_NAME_INVALID;
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
SE_PRIV se_rights;
BOOL can_add_accounts;
NTSTATUS result;
+ DISP_INFO *disp_info = NULL;
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &dom_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &dom_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_GROUP, "_samr_create_dom_group"))) {
if (!create_policy_hnd(p, &r_u->pol, free_samr_info, (void *)info))
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
NTSTATUS result;
SE_PRIV se_rights;
BOOL can_add_accounts;
+ DISP_INFO *disp_info = NULL;
/* Find the policy handle. Open a policy on it. */
- if (!get_lsa_policy_samr_sid(p, &q_u->dom_pol, &dom_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->dom_pol, &dom_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_DOMAIN_CREATE_ALIAS, "_samr_create_alias"))) {
if (!create_policy_hnd(p, &r_u->alias_pol, free_samr_info, (void *)info))
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+ force_flush_samr_cache(disp_info);
+
return NT_STATUS_OK;
}
uint32 acc_granted;
BOOL ret;
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_LOOKUP_INFO, "_samr_query_groupinfo"))) {
uint32 acc_granted;
BOOL ret;
BOOL can_mod_accounts;
+ DISP_INFO *disp_info = NULL;
- if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_GROUP_SET_INFO, "_samr_set_groupinfo"))) {
/******** End SeAddUsers BLOCK *********/
+ if (ret) {
+ force_flush_samr_cache(disp_info);
+ }
+
return ret ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
}
uint32 acc_granted;
BOOL ret;
BOOL can_mod_accounts;
+ DISP_INFO *disp_info = NULL;
- if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid, &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_SET_INFO, "_samr_set_aliasinfo"))) {
/******** End SeAddUsers BLOCK *********/
+ if (ret) {
+ force_flush_samr_cache(disp_info);
+ }
+
return ret ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
}
BOOL ret;
SE_PRIV se_rights;
- if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid, &acc_granted))
+ if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
status = access_check_samr_function(acc_granted,
DOM_SID delete_sid, domain_sid;
uint32 acc_granted;
NTSTATUS result;
-
+ DISP_INFO *disp_info = NULL;
+
sid_copy( &delete_sid, &q_u->sid.sid );
DEBUG(5,("_samr_remove_sid_foreign_domain: removing SID [%s]\n",
/* Find the policy handle. Open a policy on it. */
if (!get_lsa_policy_samr_sid(p, &q_u->dom_pol, &domain_sid,
- &acc_granted))
+ &acc_granted, &disp_info))
return NT_STATUS_INVALID_HANDLE;
result = access_check_samr_function(acc_granted, STD_RIGHT_DELETE_ACCESS,
return NT_STATUS_OK;
}
+ force_flush_samr_cache(disp_info);
result = NT_STATUS_OK;
}
/*******************************************************************
- _samr_unknown_2e
+ _samr_query_domain_info2
********************************************************************/
-NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOWN_2E *r_u)
+NTSTATUS _samr_query_domain_info2(pipes_struct *p,
+ SAMR_Q_QUERY_DOMAIN_INFO2 *q_u,
+ SAMR_R_QUERY_DOMAIN_INFO2 *r_u)
{
struct samr_info *info = NULL;
SAM_UNK_CTR *ctr;
r_u->status = NT_STATUS_OK;
- DEBUG(5,("_samr_unknown_2e: %d\n", __LINE__));
+ DEBUG(5,("_samr_query_domain_info2: %d\n", __LINE__));
/* find the policy handle. open a policy on it. */
if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)&info))
break;
case 0x02:
become_root();
- num_users = count_sam_users(&info->disp_info,
+ num_users = count_sam_users(info->disp_info,
ACB_NORMAL);
- num_groups = count_sam_groups(&info->disp_info);
+ num_groups = count_sam_groups(info->disp_info);
unbecome_root();
- free_samr_db(info);
-
pdb_get_account_policy(AP_TIME_TO_LOGOUT, &account_policy_temp);
u_logout = account_policy_temp;
return NT_STATUS_INVALID_INFO_CLASS;
}
- init_samr_r_samr_unknown_2e(r_u, q_u->switch_value, ctr, NT_STATUS_OK);
+ init_samr_r_samr_query_domain_info2(r_u, q_u->switch_value, ctr, NT_STATUS_OK);
- DEBUG(5,("_samr_unknown_2e: %d\n", __LINE__));
+ DEBUG(5,("_samr_query_domain_info2: %d\n", __LINE__));
return r_u->status;
}
git.samba.org / bbaumbach / samba-autobuild / .git / commitdiff