New upstream version 0.99.7.1

1 files changed, 23 insertions, 27 deletions

diff --git a/Linux-PAM/modules/pam_warn/pam_warn.c b/Linux-PAM/modules/pam_warn/pam_warn.c
index 90170c01..8c3b9d69 100644
--- a/Linux-PAM/modules/pam_warn/pam_warn.c
+++ b/Linux-PAM/modules/pam_warn/pam_warn.c
@@ -1,12 +1,12 @@
 /* pam_warn module */
 
 /*
- * $Id: pam_warn.c,v 1.2 2002/05/29 04:44:43 agmorgan Exp $
+ * $Id: pam_warn.c,v 1.6 2005/09/17 08:59:04 t8m Exp $
  *
  * Written by Andrew Morgan <morgan@linux.kernel.org> 1996/3/11
  */
 
-#define _BSD_SOURCE
+#include "config.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -24,28 +24,18 @@
 #define PAM_SM_PASSWORD
 
 #include <security/pam_modules.h>
+#include <security/pam_ext.h>
 
 /* some syslogging */
 
 #define OBTAIN(item, value, default_value)  do {                \
-     (void) pam_get_item(pamh, item, (const void **) &value);   \
+     (void) pam_get_item(pamh, item, &value);                   \
      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 char *service=NULL, *user=NULL, *terminal=NULL,
+     const void *service=NULL, *user=NULL, *terminal=NULL,
 	 *rhost=NULL, *ruser=NULL;
 
      OBTAIN(PAM_SERVICE, service, "<unknown>");
@@ -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,30 +73,32 @@ 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;
 }
 
 PAM_EXTERN int
-pam_sm_acct_mgmt (pam_handle_t *pamh, int flags, int argc, const char **argv)
+pam_sm_acct_mgmt(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_open_session (pam_handle_t *pamh, int flags, int argc,
-                     const char **argv)
+pam_sm_open_session(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_close_session (pam_handle_t *pamh, int flags, int argc,
-		      const char **argv)
+pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED,
+		     int argc UNUSED, const char **argv UNUSED)
 {
     log_items(pamh, __FUNCTION__);
     return PAM_IGNORE;