Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55bf2196v6zt_qhwDOwI2mQpY00F4w

diff --cc tests/ntpd/Makefile.am
index 7b859c79dee03761a3d118b533b286d99dea4d61,c984f9a77298f6750d57082fc064cfb52ba5c095..b7b534cf77d5a8598c51fdf4f626d0c98dacc990
--- 1/tests/ntpd/Makefile.am
--- 2/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -12,9 -12,9 +12,10 @@@ check_PROGRAMS =             
        test-leapsec            \
        test-ntp_prio_q         \
        test-ntp_restrict       \
+       test-ntp_util       \
        test-rc_cmdlength       \
        test-ntp_scanner        \
 +      test-ntp_signdT         \
        $(NULL)
  
  #     test-ntp_signd          \ #doesn't work, can't link it because you can't link static function
@@@ -60,8 -60,9 +61,9 @@@ tests_SOURCES = $(top_srcdir)/sntp/test
                $(top_srcdir)/ntpd/ntp_leapsec.c        \
                $(top_srcdir)/ntpd/ntp_prio_q.c         \
                $(top_srcdir)/ntpd/ntp_restrict.c       \
+               $(top_srcdir)/ntpd/ntp_util.c   \
                $(top_srcdir)/ntpd/rc_cmdlength.c       \
 -              $(top_srcdir)/ntpd/ntp_signd.c  \
 +              $(top_srcdir)/ntpd/ntp_signd.c          \
                g_leapsec.cpp   \
                $(NULL)
  
@@@ -69,8 -70,9 +71,9 @@@ BUILT_SOURCES +=                      
        $(srcdir)/run-leapsec.c         \
        $(srcdir)/run-ntp_prio_q.c      \
        $(srcdir)/run-ntp_restrict.c    \
+       $(srcdir)/run-ntp_util.c        \
        $(srcdir)/run-rc_cmdlength.c            \
 -      $(srcdir)/run-ntp_signd.c               \
 +      $(srcdir)/run-ntp_signdT.c              \
        $(NULL)
  
  noinst_HEADERS =      g_ntpdtest.h            \