From: Howard Chu <hyc@openldap.org>
Date: Mon, 7 Feb 2011 01:12:49 +0000 (+0000)
Subject: Drop unneeded scheme param
X-Git-Tag: MIGRATION_CVS2GIT~83
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0561aa164a0686e7d0bfe01f54b1283928ea4e0b;p=openldap

Drop unneeded scheme param
---

diff --git a/contrib/slapd-modules/passwd/apr1.c b/contrib/slapd-modules/passwd/apr1.c
index 2078e57fa8..476f038285 100644
--- a/contrib/slapd-modules/passwd/apr1.c
+++ b/contrib/slapd-modules/passwd/apr1.c
@@ -109,7 +109,6 @@ static void do_phk_hash(
 }
 
 static int chk_phk(
-	const struct berval *scheme,
 	const struct berval *magic,
 	const struct berval *passwd,
 	const struct berval *cred,
@@ -141,7 +140,6 @@ static int chk_phk(
 	salt.bv_val = (char *) &orig_pass[sizeof(digest)];
 	salt.bv_len = rc - sizeof(digest);
 
-	/* the only difference between this and straight PHK is the magic */
 	do_phk_hash(cred, magic, &salt, digest);
 
 	if (text)
@@ -159,7 +157,7 @@ static int chk_apr1(
 	const struct berval *cred,
 	const char **text)
 {
-	return chk_phk(scheme, &magic_apr1, passwd, cred, text);
+	return chk_phk(&magic_apr1, passwd, cred, text);
 }
 
 static int chk_bsdmd5(
@@ -168,7 +166,7 @@ static int chk_bsdmd5(
 	const struct berval *cred,
 	const char **text)
 {
-	return chk_phk(scheme, &magic_bsdmd5, passwd, cred, text);
+	return chk_phk(&magic_bsdmd5, passwd, cred, text);
 }
 
 static int hash_phk(