Relevant BUGIDs: 424315

Purpose of commit: cleanup

Commit summary:
---------------
This was a reimplementation of pam_warn to be more useful. I did it in
conjuction with testing the new setcred behavior.

diff --git a/modules/pam_warn/pam_warn.c b/modules/pam_warn/pam_warn.c
index 2e390ca4d1922ff45ca74df7e4b88b55b9821ca7..f167ea91e918f58ff658a2e134a8bb946a8c7130 100644 (file)
--- a/modules/pam_warn/pam_warn.c
+++ b/modules/pam_warn/pam_warn.c
@@ -27,6 +27,11 @@
 
 /* some syslogging */
 
+#define OBTAIN(item, value, default_value)  do {                \
+     (void) pam_get_item(pamh, item, (const void **) &value);   \
+     value = value ? value : default_value ;                    \
+} while (0)
+
 static void _pam_log(int err, const char *format, ...)
 {
     va_list args;
@@ -38,79 +43,69 @@ static void _pam_log(int err, const char *format, ...)
     closelog();
 }
 
+static void log_items(pam_handle_t *pamh, const char *function)
+{
+     const char *service=NULL, *user=NULL, *terminal=NULL,
+        *rhost=NULL, *ruser=NULL;
+
+     OBTAIN(PAM_SERVICE, service, "<unknown>");
+     OBTAIN(PAM_TTY, terminal, "<unknown>");
+     OBTAIN(PAM_USER, user, "<unknown>");
+     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);
+}
+
 /* --- 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, int argc,
+                       const char **argv)
 {
-     const char *service=NULL, *user=NULL, *terminal=NULL
-        , *rhost=NULL, *ruser=NULL;
-
-     (void) pam_get_item(pamh, PAM_SERVICE, (const void **)&service);
-     (void) pam_get_item(pamh, PAM_TTY, (const void **)&terminal);
-     _pam_log(LOG_NOTICE, "service: %s [on terminal: %s]"
-             , service ? service : "<unknown>"
-             , terminal ? terminal : "<unknown>"
-        );
-     (void) pam_get_user(pamh, &user, "Who are you? ");
-     (void) pam_get_item(pamh, PAM_RUSER, (const void **)&ruser);
-     (void) pam_get_item(pamh, PAM_RHOST, (const void **)&rhost);
-     _pam_log(LOG_NOTICE, "user: (uid=%d) -> %s [remote: %s@%s]"
-             , getuid()
-             , user ? user : "<unknown>"
-             , ruser ? ruser : "?nobody"
-             , rhost ? rhost : "?nowhere"
-             );
-
-     /* we are just a fly on the wall */
-
-     return PAM_IGNORE;
+    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, int argc, const char **argv)
 {
+    log_items(pamh, __FUNCTION__);
     return PAM_IGNORE;
 }
 
 /* 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,int argc,const char **argv)
 {
-    /* map to the authentication function... */
-
-    return pam_sm_authenticate(pamh, flags, argc, argv);
+    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, int argc, const char **argv)
 {
-    /* map to the authentication function... */
-
-    return pam_sm_authenticate(pamh, flags, argc, argv);
+    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)
 {
-    /* map to the authentication function... */
-
-    return pam_sm_authenticate(pamh, flags, argc, argv);
+    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)
 {
-    /* map to the authentication function... */
-
-    return pam_sm_authenticate(pamh, flags, argc, argv);
+    log_items(pamh, __FUNCTION__);
+    return PAM_IGNORE;
 }
 
 #ifdef PAM_STATIC