From d2ec3ce54547bb810ca19e17049e6148dbbf0801 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 5 Mar 2014 18:06:53 +0000
Subject: dgit-repos-server: fix dm parsing, more tests

---
 dgit-repos-server | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'dgit-repos-server')

diff --git a/dgit-repos-server b/dgit-repos-server
index 897e414..33c18f1 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -391,12 +391,14 @@ sub dm_txt_check ($$) {
     while (<DT>) {
 	m/^fingerprint:\s+$keyid$/oi
 	    ..0 or next;
-	m/^./
-	    or reject "key $keyid missing Allow section in permissions!";
+	if (s/^allow:/ /i..0) {
+	} else {
+	    m/^./
+		or reject "key $keyid missing Allow section in permissions!";
+	    next;
+	}
 	# in right stanza...
-	s/^allow:/ /i
-	    ..0 or next;
-	s/^\s+//
+	s/^[ \t]+//
 	    or reject "package $package not allowed for key $keyid";
 	# in allow field...
 	s/\([^()]+\)//;
-- 
cgit v1.2.3