[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  65e9b409a6c s3:utils: Fix UNUSED_VALUE
       via  4d83e9fcbda s3:utils: Fix trailing whitespaces
      from  0f2978bbc0e s4-drsuapi: Give an error that matches windows on destination_dsa_guid lookup failure

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 65e9b409a6c27bbdf80307514523b3f37f20859d
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Thu Feb 2 09:49:31 2023 +0100

    s3:utils: Fix UNUSED_VALUE
    
    Reported by RedHat internal Covscan
    
    Since cb8a0d9 we no longer stop traversing the list if encryption_flag
    or signing_flags are unknown.
    
    Assignment "result = -1;" is always overwritten by
    "result = traverse_connections_*()" and is a dead code.
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Feb  2 15:46:52 UTC 2023 on atb-devel-224

commit 4d83e9fcbda34b45a55fdc25da4642e1d7839c7b
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Thu Feb 2 09:48:37 2023 +0100

    s3:utils: Fix trailing whitespaces
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/status.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/status.c b/source3/utils/status.c
index cca8b7d6cb2..5359dda90cc 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    status reporting
    Copyright (C) Andrew Tridgell 1994-1998
@@ -86,10 +86,10 @@ static void Ucrit_addUid(uid_t uid)
 
 static unsigned int Ucrit_checkUid(uid_t uid)
 {
-	if ( !Ucrit_IsActive ) 
+	if ( !Ucrit_IsActive )
 		return 1;
 
-	if ( uid == Ucrit_uid ) 
+	if ( uid == Ucrit_uid )
 		return 1;
 
 	return 0;
@@ -99,7 +99,7 @@ static unsigned int Ucrit_checkPid(struct server_id pid)
 {
 	int i;
 
-	if ( !Ucrit_IsActive ) 
+	if ( !Ucrit_IsActive )
 		return 1;
 
 	for (i=0;i<Ucrit_MaxPid;i++) {
@@ -381,7 +381,7 @@ static int prepare_brl(struct traverse_state *state)
 }
 
 static void print_brl(struct file_id id,
-			struct server_id pid, 
+			struct server_id pid,
 			enum brl_type lock_type,
 			enum brl_flavour lock_flav,
 			br_off start,
@@ -550,7 +550,6 @@ static int traverse_connections(const struct connections_data *crec,
 			break;
 		default:
 			encryption = "???";
-			result = -1;
 			break;
 		}
 		encryption_degree = CRYPTO_DEGREE_FULL;
@@ -572,7 +571,6 @@ static int traverse_connections(const struct connections_data *crec,
 			break;
 		default:
 			signing = "???";
-			result = -1;
 			break;
 		}
 		signing_degree = CRYPTO_DEGREE_FULL;


-- 
Samba Shared Repository