audit: fix dangling keywords in audit_log_set_loginuid() output
authorRichard Guy Briggs <rgb@redhat.com>
Wed, 11 Dec 2013 20:28:09 +0000 (15:28 -0500)
committerEric Paris <eparis@redhat.com>
Tue, 14 Jan 2014 03:32:38 +0000 (22:32 -0500)
Remove spaces between "new", "old" label modifiers and "auid", "ses" labels in
log output since userspace tools can't parse orphaned keywords.

Make variable names more consistent and intuitive.

Make audit_log_format() argument code easier to read.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
kernel/auditsc.c

index 5c237343cd9b25dcb44620a8955768a88d85e618..10176cd5956a7ccd9c3f34093bca928a0f5b0323 100644 (file)
@@ -1969,21 +1969,24 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
                                   int rc)
 {
        struct audit_buffer *ab;
-       uid_t uid, ologinuid, nloginuid;
+       uid_t uid, oldloginuid, loginuid;
 
        if (!audit_enabled)
                return;
 
        uid = from_kuid(&init_user_ns, task_uid(current));
-       ologinuid = from_kuid(&init_user_ns, koldloginuid);
-       nloginuid = from_kuid(&init_user_ns, kloginuid),
+       oldloginuid = from_kuid(&init_user_ns, koldloginuid);
+       loginuid = from_kuid(&init_user_ns, kloginuid),
 
        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
        if (!ab)
                return;
-       audit_log_format(ab, "pid=%d uid=%u old auid=%u new auid=%u old "
-                        "ses=%u new ses=%u res=%d", current->pid, uid, ologinuid,
-                        nloginuid, oldsessionid, sessionid, !rc);
+       audit_log_format(ab, "pid=%d uid=%u"
+                        " old-auid=%u new-auid=%u old-ses=%u new-ses=%u"
+                        " res=%d",
+                        current->pid, uid,
+                        oldloginuid, loginuid, oldsessionid, sessionid,
+                        !rc);
        audit_log_end(ab);
 }