The branch, master has been updated via 91c024dfd8e s3: auth: Andrew noticed f585f01148ab2d8f84c96b12e018742f5f17bcb0 doesn't keep the same logic. from 2b86cff4a4d lib/replace: drop runtime copy_file_range() check
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 91c024dfd8ecf909f23ab8ee3816ae6a4c9b881c Author: Jeremy Allison <j...@samba.org> Date: Tue Sep 7 17:39:38 2021 -0700 s3: auth: Andrew noticed f585f01148ab2d8f84c96b12e018742f5f17bcb0 doesn't keep the same logic. This should make it identical. Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Wed Sep 8 06:38:21 UTC 2021 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: source3/auth/server_info_sam.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c index b9c8b0a0959..71a52f812a5 100644 --- a/source3/auth/server_info_sam.c +++ b/source3/auth/server_info_sam.c @@ -39,11 +39,16 @@ static bool is_our_machine_account(const char *username) { bool ret; size_t ulen = strlen(username); + const char *nb_name = lp_netbios_name(); + size_t nb_namelen = strlen(nb_name); if (ulen == 0 || username[ulen-1] != '$') { return false; } - ret = strnequal(username, lp_netbios_name(), ulen-1); + if (nb_namelen != ulen-1) { + return false; + } + ret = strnequal(username, nb_name, ulen-1); return ret; } -- Samba Shared Repository