Relevant BUGIDs: none

Purpose of commit: cleanup

Commit summary:
---------------
2005-12-12  Dmitry V. Levin  <ldv@altlinux.org>

	Cleanup pam_syslog messages.

	* modules/pam_env/pam_env.c (_expand_arg): Fix compiler warning.
	* modules/pam_filter/pam_filter.c (set_filter): Append %m
	specifier to pam_syslog messages where appropriate.
	* modules/pam_group/pam_group.c (read_field): Likewise.
	* modules/pam_mkhomedir/pam_mkhomedir.c (make_remark): Remove.
	(create_homedir): Do not use make_remark() wrapper, call
	pam_info() directly.  Call pam_syslog() right after failed
	operation and append %m specifier to pam_syslog messages where
	appropriate.
	* modules/pam_rhosts/pam_rhosts_auth.c (pam_iruserok): Replace
	sequence of malloc(), strcpy() and strcat() calls with asprintf().
	Append %m specifier to pam_syslog messages where appropriate.
	* modules/pam_securetty/pam_securetty.c (securetty_perform_check):
	Append %m specifier to pam_syslog messages where appropriate.
	* modules/pam_shells/pam_shells.c (perform_check): Likewise.

1 files changed, 14 insertions, 12 deletions

diff --git a/modules/pam_wheel/pam_wheel.c b/modules/pam_wheel/pam_wheel.c
index ddbf3b86..ca0e171d 100644
--- a/modules/pam_wheel/pam_wheel.c
+++ b/modules/pam_wheel/pam_wheel.c
@@ -91,7 +91,7 @@ _pam_parse (const pam_handle_t *pamh, int argc, const char **argv,
           else if (!strncmp(*argv,"group=",6))
 	       strncpy(use_group,*argv+6,group_length-1);
           else {
-               pam_syslog(pamh,LOG_ERR,"pam_parse: unknown option; %s",*argv);
+               pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
           }
      }
 
@@ -110,7 +110,7 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
     retval = pam_get_user(pamh, &username, NULL);
     if ((retval != PAM_SUCCESS) || (!username)) {
         if (ctrl & PAM_DEBUG_ARG) {
-            pam_syslog(pamh,LOG_DEBUG,"can not get the username");
+            pam_syslog(pamh, LOG_DEBUG, "can not get the username");
 	}
         return PAM_SERVICE_ERR;
     }
@@ -118,7 +118,7 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
     pwd = pam_modutil_getpwnam (pamh, username);
     if (!pwd) {
         if (ctrl & PAM_DEBUG_ARG) {
-            pam_syslog(pamh,LOG_NOTICE,"unknown user %s",username);
+            pam_syslog(pamh, LOG_NOTICE, "unknown user %s", username);
         }
         return PAM_USER_UNKNOWN;
     }
@@ -133,7 +133,7 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
 	tpwd = pam_modutil_getpwuid (pamh, getuid());
 	if (!tpwd) {
 	    if (ctrl & PAM_DEBUG_ARG) {
-                pam_syslog(pamh,LOG_NOTICE, "who is running me ?!");
+                pam_syslog(pamh, LOG_NOTICE, "who is running me ?!");
 	    }
 	    return PAM_SERVICE_ERR;
 	}
@@ -145,7 +145,7 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
 	}
 	if (!fromsu || !tpwd) {
 	    if (ctrl & PAM_DEBUG_ARG) {
-		pam_syslog(pamh,LOG_NOTICE, "who is running me ?!");
+		pam_syslog(pamh, LOG_NOTICE, "who is running me ?!");
 	    }
 	    return PAM_SERVICE_ERR;
 	}
@@ -166,9 +166,10 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
     if (!grp || (!grp->gr_mem && (tpwd->pw_gid != grp->gr_gid))) {
 	if (ctrl & PAM_DEBUG_ARG) {
 	    if (!use_group[0]) {
-		pam_syslog(pamh,LOG_NOTICE,"no members in a GID 0 group");
+		pam_syslog(pamh, LOG_NOTICE, "no members in a GID 0 group");
 	    } else {
-                pam_syslog(pamh,LOG_NOTICE,"no members in '%s' group", use_group);
+                pam_syslog(pamh, LOG_NOTICE,
+			   "no members in '%s' group", use_group);
 	    }
 	}
 	if (ctrl & PAM_DENY_ARG) {
@@ -216,12 +217,13 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group)
 
     if (ctrl & PAM_DEBUG_ARG) {
 	if (retval == PAM_IGNORE) {
-	    pam_syslog(pamh,LOG_NOTICE, "Ignoring access request '%s' for '%s'",
-		     fromsu, username);
+	    pam_syslog(pamh, LOG_NOTICE,
+		       "Ignoring access request '%s' for '%s'",
+		       fromsu, username);
 	} else {
-	    pam_syslog(pamh,LOG_NOTICE, "Access %s to '%s' for '%s'",
-		     (retval != PAM_SUCCESS) ? "denied":"granted",
-		     fromsu, username);
+	    pam_syslog(pamh, LOG_NOTICE, "Access %s to '%s' for '%s'",
+		       (retval != PAM_SUCCESS) ? "denied":"granted",
+		       fromsu, username);
 	}
     }