Attachment 1732 Details for Bug 1674 – patch to log comment during auth phase

[patch] patch to log comment during auth phase

OpenSSH_log_key_comment.diff (text/plain), 1.35 KB, created by Fernando Vezzosi on 2009-11-23 12:01:23 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Vezzosi

Created: 2009-11-23 12:01:23 AEDT

Size: 1.35 KB

patch

obsolete

>Index: auth2-pubkey.c
>===================================================================
>RCS file: /cvs/openssh/auth2-pubkey.c,v
>retrieving revision 1.21
>diff -u -r1.21 auth2-pubkey.c
>--- auth2-pubkey.c	8 Mar 2009 00:40:28 -0000	1.21
>+++ auth2-pubkey.c	4 Aug 2009 12:02:08 -0000
>@@ -200,6 +200,8 @@
> 
> 	while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
> 		char *cp, *key_options = NULL;
>+		char *key_comment = NULL;
>+		char *i = NULL;
> 
> 		/* Skip leading whitespace, empty and comment lines. */
> 		for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
>@@ -230,11 +232,19 @@
> 		if (key_equal(found, key) &&
> 		    auth_parse_options(pw, key_options, file, linenum) == 1) {
> 			found_key = 1;
>-			debug("matching key found: file %s, line %lu",
>-			    file, linenum);
>+
>+			/* Skip remaining whitespace. */
>+			for (key_comment = cp; *key_comment == ' ' || *key_comment == '\t'; ++key_comment)
>+			    ;
>+			for (i = key_comment; *i && *i != ' ' && *i != '\t' && *i != '\r' && *i != '\n'; ++i)
>+				;
>+			*i = '\0';
>+
>+			debug("matching key found: file %s, line %lu, comment %s",
>+			    file, linenum, key_comment);
> 			fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
>-			verbose("Found matching %s key: %s",
>-			    key_type(found), fp);
>+			verbose("Found matching %s key: %s (%s)",
>+			    key_type(found), fp, key_comment);
> 			xfree(fp);
> 			break;
> 		}

Actions: View | Diff

Attachments on bug 1674: 1732