sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

lib: Remove "token" parameter from set_namearray

Browse Source 
Not needed anymore

Bug: https://bugzilla.samba.org/show_bug.cgi?id=15688
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit a150714cc64294d75028bac47132084bdf6f72c9)
This commit is contained in:
Volker Lendecke 2024-07-30 13:55:57 +02:00 committed by Stefan Metzmacher
parent 13dbaf5556
commit d5be00ab53
6 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -328,11 +328,9 @@ bool token_contains_name(TALLOC_CTX *mem_ctx,
bool *match); bool *match);
bool append_to_namearray(TALLOC_CTX *mem_ctx, bool append_to_namearray(TALLOC_CTX *mem_ctx,
const char *namelist_in, const char *namelist_in,
const struct security_token *token,
struct name_compare_entry **_name_array); struct name_compare_entry **_name_array);
bool set_namearray(TALLOC_CTX *mem_ctx, bool set_namearray(TALLOC_CTX *mem_ctx,
const char *namelist, const char *namelist,
const struct security_token *token,
struct name_compare_entry **_name_array); struct name_compare_entry **_name_array);
bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type); bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
bool fcntl_getlock(int fd, int op, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid); bool fcntl_getlock(int fd, int op, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);

4
source3/lib/util_namearray.c
View File

@ -203,7 +203,6 @@ static size_t namearray_len(const struct name_compare_entry *array)
bool append_to_namearray(TALLOC_CTX *mem_ctx, bool append_to_namearray(TALLOC_CTX *mem_ctx,
const char *namelist_in, const char *namelist_in,
const struct security_token *token,
struct name_compare_entry **_name_array) struct name_compare_entry **_name_array)
{ {
struct name_compare_entry *name_array = *_name_array; struct name_compare_entry *name_array = *_name_array;
@ -260,13 +259,12 @@ bool append_to_namearray(TALLOC_CTX *mem_ctx,
bool set_namearray(TALLOC_CTX *mem_ctx, bool set_namearray(TALLOC_CTX *mem_ctx,
const char *namelist_in, const char *namelist_in,
const struct security_token *token,
struct name_compare_entry **_name_array) struct name_compare_entry **_name_array)
{ {
bool ret; bool ret;
*_name_array = NULL; *_name_array = NULL;
ret = append_to_namearray(mem_ctx, namelist_in, token, _name_array); ret = append_to_namearray(mem_ctx, namelist_in, _name_array);
return ret; return ret;
} }

2
source3/modules/vfs_virusfilter.c
View File

@ -258,7 +258,6 @@ static int virusfilter_vfs_connect(
if (exclude_files != NULL) { if (exclude_files != NULL) {
ok = set_namearray(config, ok = set_namearray(config,
exclude_files, exclude_files,
NULL,
&config->exclude_files); &config->exclude_files);
if (!ok) { if (!ok) {
DBG_ERR("set_namearray failed\n"); DBG_ERR("set_namearray failed\n");
@ -271,7 +270,6 @@ static int virusfilter_vfs_connect(
if (infected_files != NULL) { if (infected_files != NULL) {
ok = set_namearray(config, ok = set_namearray(config,
infected_files, infected_files,
NULL,
&config->infected_files); &config->infected_files);
if (!ok) { if (!ok) {
DBG_ERR("set_namearray failed\n"); DBG_ERR("set_namearray failed\n");

2
source3/smbd/smb2_service.c
View File

@ -755,7 +755,6 @@ NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
if (!IS_IPC(conn) && !IS_PRINT(conn)) { if (!IS_IPC(conn) && !IS_PRINT(conn)) {
ok = set_namearray(conn, ok = set_namearray(conn,
lp_veto_oplock_files(talloc_tos(), lp_sub, snum), lp_veto_oplock_files(talloc_tos(), lp_sub, snum),
NULL,
&conn->veto_oplock_list); &conn->veto_oplock_list);
if (!ok) { if (!ok) {
status = NT_STATUS_NO_MEMORY; status = NT_STATUS_NO_MEMORY;
@ -763,7 +762,6 @@ NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
} }
ok = set_namearray(conn, ok = set_namearray(conn,
lp_aio_write_behind(talloc_tos(), lp_sub, snum), lp_aio_write_behind(talloc_tos(), lp_sub, snum),
NULL,
&conn->aio_write_behind_list); &conn->aio_write_behind_list);
if (!ok) { if (!ok) {
status = NT_STATUS_NO_MEMORY; status = NT_STATUS_NO_MEMORY;

3
source3/smbd/uid.c
View File

@ -241,7 +241,6 @@ static bool scan_file_list_cb(const char *string,
ok = append_to_namearray(state->mem_ctx, ok = append_to_namearray(state->mem_ctx,
files, files,
NULL,
state->list); state->list);
if (!ok) { if (!ok) {
goto fail; goto fail;
@ -371,7 +370,6 @@ static bool check_user_ok(connection_struct *conn,
ok = set_namearray(conn, ok = set_namearray(conn,
lp_veto_files(talloc_tos(), lp_sub, snum), lp_veto_files(talloc_tos(), lp_sub, snum),
session_info->security_token,
&ent->veto_list); &ent->veto_list);
if (!ok) { if (!ok) {
return false; return false;
@ -405,7 +403,6 @@ static bool check_user_ok(connection_struct *conn,
ok = set_namearray(conn, ok = set_namearray(conn,
lp_hide_files(talloc_tos(), lp_sub, snum), lp_hide_files(talloc_tos(), lp_sub, snum),
session_info->security_token,
&ent->hide_list); &ent->hide_list);
if (!ok) { if (!ok) {
return false; return false;

2
source3/torture/test_matching.c
View File

@ -66,7 +66,7 @@ bool run_str_match_mswild(int dummy)
d_fprintf(stderr, "namelist: %s\n", namelist); d_fprintf(stderr, "namelist: %s\n", namelist);
ret = set_namearray(talloc_tos(), namelist, NULL, &name_entries); ret = set_namearray(talloc_tos(), namelist, &name_entries);
SMB_ASSERT(ret && name_entries != NULL); SMB_ASSERT(ret && name_entries != NULL);
status = samba_path_matching_mswild_create(talloc_tos(), status = samba_path_matching_mswild_create(talloc_tos(),