From: Lars Müller <lars@samba.org>
Date: Wed, 17 Dec 2008 14:39:35 +0000 (+0100)
Subject: Tweak with pam defines of older Linux versions
X-Git-Tag: samba-3.3.0~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9068d70bcc563be6df84fc7b9745c12f367741c;p=thirdparty%2Fsamba.git

Tweak with pam defines of older Linux versions

PAM_AUTHTOK_RECOVERY_ERR is not defined by older Linux versions (SUSE
Linux Enterprise 9 and RedHat Enterprise 4).

Patch suggested by Philipp Thomas <pth at suse dot de>.
(cherry picked from commit b6e1eb476ccd19209ed135ab8c3b7b2b10422b0e)
---

diff --git a/source/nsswitch/pam_winbind.h b/source/nsswitch/pam_winbind.h
index 99cd17e5e76..40278387d0b 100644
--- a/source/nsswitch/pam_winbind.h
+++ b/source/nsswitch/pam_winbind.h
@@ -27,7 +27,14 @@
 #include <libintl.h>
 #endif
 
-#ifndef LINUX
+#if defined(LINUX)
+
+/* newer versions of PAM have this in _pam_compat.h */
+#ifndef PAM_AUTHTOK_RECOVERY_ERR
+#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
+#endif
+
+#else /* !LINUX */
 
 /* Solaris always uses dynamic pam modules */
 #define PAM_EXTERN extern