Date: 25 Mar 2002 10:37:14 -0500 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Dag-Erling Smorgrav <des@ofug.org> Cc: Kris Kennaway <kris@obsecurity.org>, current@FreeBSD.ORG Subject: Re: Ports broken by OpenPAM Message-ID: <1017070634.49855.13.camel@gyros.marcuscom.com> In-Reply-To: <xzpg02or8tp.fsf@flood.ping.uio.no> References: <20020325095032.F47578-100000@shumai.marcuscom.com> <xzpg02or8tp.fsf@flood.ping.uio.no>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Mon, 2002-03-25 at 10:00, Dag-Erling Smorgrav wrote:
> Joe Clarke <marcus@marcuscom.com> writes:
> > Really? I never received it. Please send it again. Thanks.
>
> Here's an updated (but untested) version.
Thanks. As soon as I finish get my -current machine built, I'll test
these out.
Joe
>
> DES
> --
> Dag-Erling Smorgrav - des@ofug.org
>
> ----
>
> --- 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 @@
> #include "pam_ldap.h"
> #include "md5.h"
>
> -#ifdef HAVE_SECURITY_PAM_MISC_H
> - /* FIXME: is there something better to check? */
> #define CONST_ARG const
> -#else
> -#define CONST_ARG
> -#endif
>
> #ifndef HAVE_LDAP_MEMFREE
> #define ldap_memfree(x) free(x)
> @@ -2843,11 +2838,11 @@
> {
> _conv_sendmsg (appconv, "Password change aborted",
> PAM_ERROR_MSG, no_warn);
> -#ifdef PAM_AUTHTOK_RECOVERY_ERR
> - return PAM_AUTHTOK_RECOVERY_ERR;
> -#else
> +#ifdef PAM_AUTHTOK_RECOVER_ERR
> return PAM_AUTHTOK_RECOVER_ERR;
> -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
> +#else
> + return PAM_AUTHTOK_RECOVERY_ERR;
> +#endif /* PAM_AUTHTOK_RECOVER_ERR */
> }
> else
> {
> @@ -2887,11 +2882,11 @@
> syslog (LOG_ERR,
> "pam_ldap: error getting old authentication token (%s)",
> pam_strerror (pamh, rc));
> -#ifdef PAM_AUTHTOK_RECOVERY_ERR
> - return PAM_AUTHTOK_RECOVERY_ERR;
> -#else
> +#ifdef PAM_AUTHTOK_RECOVER_ERR
> return PAM_AUTHTOK_RECOVER_ERR;
> -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
> +#else
> + return PAM_AUTHTOK_RECOVERY_ERR;
> +#endif /* PAM_AUTHTOK_RECOVER_ERR */
> }
>
> if (try_first_pass || use_first_pass)
> @@ -2901,11 +2896,11 @@
> newpass = NULL;
>
> if (use_first_pass && newpass == NULL)
> -#ifdef PAM_AUTHTOK_RECOVERY_ERR
> - return PAM_AUTHTOK_RECOVERY_ERR;
> -#else
> +#ifdef PAM_AUTHTOK_RECOVER_ERR
> return PAM_AUTHTOK_RECOVER_ERR;
> -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
> +#else
> + return PAM_AUTHTOK_RECOVERY_ERR;
> +#endif /* PAM_AUTHTOK_RECOVER_ERR */
> }
>
> tries = 0;
> @@ -2955,11 +2950,11 @@
> }
> else
> {
> -#ifdef PAM_AUTHTOK_RECOVERY_ERR
> - return PAM_AUTHTOK_RECOVERY_ERR;
> -#else
> +#ifdef PAM_AUTHTOK_RECOVER_ERR
> return PAM_AUTHTOK_RECOVER_ERR;
> -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
> +#else
> + return PAM_AUTHTOK_RECOVERY_ERR;
> +#endif /* PAM_AUTHTOK_RECOVER_ERR */
> }
>
> if (cmiscptr == NULL)
> @@ -2991,11 +2986,11 @@
> {
> _conv_sendmsg (appconv, "Password change aborted",
> PAM_ERROR_MSG, no_warn);
> -#ifdef PAM_AUTHTOK_RECOVERY_ERR
> - return PAM_AUTHTOK_RECOVERY_ERR;
> -#else
> +#ifdef PAM_AUTHTOK_RECOVER_ERR
> return PAM_AUTHTOK_RECOVER_ERR;
> -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
> +#else
> + return PAM_AUTHTOK_RECOVERY_ERR;
> +#endif /* PAM_AUTHTOK_RECOVER_ERR */
> }
> }
> else if (!strcmp (newpass, miscptr))
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iEYEABECAAYFAjyfRCoACgkQb2iPiv4Uz4cUhwCgjYzC76spGZ/UhofznWzxY4VC
u9cAn1yFmNAuJsfS/9oi8+YZVU1g5o15
=RSRG
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1017070634.49855.13.camel>