===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth-rsa.c,v
retrieving revision 1.57.2.2
retrieving revision 1.58
diff -u -r1.57.2.2 -r1.58
--- src/usr.bin/ssh/Attic/auth-rsa.c	2004/08/19 22:37:30	1.57.2.2
+++ src/usr.bin/ssh/Attic/auth-rsa.c	2003/11/04 08:54:09	1.58
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rsa.c,v 1.57.2.2 2004/08/19 22:37:30 brad Exp $");
+RCSID("$OpenBSD: auth-rsa.c,v 1.58 2003/11/04 08:54:09 djm Exp $");
 
 #include <openssl/rsa.h>
 #include <openssl/md5.h>
@@ -23,6 +23,7 @@
 #include "packet.h"
 #include "xmalloc.h"
 #include "ssh1.h"
+#include "mpaux.h"
 #include "uidswap.h"
 #include "match.h"
 #include "auth-options.h"
@@ -203,7 +204,7 @@
 	 */
 	while (fgets(line, sizeof(line), f)) {
 		char *cp;
-		char *key_options;
+		char *options;
 
 		linenum++;
 
@@ -221,7 +222,7 @@
 		 */
 		if (*cp < '0' || *cp > '9') {
 			int quoted = 0;
-			key_options = cp;
+			options = cp;
 			for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
 				if (*cp == '\\' && cp[1] == '"')
 					cp++;	/* Skip both */
@@ -229,7 +230,7 @@
 					quoted = !quoted;
 			}
 		} else
-			key_options = NULL;
+			options = NULL;
 
 		/* Parse the key from the line. */
 		if (hostfile_read_key(&cp, &bits, key) == 0) {
@@ -254,7 +255,7 @@
 		 * If our options do not allow this key to be used,
 		 * do not send challenge.
 		 */
-		if (!auth_parse_options(pw, key_options, file, linenum))
+		if (!auth_parse_options(pw, options, file, linenum))
 			continue;
 
 		/* break out, this key is allowed */