From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 13 Mar 2015 17:30:49 +0000 (-0400)
Subject: Log invalid restrictions strings
X-Git-Tag: krb5-1.12.4-final~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16757adc05ecc9605f306b7b0c3147ae09133cd3;p=thirdparty%2Fkrb5.git

Log invalid restrictions strings

In kadm5int_acl_parse_restrictions(), output a log message if we break
out of the parsing loop with an error.  The current structure of the
loop makes it difficult to pinpoint the bad restrictions field, so
just output the whole string.

(cherry picked from commit e9eaafeab12b2b62595f4dff2fca3345b2d95b4a)
(cherry picked from commit 1ff2ecc7890ae4b843c77c2ba68f5a152806bf05)

ticket: 8185 (new)
version_fixed: 1.12.4
status: resolved
---

diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index 9d971a9e52..5021f5b52f 100644
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -350,6 +350,10 @@ kadm5int_acl_parse_restrictions(s, rpp)
                     }
                 }
             }
+            if (code) {
+                krb5_klog_syslog(LOG_ERR, _("%s: invalid restrictions: %s"),
+                                 acl_acl_file, s);
+            }
         }
     }
     if (sp)