Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------

Add pam_syslog to unify log messages from PAM modules.

1 files changed, 13 insertions, 18 deletions

diff --git a/modules/pam_warn/pam_warn.c b/modules/pam_warn/pam_warn.c
index 65e591a7..566b1bc4 100644
--- a/modules/pam_warn/pam_warn.c
+++ b/modules/pam_warn/pam_warn.c
@@ -24,6 +24,7 @@
 #define PAM_SM_PASSWORD
 
 #include <security/pam_modules.h>
+#include <security/pam_ext.h>
 
 /* some syslogging */
 
@@ -32,17 +33,6 @@
      value = value ? value : default_value ;                    \
 } while (0)
 
-static void _pam_log(int err, const char *format, ...)
-{
-    va_list args;
-
-    va_start(args, format);
-    openlog("PAM-warn", LOG_CONS|LOG_PID, LOG_AUTH);
-    vsyslog(err, format, args);
-    va_end(args);
-    closelog();
-}
-
 static void log_items(pam_handle_t *pamh, const char *function)
 {
      const void *service=NULL, *user=NULL, *terminal=NULL,
@@ -54,23 +44,27 @@ static void log_items(pam_handle_t *pamh, const char *function)
      OBTAIN(PAM_RUSER, ruser, "<unknown>");
      OBTAIN(PAM_RHOST, rhost, "<unknown>");
 
-     _pam_log(LOG_NOTICE, "function=[%s] service=[%s] terminal=[%s] user=[%s]"
-	      " ruser=[%s] rhost=[%s]\n",
-	      function, service, terminal, user, ruser, rhost);
+     pam_syslog(pamh, LOG_NOTICE,
+		"function=[%s] service=[%s] terminal=[%s] user=[%s]"
+		" ruser=[%s] rhost=[%s]\n", function,
+		(const char *) service, (const char *) terminal,
+		(const char *) user, (const char *) ruser,
+		(const char *) rhost);
 }
 
 /* --- authentication management functions (only) --- */
 
 PAM_EXTERN
-int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
-			const char **argv)
+int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
+			int argc UNUSED, const char **argv UNUSED)
 {
     log_items(pamh, __FUNCTION__);
     return PAM_IGNORE;
 }
 
 PAM_EXTERN
-int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv)
+int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED,
+		   int argc UNUSED, const char **argv UNUSED)
 {
     log_items(pamh, __FUNCTION__);
     return PAM_IGNORE;
@@ -79,7 +73,8 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv)
 /* password updating functions */
 
 PAM_EXTERN
-int pam_sm_chauthtok(pam_handle_t *pamh,int flags,int argc,const char **argv)
+int pam_sm_chauthtok(pam_handle_t *pamh, int flags UNUSED,
+		     int argc UNUSED, const char **argv UNUSED)
 {
     log_items(pamh, __FUNCTION__);
     return PAM_IGNORE;