Imported Upstream version 3.1.0

[debian/amanda] / common-src / bsdudp-security.c

diff --git a/common-src/bsdudp-security.c b/common-src/bsdudp-security.c
index d42432080971afd323d53172302daced685e1f3b..cd265b3b47b5053e79c6e09bdbfce0bfab347bea 100644 (file)
--- a/common-src/bsdudp-security.c
+++ b/common-src/bsdudp-security.c
@@ -38,7 +38,6 @@
 #include "security.h"
 #include "security-util.h"
 #include "stream.h"
-#include "version.h"
 
 #ifndef SO_RCVBUF
 #undef DUMPER_SOCKET_BUFFERING
@@ -107,7 +106,6 @@ bsdudp_connect(
     void *     datap)
 {
     struct sec_handle *bh;
-    struct servent *se;
     in_port_t port;
     struct timeval sequence_time;
     int sequence;
@@ -116,6 +114,7 @@ bsdudp_connect(
     char *canonname;
     struct addrinfo *res = NULL, *res_addr;
     int result_bind;
+    char *service;
 
     (void)conf_fn;     /* Quiet unused parameter warning */
     (void)datap;       /* Quiet unused parameter warning */
@@ -252,10 +251,21 @@ bsdudp_connect(
        bh->udp = &netfd4;
 
     auth_debug(1, _("Resolved hostname=%s\n"), canonname);
-    if ((se = getservbyname(AMANDA_SERVICE_NAME, "udp")) == NULL)
-       port = AMANDA_SERVICE_DEFAULT;
-    else
-       port = (in_port_t)ntohs(se->s_port);
+    if (conf_fn) {
+        service = conf_fn("client_port", datap);
+        if (!service || strlen(service) <= 1)
+            service = "amanda";
+    } else {
+        service = "amanda";
+    }
+    port = find_port_for_service(service, "udp");
+    if (port == 0) {
+        security_seterror(&bh->sech, _("%s/udp unknown protocol"), service);
+        (*fn)(arg, &bh->sech, S_ERROR);
+        amfree(canonname);
+        return;
+    }
+
     amanda_gettimeofday(&sequence_time);
     sequence = (int)sequence_time.tv_sec ^ (int)sequence_time.tv_usec;
     handle=alloc(15);