Improve screening for invalid input to linesync.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1367 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index e7e35cef767645d65196ef32c2bf3406401fd517..284179f8fa25954d5c1024aa54c9fd887ec52ad1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-17  Michael Poole <mdpoole@troilus.org>
+
+       * tools/linesync/linesync.sh: Fix typo comment.  Check for
+       multiple blocks per line in the linesync input.
+
 2005-04-17  Dan <daniel@undernet.org>
 
        * tools/linesync/linesync.sh: Update to support new syntax and to

diff --git a/tools/linesync/linesync.sh b/tools/linesync/linesync.sh
index 27204785276d370d07dbc96506d9fe4009fe941a..77330ef28cefb01e6e842a17877ea382ccac634e 100755 (executable)
--- a/tools/linesync/linesync.sh
+++ b/tools/linesync/linesync.sh
@@ -140,7 +140,7 @@ if [ ! -s "$TMPFILE" ]; then
         exit 1
 fi
 
-# Check wether the file contains any disallowed .conf lines
+# Check whether the file contains any disallowed .conf lines
 bad_lines=`egrep '^[^'$ALLOWED_LINES'|#]+' $TMPFILE`
 if [ ! -z "$bad_lines" ]; then
         echo "The file downloaded in $TMPFILE contains the following disallowed line(s):"
@@ -148,6 +148,14 @@ if [ ! -z "$bad_lines" ]; then
         exit 1
 fi
 
+# Check whether somebody tried to sneak a second block onto some line
+bad_lines=`egrep -i '}[        ]*;[    ]*[a-z]+[       ]*{' $TMPFILE`
+if [ ! -z "$bad_lines" ] ; then
+       echo "The file downloaded in $TMPFILE contains the following multi-block line(s):"
+        echo $bad_lines
+        exit 1
+fi
+
 # check our ircd.conf
 ircd_setup=`egrep '^# (BEGIN|END) LINESYNC$' $cpath|wc -l`
 if [ $ircd_setup != 2 ]; then