From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 22 May 2017 10:18:33 +0000 (+0200)
Subject: s3:secrets: make use of des_salt_key() in secrets_store_machine_pw_sync()
X-Git-Tag: samba-4.5.13~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f30adda2b4a1c23e0747839bd23e9036552f8f76;p=thirdparty%2Fsamba.git

s3:secrets: make use of des_salt_key() in secrets_store_machine_pw_sync()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 4e37d7805b345d80ca6e8a598e39fc81f72a27ce)
---

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 7d31734931f..369f774e9cb 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -34,6 +34,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
+static char *des_salt_key(const char *realm);
+
 /**
  * Form a key for fetching the domain sid
  *
@@ -545,11 +547,7 @@ bool secrets_store_machine_pw_sync(const char *pass, const char *oldpass, const
 	}
 
 	if (realm && salting_principal) {
-		char *key = talloc_asprintf(frame, "%s/DES/%s", SECRETS_SALTING_PRINCIPAL, realm);
-		if (!key) {
-			TALLOC_FREE(frame);
-			return false;
-		}
+		char *key = des_salt_key(realm);
 		ret = secrets_store(key, salting_principal, strlen(salting_principal)+1 );
 	}