From: Ryan Tandy <ryan@nardis.ca>
Date: Fri, 18 Jul 2014 16:27:14 +0000 (-0700)
Subject: ITS#7869 fix do_phk_hash arguments
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1560c61fa2850996118a158a4f393c5851b62c12;p=openldap

ITS#7869 fix do_phk_hash arguments
---

diff --git a/contrib/slapd-modules/passwd/apr1.c b/contrib/slapd-modules/passwd/apr1.c
index ce7b8c7632..463d8d1aee 100644
--- a/contrib/slapd-modules/passwd/apr1.c
+++ b/contrib/slapd-modules/passwd/apr1.c
@@ -143,7 +143,7 @@ static int chk_phk(
 	salt.bv_val = (char *) &orig_pass[sizeof(digest)];
 	salt.bv_len = rc - sizeof(digest);
 
-	do_phk_hash(cred, magic, &salt, digest);
+	do_phk_hash(cred, &salt, magic, digest);
 
 	if (text)
 		*text = NULL;
@@ -197,7 +197,7 @@ static int hash_phk(
 	for (n = 0; n < salt.bv_len; n++)
 		salt.bv_val[n] = apr64[salt.bv_val[n] % (sizeof(apr64) - 1)];
 
-	do_phk_hash(passwd, magic, &salt, digest_buf);
+	do_phk_hash(passwd, &salt, magic, digest_buf);
 
 	if (text)
 		*text = NULL;