Relevant BUGIDs: none

Purpose of commit: cleanup

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

Use pam_syslog

1 files changed, 12 insertions, 24 deletions

diff --git a/modules/pam_rootok/pam_rootok.c b/modules/pam_rootok/pam_rootok.c
index 77541f8a..e2ceef7b 100644
--- a/modules/pam_rootok/pam_rootok.c
+++ b/modules/pam_rootok/pam_rootok.c
@@ -24,20 +24,7 @@
 #define PAM_SM_AUTH
 
 #include <security/pam_modules.h>
-
-/* some syslogging */
-
-static void _pam_log(int err, const char *format, ...)
-{
-    va_list args;
-
-    va_start(args, format);
-    openlog("PAM-rootok", LOG_CONS|LOG_PID, LOG_AUTH);
-    vsyslog(err, format, args);
-    va_end(args);
-    closelog();
-}
-
+#include <security/pam_ext.h>
 
 #ifdef WITH_SELINUX
 #include <selinux/selinux.h>
@@ -48,7 +35,8 @@ static void _pam_log(int err, const char *format, ...)
 
 #define PAM_DEBUG_ARG       01
 
-static int _pam_parse(int argc, const char **argv)
+static int
+_pam_parse (const pam_handle_t *pamh, int argc, const char **argv)
 {
     int ctrl=0;
 
@@ -60,7 +48,7 @@ static int _pam_parse(int argc, const char **argv)
 	if (!strcmp(*argv,"debug"))
 	    ctrl |= PAM_DEBUG_ARG;
 	else {
-	    _pam_log(LOG_ERR,"pam_parse: unknown option; %s",*argv);
+	    pam_syslog(pamh,LOG_ERR,"pam_parse: unknown option; %s",*argv);
 	}
     }
 
@@ -69,14 +57,14 @@ static int _pam_parse(int argc, const char **argv)
 
 /* --- authentication management functions (only) --- */
 
-PAM_EXTERN
-int pam_sm_authenticate(pam_handle_t *pamh,int flags,int argc
-			,const char **argv)
+PAM_EXTERN int
+pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
+		     int argc, const char **argv)
 {
     int ctrl;
     int retval = PAM_AUTH_ERR;
 
-    ctrl = _pam_parse(argc, argv);
+    ctrl = _pam_parse(pamh,argc, argv);
     if (getuid() == 0)
 #ifdef WITH_SELINUX
       if (is_selinux_enabled()<1 || checkPasswdAccess(PASSWD__ROOTOK)==0)
@@ -84,16 +72,16 @@ int pam_sm_authenticate(pam_handle_t *pamh,int flags,int argc
 	retval = PAM_SUCCESS;
 
     if (ctrl & PAM_DEBUG_ARG) {
-	_pam_log(LOG_DEBUG, "authentication %s"
+	pam_syslog(pamh,LOG_DEBUG, "authentication %s"
 		 , retval==PAM_SUCCESS ? "succeeded":"failed" );
     }
 
     return retval;
 }
 
-PAM_EXTERN
-int pam_sm_setcred(pam_handle_t *pamh,int flags,int argc
-		   ,const char **argv)
+PAM_EXTERN int
+pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED,
+		int argc UNUSED, const char **argv UNUSED)
 {
     return PAM_SUCCESS;
 }