[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3287-g9b5359f

[Lars Müller]

The branch, v3-2-test has been updated
       via  9b5359f992e5ffac2cedc1360098c21f9c1d2f02 (commit)
      from  0d6b3df8d9c8b5e777ac6717168a11455b2ad2ce (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 9b5359f992e5ffac2cedc1360098c21f9c1d2f02
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:
 source/nsswitch/pam_winbind.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/pam_winbind.h b/source/nsswitch/pam_winbind.h
index be17a6f..4fbee41 100644
--- a/source/nsswitch/pam_winbind.h
+++ b/source/nsswitch/pam_winbind.h
@@ -20,7 +20,14 @@
 
 #include <iniparser.h>
 
-#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