summaryrefslogtreecommitdiff
path: root/source3/nsswitch/pam_winbind.h
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-13 16:39:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:51:44 -0500
commit1f0b2e84d71e2a7b06de288dbb54d2f12b6ca0e1 (patch)
tree8357edee1de0240cd2693da269ad9b4253ae74f3 /source3/nsswitch/pam_winbind.h
parentb3b207e9668fb3378350afef42820ffdc1dd6271 (diff)
downloadsamba-1f0b2e84d71e2a7b06de288dbb54d2f12b6ca0e1.tar.gz
samba-1f0b2e84d71e2a7b06de288dbb54d2f12b6ca0e1.tar.bz2
samba-1f0b2e84d71e2a7b06de288dbb54d2f12b6ca0e1.zip
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)
Diffstat (limited to 'source3/nsswitch/pam_winbind.h')
-rw-r--r--source3/nsswitch/pam_winbind.h7
1 files changed, 6 insertions, 1 deletions
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 <security/pam_modules.h>
@@ -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 <security/pam_ext.h>
#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