s3:seltest: make test_smbclient_s3.sh more strict

[metze/samba/wip.git] / nsswitch / pam_winbind.h

diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h
index c6b2c5e72695499c5365ee2f3e9eef09dfc4a6e2..0395a1fd5b91dc545ef315858e0fda0fa2354c0e 100644 (file)
--- 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
@@ -164,6 +171,6 @@ struct pwb_context {
        uint32_t ctrl;
 };
 
-#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
+#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
 #define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)