Apply post-1.25.0 patches, bump version to 1.25.11_25_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index e674e9a0d..48dc6e3d9 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -362,10 +362,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
                 req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
         if (cmd != RTM_DELROUTE) {
+                req.r.rtm_scope = RT_SCOPE_UNIVERSE;
                 if (RTPROT_BOOT != 0)
                         req.r.rtm_protocol = RTPROT_BOOT;
-                if (RT_SCOPE_UNIVERSE != 0)
-                        req.r.rtm_scope = RT_SCOPE_UNIVERSE;
                 if (RTN_UNICAST != 0)
                         req.r.rtm_type = RTN_UNICAST;
         }
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 98158a304..1a3367be2 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2051,6 +2051,13 @@ recv_and_process_client_pkt(void /*int fd*/)
                 goto bail;
         }
 
+        /* Respond only to client and symmetric active packets */
+        if ((msg.m_status & MODE_MASK) != MODE_CLIENT
+         && (msg.m_status & MODE_MASK) != MODE_SYM_ACT
+        ) {
+                goto bail;
+        }
+
         query_status = msg.m_status;
         query_xmttime = msg.m_xmttime;