From a4d69e0d0854ed739338368824af861c965c3b00 Mon Sep 17 00:00:00 2001 From: srittau Date: Wed, 7 Mar 2001 20:59:53 +0000 Subject: [PATCH] Removed uams_dhx_pam.c.patch integrated in the main source tree. --- distrib/debian/changelog | 3 +- distrib/debian/patches/uams_dhx_pam.c.patch | 63 --------------------- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 distrib/debian/patches/uams_dhx_pam.c.patch diff --git a/distrib/debian/changelog b/distrib/debian/changelog index 4e43da53..dd41d87a 100644 --- a/distrib/debian/changelog +++ b/distrib/debian/changelog @@ -1,8 +1,9 @@ netatalk (1.5pre5-2) unstable; urgency=low * Added copyright of University of Newcastle upon Tyne to debian/copyright. + * Removed patches/uams_dhx_pam.c.patch as it was applied upstream. - -- Sebastian Rittau Tue, 27 Feb 2001 21:42:50 +0100 + -- Sebastian Rittau Wed, 7 Mar 2001 21:56:36 +0100 netatalk (1.5pre5-1) unstable; urgency=low diff --git a/distrib/debian/patches/uams_dhx_pam.c.patch b/distrib/debian/patches/uams_dhx_pam.c.patch deleted file mode 100644 index a063b179..00000000 --- a/distrib/debian/patches/uams_dhx_pam.c.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- netatalk-cvs/etc/uams/uams_dhx_pam.c -+++ netatalk-debian/etc/uams/uams_dhx_pam.c -@@ -8,6 +8,8 @@ - #include "config.h" - #endif - -+#include -+ - #if defined(USE_PAM) && defined(UAM_DHX) - #include - #include -@@ -387,7 +389,7 @@ - &pamh); - if (PAM_error != PAM_SUCCESS) - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", PAM_error); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error)); - /* Log Entry */ - goto logincont_err; - -@@ -399,7 +401,7 @@ - if (PAM_error == PAM_MAXTRIES) - err = AFPERR_PWDEXPR; - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", PAM_error); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error)); - /* Log Entry */ - goto logincont_err; - } -@@ -413,7 +415,7 @@ - err = AFPERR_PWDCHNG; - #endif - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", PAM_error); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error)); - /* Log Entry */ - goto logincont_err; - } -@@ -424,21 +426,21 @@ - PAM_error = pam_setcred(pamh, PAM_CRED_ESTABLISH); - if (PAM_error != PAM_SUCCESS) - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", PAM_error); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error)); - /* Log Entry */ - goto logincont_err; - - PAM_error = pam_open_session(pamh, 0); - if (PAM_error != PAM_SUCCESS) - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", PAM_error); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM_Error: %s -- %m", pam_strerror(pamh, PAM_error)); - /* Log Entry */ - goto logincont_err; - - memset(rbuf, 0, PASSWDLEN); /* zero out the password */ - *uam_pwd = dhxpwd; - /* Log Entry */ -- syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM Auth OK!: %s -- %m", AFP_OK); -+ syslog(LOG_INFO, "uams_dhx_pam.c :PAM: PAM Auth OK!: %d -- %m", AFP_OK); - /* Log Entry */ - return AFP_OK; - -- 2.39.2