Update to 1.5.0.
This commit is contained in:
parent
3fe1aebfef
commit
73e8662630
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=63582
3 changed files with 11 additions and 13 deletions
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= pam_ldap
|
PORTNAME= pam_ldap
|
||||||
PORTVERSION= 1.4.8
|
PORTVERSION= 1.5.0
|
||||||
CATEGORIES= security net
|
CATEGORIES= security net
|
||||||
MASTER_SITES= http://www.padl.com/download/ \
|
MASTER_SITES= http://www.padl.com/download/ \
|
||||||
ftp://ftp.padl.com/pub/
|
ftp://ftp.padl.com/pub/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
MD5 (pam_ldap-148.tar.gz) = 2794d78c7d8b54a54d7ce0a972f71cee
|
MD5 (pam_ldap-150.tar.gz) = 2fe328d579f2610b9db8674403cbd892
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
$FreeBSD$
|
--- pam_ldap.c.orig Thu Jul 25 22:15:52 2002
|
||||||
|
+++ pam_ldap.c Thu Jul 25 22:20:11 2002
|
||||||
--- pam_ldap.c.orig Mon Mar 25 15:54:28 2002
|
|
||||||
+++ pam_ldap.c Mon Mar 25 15:54:29 2002
|
|
||||||
@@ -126,12 +126,7 @@
|
@@ -126,12 +126,7 @@
|
||||||
#include "pam_ldap.h"
|
#include "pam_ldap.h"
|
||||||
#include "md5.h"
|
#include "md5.h"
|
||||||
|
|
||||||
-#ifdef HAVE_SECURITY_PAM_MISC_H
|
-#if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
|
||||||
- /* FIXME: is there something better to check? */
|
- /* FIXME: is there something better to check? */
|
||||||
#define CONST_ARG const
|
#define CONST_ARG const
|
||||||
-#else
|
-#else
|
||||||
|
@ -15,7 +13,7 @@ $FreeBSD$
|
||||||
|
|
||||||
#ifndef HAVE_LDAP_MEMFREE
|
#ifndef HAVE_LDAP_MEMFREE
|
||||||
#define ldap_memfree(x) free(x)
|
#define ldap_memfree(x) free(x)
|
||||||
@@ -2843,11 +2838,11 @@
|
@@ -2898,11 +2893,11 @@
|
||||||
{
|
{
|
||||||
_conv_sendmsg (appconv, "Password change aborted",
|
_conv_sendmsg (appconv, "Password change aborted",
|
||||||
PAM_ERROR_MSG, no_warn);
|
PAM_ERROR_MSG, no_warn);
|
||||||
|
@ -27,11 +25,11 @@ $FreeBSD$
|
||||||
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
|
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
|
||||||
+#else
|
+#else
|
||||||
+ return PAM_AUTHTOK_RECOVERY_ERR;
|
+ return PAM_AUTHTOK_RECOVERY_ERR;
|
||||||
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
|
+#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2887,11 +2882,11 @@
|
@@ -2942,11 +2937,11 @@
|
||||||
syslog (LOG_ERR,
|
syslog (LOG_ERR,
|
||||||
"pam_ldap: error getting old authentication token (%s)",
|
"pam_ldap: error getting old authentication token (%s)",
|
||||||
pam_strerror (pamh, rc));
|
pam_strerror (pamh, rc));
|
||||||
|
@ -47,7 +45,7 @@ $FreeBSD$
|
||||||
}
|
}
|
||||||
|
|
||||||
if (try_first_pass || use_first_pass)
|
if (try_first_pass || use_first_pass)
|
||||||
@@ -2901,11 +2896,11 @@
|
@@ -2956,11 +2951,11 @@
|
||||||
newpass = NULL;
|
newpass = NULL;
|
||||||
|
|
||||||
if (use_first_pass && newpass == NULL)
|
if (use_first_pass && newpass == NULL)
|
||||||
|
@ -63,7 +61,7 @@ $FreeBSD$
|
||||||
}
|
}
|
||||||
|
|
||||||
tries = 0;
|
tries = 0;
|
||||||
@@ -2955,11 +2950,11 @@
|
@@ -3010,11 +3005,11 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -79,7 +77,7 @@ $FreeBSD$
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmiscptr == NULL)
|
if (cmiscptr == NULL)
|
||||||
@@ -2991,11 +2986,11 @@
|
@@ -3046,11 +3041,11 @@
|
||||||
{
|
{
|
||||||
_conv_sendmsg (appconv, "Password change aborted",
|
_conv_sendmsg (appconv, "Password change aborted",
|
||||||
PAM_ERROR_MSG, no_warn);
|
PAM_ERROR_MSG, no_warn);
|
||||||
|
|
Loading…
Reference in a new issue