X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-repos-server;h=33c18f1b795732902c43c5335d95e082f634d603;hp=ad4cde561c391a0e5b780dcacef8033227d4c588;hb=d2ec3ce54547bb810ca19e17049e6148dbbf0801;hpb=b19d59fb104f8f260a139c838fc08a0158431415

diff --git a/dgit-repos-server b/dgit-repos-server
index ad4cde56..33c18f1b 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -330,7 +330,7 @@ sub parsetag () {
 
     for (;;) {
 	print PT or die $!;
-	$!=0; $_=<T>; defined or die $!;
+	$!=0; $_=<T>; defined or die "missing signature? $!";
 	last if m/^-----BEGIN PGP/;
     }
     for (;;) {
@@ -391,12 +391,14 @@ sub dm_txt_check ($$) {
     while (<DT>) {
 	m/^fingerprint:\s+$keyid$/oi
 	    ..0 or next;
-	m/^\S/
-	    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/\([^()]+\)//;