From b77864931bb577691c4bf59df3cfe4e5ba306bd0 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 12 Nov 2013 23:58:51 +0800
Subject: [PATCH] Don't exit fatally if authorized_keys has a line like

command="something" ssh-rsa

--HG--
branch : ecc
---
 svr-authpubkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/svr-authpubkey.c b/svr-authpubkey.c
index 4eca2110..66fe5e5f 100644
--- a/svr-authpubkey.c
+++ b/svr-authpubkey.c
@@ -294,8 +294,8 @@ static int checkpubkey(unsigned char* algo, unsigned int algolen,
 			options_buf = buf_new(options_len);
 			buf_putbytes(options_buf, options_start, options_len);
 
-			/* compare the algorithm */
-			if (line->pos + algolen > line->len) {
+			/* compare the algorithm. +3 so we have enough bytes to read a space and some base64 characters too. */
+			if (line->pos + algolen+3 > line->len) {
 				continue;
 			}
 			if (strncmp(buf_getptr(line, algolen), algo, algolen) != 0) { 
-- 
GitLab