10 Commits

Author	SHA1	Message	Date
Volker Lendecke	ec73654323	lib: Fix a typo ... Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>	2024-08-06 16:29:33 +00:00
Volker Lendecke	a150714cc6	lib: Remove "token" parameter from set_namearray ... 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>	2024-07-31 08:39:29 +00:00
Volker Lendecke	b5169dd717	lib: Remove per-user support from append_to_namearray ... This is done in check_user_ok now 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>	2024-07-31 08:39:29 +00:00
Volker Lendecke	fcd595a464	lib: Factor out append_namearray from set_namearray ... We'll have to add to an existing namearray soon. This turns one talloc_array() into a set of reallocs. This is slower, but set_namearray is only used for smb.conf entries where we don't expect hundreds or more entries to add. I've done this to avoid array length calculations, but if it turns out to be too slow we can get smarter again. 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>	2024-07-31 08:39:29 +00:00
Ralph Boehme	607d2c1e3e	s3/lib: return error from set_namearray() ... Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:31 +00:00
Ralph Boehme	02ae847b45	smbd: return errors from token_contains_name() ... Invalid names in "valid users", "invalid users", "read list", "write list", "veto files" and "hide files" are logged and ignored, but a failure to contact winbind or a DC from winbind, or a memory allocation failure, now all trigger a failure of the tree connect. Manually tested with smbclient with the following hack in winbindd: ---8<--- $ git di source3/winbindd/winbindd_cache.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index c889489dbbbc..8ccf0a28e11a 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -1821,6 +1821,13 @@ NTSTATUS wb_cache_name_to_sid(struct winbindd_domain *domain, ZERO_STRUCTP(sid); *type = SID_NAME_UNKNOWN; + if (strequal(name, "unknown")) { + return NT_STATUS_OK; + } + if (strequal(name, "iotimeout")) { + return NT_STATUS_IO_TIMEOUT; + } + status = wcache_name_to_sid(domain, domain_name, name, sid, type); if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { return status; ---8<--- veto files = ../unknown/file1/../slow/file2 $ bin/smbclient -U slow%x //localhost/test -c quit $ In the log: [2024/03/04 15:21:33.659356, 1, pid=977167, effective(0, 0), real(0, 0)] ../../source3/lib/util_namearray.c:128(token_contains_name) token_contains_name: lookup_name 'unknown' failed veto files = ../iotimeout/file1/../slow/file2 $ bin/smbclient -U slow%x //localhost/test -c quit tree connect failed: NT_STATUS_LOGON_FAILURE $ [2024/03/04 15:22:15.655811, 0, pid=977177, effective(0, 0), real(0, 0)] ../../source3/lib/util_namearray.c:131(token_contains_name) token_contains_name: lookup_name 'iotimeout' failed NT_STATUS_NO_SUCH_DOMAIN [2024/03/04 15:22:15.655846, 1, pid=977177, effective(0, 0), real(0, 0)] ../../source3/smbd/uid.c:381(change_to_user_impersonate) change_to_user_impersonate: SMB user slow (unix user slow) not permitted access to share test. [2024/03/04 15:22:15.655855, 0, pid=977177, effective(0, 0), real(0, 0)] ../../source3/smbd/smb2_service.c:689(make_connection_snum) make_connection_snum: Can't become connected user! Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:31 +00:00
Ralph Boehme	0f27c52144	s3/lib: use lookup_name_smbconf_ex() in token_contains_name() ... No change in behaviour as we still ignore lookup erros as well as a not-found result. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:31 +00:00
Ralph Boehme	b8b2f21835	s3/lib: add per-user support to set_namearray() ... Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:31 +00:00
Ralph Boehme	02e7c70ab3	smbd: move token_contains_name() to util_namearray.c and make it public ... Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:31 +00:00
Ralph Boehme	c4ede22db0	s3/lib: move set_namearray() to util_namearray.c ... Needed to fix circular dependencies between samba-passdb, secrets3 and samba3util (iirc). Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>	2024-07-26 10:06:30 +00:00