From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 27 Dec 2025 01:07:15 +0000 (+0100)
Subject: lib/salt.c: Compact conditionals
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f3689e8ffe3d186696ca1a43cb2174642fa4cef;p=thirdparty%2Fshadow.git

lib/salt.c: Compact conditionals

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/salt.c b/lib/salt.c
index 766e12f98..83a64825b 100644
--- a/lib/salt.c
+++ b/lib/salt.c
@@ -355,14 +355,7 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 
 	bzero(result, GENSALT_SETTING_SIZE);
 
-	if (NULL != meth)
-		method = meth;
-	else {
-		method = getdef_str ("ENCRYPT_METHOD");
-		if (NULL == method) {
-			method = "DES";
-		}
-	}
+	method = meth ?: getdef_str("ENCRYPT_METHOD") ?: "DES";
 
 	if (streq(method, "MD5")) {
 		MAGNUM(result, '1');