Fix for crash in cmd_oregister due to incorrect parameter counts

[irc/evilnet/x3.git] / src / sar.c

diff --git a/src/sar.c b/src/sar.c
index 336991fbab7bd228ee8a0a230bc81b226c47ad2c..db9268adb1a0b5961984026ceec6bb7f6f9ed192 100644 (file)
--- a/src/sar.c
+++ b/src/sar.c
@@ -1035,7 +1035,7 @@ sar_services_load_file(const char *etc_services)
         /* Set up canonical name-indexed service entry. */
         canon = sar_service_byname(name, 1);
         if (canon->protos[proto].valid) {
-            log_module(sar_log, LOG_ERROR, "Service %s/%s listed twice.", name, port);
+            /* log_module(sar_log, LOG_ERROR, "Service %s/%s listed twice.", name, port); who cares? */
             continue;
         }
         canon->protos[proto].canon = NULL;
@@ -1669,6 +1669,9 @@ ipv4_pton(struct sockaddr *sa, UNUSED_ARG(unsigned int socklen), unsigned int *b
     if (!pos)
         return 0;
     sa->sa_family = AF_INET;
+#if defined(HAVE_SOCKADDR_SA_LEN)
+    sa->sa_len = sizeof(struct sockaddr_in);
+#endif
     return pos;
 }
 
@@ -1902,6 +1905,9 @@ ipv6_pton(struct sockaddr *sa, UNUSED_ARG(unsigned int socklen), unsigned int *b
             sin6->sin6_addr.s6_addr[cpos + jj] = 0;
     }
     sa->sa_family = AF_INET6;
+#if defined(HAVE_SOCKADDR_SA_LEN)
+    sa->sa_len = sizeof(struct sockaddr_in6);
+#endif
     return pos;
 }