From owner-freebsd-current Mon Mar 25 7:37:28 2002 Delivered-To: freebsd-current@freebsd.org Received: from gyros.marcuscom.com (dhcp-64-102-60-33.cisco.com [64.102.60.33]) by hub.freebsd.org (Postfix) with ESMTP id 5086937B419 for ; Mon, 25 Mar 2002 07:37:20 -0800 (PST) Received: (from marcus@localhost) by gyros.marcuscom.com (8.11.6/8.11.6) id g2PFbEO49999; Mon, 25 Mar 2002 10:37:14 -0500 (EST) (envelope-from marcus@marcuscom.com) X-Authentication-Warning: gyros.marcuscom.com: marcus set sender to marcus@marcuscom.com using -f Subject: Re: Ports broken by OpenPAM From: Joe Marcus Clarke To: Dag-Erling Smorgrav Cc: Kris Kennaway , current@FreeBSD.ORG In-Reply-To: References: <20020325095032.F47578-100000@shumai.marcuscom.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-PlmHEcAD+sCKf7bWK5C7" X-Mailer: Ximian Evolution 1.0.3 Date: 25 Mar 2002 10:37:14 -0500 Message-Id: <1017070634.49855.13.camel@gyros.marcuscom.com> Mime-Version: 1.0 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-PlmHEcAD+sCKf7bWK5C7 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2002-03-25 at 10:00, Dag-Erling Smorgrav wrote: > Joe Clarke writes: > > Really? I never received it. Please send it again. Thanks. >=20 > Here's an updated (but untested) version. Thanks. As soon as I finish get my -current machine built, I'll test these out. =20 Joe >=20 > DES > --=20 > Dag-Erling Smorgrav - des@ofug.org >=20 > ---- >=20 > --- 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" > =20 > -#ifdef HAVE_SECURITY_PAM_MISC_H > - /* FIXME: is there something better to check? */ > #define CONST_ARG const > -#else > -#define CONST_ARG > -#endif > =20 > #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 */ > } > =20 > if (try_first_pass || use_first_pass) > @@ -2901,11 +2896,11 @@ > newpass =3D NULL; > =20 > if (use_first_pass && newpass =3D=3D 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 */ > } > =20 > tries =3D 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 */ > } > =20 > if (cmiscptr =3D=3D 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)) --=-PlmHEcAD+sCKf7bWK5C7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----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----- --=-PlmHEcAD+sCKf7bWK5C7-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message