[SCM] Samba Shared Repository - branch master updated - 6b6977aaf25aa6b5fce49e7aa10711d16cb896e7

[Lars Müller]

The branch, master has been updated
       via  6b6977aaf25aa6b5fce49e7aa10711d16cb896e7 (commit)
      from  994ef68164c12a3b0494f6491bc9f402c912600f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6b6977aaf25aa6b5fce49e7aa10711d16cb896e7
Author: Lars Müller <lars at samba.org>
Date:   Wed Dec 17 15:39:35 2008 +0100

    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>.

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/pam_winbind.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h
index c6b2c5e..d21fc04 100644
--- a/nsswitch/pam_winbind.h
+++ b/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


-- 
Samba Shared Repository