dgit-repos-server: fix dm parsing, more tests

[dgit.git] / dgit-repos-server

diff --git a/dgit-repos-server b/dgit-repos-server
index 6170b69b022b0d96de3da6265329069fa665472f..33c18f1b795732902c43c5335d95e082f634d603 100755 (executable)
--- 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/^\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/\([^()]+\)//;