From: Dave Hart <hart@ntp.org>
Date: Mon, 8 Apr 2024 04:35:34 +0000 (+0000)
Subject: Fix mismatched braces breaking --enable-leap-smear builds (my mistake).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f045d36d589c8a19ee8ae9701d3e7e979074b6e5;p=thirdparty%2Fntp.git

Fix mismatched braces breaking --enable-leap-smear builds (my mistake).
Test --enable-leap-smear in one of the flock-build variants.

bk: 661374169uAD1ZIvkbPrfzzQHIgqOg
---

diff --git a/flock-build b/flock-build
index f01c97b6b..14767b934 100755
--- a/flock-build
+++ b/flock-build
@@ -34,23 +34,11 @@ case "$PARALLEL_BUILDS" in
  *)  echo Launching $PARALLEL_BUILDS parallel builds on each machine
 esac
 
-# Backroom:
-#   barnstable	   freebsd-6.1
-#   beauregard	   freebsd-6.0
-# X churchy	   alpha-dec-osf5.1
-#   deacon	   sparc-sun-solaris2.10
-#   grundoon	   freebsd-6.2
-#   howland	   freebsd-6.1
-# o macabre	   freebsd-6.1-STABLE
-# o mort	   freebsd-6.1
-#   whimsy	   sparc-sun-solaris2.10
-
 # Campus:
 # * baldwin	   sparc-sun-solaris2.10
 # * bridgeport	   sparc-sun-solaris2.10
-# * malarky	   sparc-sun-solaris2.10
 # * pogo	   sparc-sun-solaris2.10
-# * rackety	   freebsd-6.1
+# * rackety	   sparc-sun-solaris2.10
 
 if [ ! -r sntp/libevent/build-aux/config.guess ] ; then
 	echo "Error: bootstrap required." 1>&2 && exit 1
@@ -81,7 +69,7 @@ do
 	 0)
 	    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD $BUILD_ARGS" &
 	    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --disable-debugging --disable-saveconfig $BUILD_ARGS" &
-	    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --without-crypto --enable-c99-snprintf $BUILD_ARGS" &
+	    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --without-crypto --enable-c99-snprintf --enable-leap-smear $BUILD_ARGS" &
 	    ssh $i "cd $c_d ; ./build $SIG        $STD --disable-all-clocks --disable-autokey --without-sntp --disable-thread-support $BUILD_ARGS" &
 	    ;;
 	 1)
@@ -109,7 +97,7 @@ do
 			echo \`date -u '+%H:%M:%S'\` $i started build \$COUNT of 4
 			[ 0 -lt \`expr \$COUNT % $PARALLEL_BUILDS\` ] || wait
 
-			./build $SIG $PARSE $STD --without-crypto --enable-c99-snprintf $BUILD_ARGS &
+			./build $SIG $PARSE $STD --without-crypto --enable-c99-snprintf --enable-leap-smear $BUILD_ARGS &
 
 			COUNT=\`expr \$COUNT + 1\`
 			echo \`date -u '+%H:%M:%S'\` $i started build \$COUNT of 4
diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index 17c1024ca..c8164d798 100644
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -611,8 +611,9 @@ check_leapsec(
 				}
 			} else {
 				if (leap_smear.interval) {
-				DPRINTF(1, ("*** leapsec_query: clearing leap_smear interval\n"));
-				leap_smear.interval = 0;
+					DPRINTF(1, ("*** leapsec_query: clearing leap_smear interval\n"));
+					leap_smear.interval = 0;
+				}
 			}
 
 			if (leap_smear.interval) {