From owner-freebsd-current Mon Mar 25 7: 2:37 2002 Delivered-To: freebsd-current@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 21C3737B420 for ; Mon, 25 Mar 2002 07:00:37 -0800 (PST) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 2F8B55346; Mon, 25 Mar 2002 16:00:34 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Joe Clarke Cc: Kris Kennaway , Subject: Re: Ports broken by OpenPAM References: <20020325095032.F47578-100000@shumai.marcuscom.com> From: Dag-Erling Smorgrav Date: 25 Mar 2002 16:00:34 +0100 In-Reply-To: <20020325095032.F47578-100000@shumai.marcuscom.com> Message-ID: Lines: 11 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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 --=-=-= Joe Clarke writes: > Really? I never received it. Please send it again. Thanks. Here's an updated (but untested) version. DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=pam_ldap.diff --- 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)) --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message