merge from -stable cleanup

bk: 4cd8d8cdd9k1TdgJ4nckUapZOT2-ww

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index acb31a10c34f8883e01665b109e104e0600be2b1..0b6d4ab4f4fb3a9f2127ec49bfc83e47fbafd5c3 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -301,7 +301,6 @@ static void         calc_addr_distance(sockaddr_u *,
                                           const sockaddr_u *);
 static int             cmp_addr_distance(const sockaddr_u *,
                                          const sockaddr_u *);
-static struct interface *getinterface  (sockaddr_u *, int);
 static struct interface *findlocalinterface    (sockaddr_u *, int, int);
 static struct interface *findclosestinterface  (sockaddr_u *, int);
 static struct interface *findlocalcastinterface        (sockaddr_u *);
@@ -3793,7 +3792,7 @@ cmp_addr_distance(
  * fetch an interface structure the matches the
  * address and has the given flags NOT set
  */
-static struct interface *
+struct interface *
 getinterface(
        sockaddr_u *    addr, 
        int             flags

diff --git a/sntp/main.c b/sntp/main.c
index faeab728b30fecfda9224ae0bcda5f56f377e23c..8b8564c4b286637757f2fb3ea7fabe40a3b1eaa9 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -27,15 +27,6 @@ do {                                                 \
 } while (0)
 
 
-int 
-main (
-       int argc,
-       char **argv
-       ) 
-{
-       return sntp_main(argc, argv);
-}
-
 /*
  * The actual main function.
  */