From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 5 Feb 2025 03:45:06 +0000 (+1300)
Subject: auth: avoid strcmp(x, NULL)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=649f78252bcafc5e3ee77f0ed9c13028243e004c;p=thirdparty%2Fsamba.git

auth: avoid strcmp(x, NULL)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
---

diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c
index 5f4c6cd1ed1..a5cc389a57d 100644
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -364,7 +364,12 @@ _PUBLIC_ NTSTATUS cli_credentials_set_machine_account_db_ctx(struct cli_credenti
 	} else if (secrets_tdb_lct > cli_credentials_get_password_last_changed_time(cred)) {
 		secrets_tdb_password_more_recent = true;
 	} else if (secrets_tdb_lct == cli_credentials_get_password_last_changed_time(cred)) {
-		secrets_tdb_password_more_recent = strcmp(secrets_tdb_password, cli_credentials_get_password(cred)) != 0;
+		const char *pwd = cli_credentials_get_password(cred);
+		if (pwd == NULL || (strcmp(secrets_tdb_password, pwd) != 0)) {
+			secrets_tdb_password_more_recent = true;
+		} else {
+			secrets_tdb_password_more_recent = false;
+		}
 	} else {
 		secrets_tdb_password_more_recent = false;
 	}