From 1f0b2e84d71e2a7b06de288dbb54d2f12b6ca0e1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 13 Sep 2006 16:39:52 +0000 Subject: r18484: Start some cleanup on pam_winbind's syslogging: * as openlog() is non-reentrant and pam_winbind thereby overrides the syslog settings of the calling application, directly call syslog (or pam_vsyslog if available) * support the PAM_SILENT flag to avoid any log messages beeing created Guenther (This used to be commit 0f7e37ffc4759a4e29f63ab83f39ddb31c8240f6) --- source3/nsswitch/pam_winbind.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/nsswitch/pam_winbind.h') diff --git a/source3/nsswitch/pam_winbind.h b/source3/nsswitch/pam_winbind.h index 2b7080182b..eea4328105 100644 --- a/source3/nsswitch/pam_winbind.h +++ b/source3/nsswitch/pam_winbind.h @@ -43,7 +43,7 @@ #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR #endif -#endif +#endif /* defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD) || defined(AIX) */ #ifdef HAVE_SECURITY_PAM_MODULES_H #include @@ -82,6 +82,10 @@ do { \ #define _pam_drop(X) SAFE_FREE(X) #define x_strdup(s) ( (s) ? strdup(s):NULL ) +#endif /* HAVE_SECURITY__PAM_MACROS_H */ + +#ifdef HAVE_SECURITY_PAM_EXT_H +#include #endif #define WINBIND_DEBUG_ARG (1<<0) @@ -95,6 +99,7 @@ do { \ #define WINBIND_KRB5_CCACHE_TYPE (1<<8) #define WINBIND_CACHED_LOGIN (1<<9) #define WINBIND_CONFIG_FILE (1<<10) +#define WINBIND_SILENT (1<<11) /* * here is the string to inform the user that the new passwords they -- cgit