From 04e5bfbca3e81744b1858823c6d6653274e78ccb Mon Sep 17 00:00:00 2001
From: Jameson Rollins <jrollins@finestructure.net>
Date: Sun, 17 Oct 2010 21:40:35 -0400
Subject: fixed bug in remove_monkeysphere_lines function

it was matching MonkeySphere strings as full lines and therefore not
actually removing monkeysphere lines.

I'm not sure exactly why, upon further consideration, why we actually
need to be removing all monkeysphere lines in update_authorized_keys.
---
 src/share/common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/share/common b/src/share/common
index 34ac52d..5486eaa 100644
--- a/src/share/common
+++ b/src/share/common
@@ -376,8 +376,8 @@ remove_monkeysphere_lines() {
     tempfile=$(mktemp "${file}.XXXXXXX") || \
 	failure "Could not make temporary file '${file}.XXXXXXX'."
 
-    egrep -v '^MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2}$' \
-	"$file" >"$tempfile"
+    egrep -v ' MonkeySphere[[:digit:]]{4}(-[[:digit:]]{2}){2}T[[:digit:]]{2}(:[[:digit:]]{2}){2} ' \
+	"$file" >"$tempfile" || true
     cat "$tempfile" > "$file"
     rm "$tempfile"
 }
-- 
cgit v1.2.3