From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 18 Oct 2010 01:40:35 +0000 (-0400)
Subject: fixed bug in remove_monkeysphere_lines function
X-Git-Tag: monkeysphere_0.34-1~1^2~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04e5bfbca3e81744b1858823c6d6653274e78ccb;p=monkeysphere.git

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.
---

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"
 }