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

Lars Müller lmuelle at samba.org
Wed Dec 17 14:45:27 GMT 2008


The branch, v3-3-test has been updated
       via  b6e1eb476ccd19209ed135ab8c3b7b2b10422b0e (commit)
      from  3566615292f9cb2d00b03156e515274751e05969 (commit)

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


- Log -----------------------------------------------------------------
commit b6e1eb476ccd19209ed135ab8c3b7b2b10422b0e
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 99cd17e..4027838 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list