X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=contrib%2Fslapd-modules%2Fpasswd%2Fapr1.c;h=ce7b8c76322f4cccff24ab225d1fb2a7b42af52f;hb=3463da548b91cc21d2a26bea404edb48bf0cbc48;hp=2078e57fa844027c309850793f244e988936e526;hpb=8e36433d746cd10d1067fa088390b080d44aa798;p=openldap

diff --git a/contrib/slapd-modules/passwd/apr1.c b/contrib/slapd-modules/passwd/apr1.c
index 2078e57fa8..ce7b8c7632 100644
--- a/contrib/slapd-modules/passwd/apr1.c
+++ b/contrib/slapd-modules/passwd/apr1.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * This file is derived from OpenLDAP Software. All of the modifications to
  * OpenLDAP Software represented in the following file were developed by
@@ -8,12 +9,14 @@
  * notice:
  *
  * Copyright 2011 Devin J. Pohly
+ * Portions Copyright 2011 Howard Chu
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP Public
  * License. 
  *
  * A portion of this code is used in accordance with the Beer-ware License,
  * revision 42, as noted.
+ *
  */
 #include <lber.h>
 #include <lber_pvt.h>
@@ -109,7 +112,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 +143,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 +160,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 +169,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(