Merge branch 'busybox' into merge

1 files changed, 7 insertions, 15 deletions

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index f5c514b2c..65b1cb8de 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -117,27 +117,19 @@ void FAST_FUNC xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen)
 
 /* Return port number for a service.
  * If "port" is a number use it as the port.
- * If "port" is a name it is looked up in /etc/services,
- * if it isnt found return default_port
+ * If "port" is a name it is looked up in /etc/services.
+ * if NULL, return default_port
  */
-unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsigned default_port)
+unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsigned port_nr)
 {
-        unsigned port_nr = default_port;
         if (port) {
-                int old_errno;
-
-                /* Since this is a lib function, we're not allowed to reset errno to 0.
-                 * Doing so could break an app that is deferring checking of errno. */
-                old_errno = errno;
                 port_nr = bb_strtou(port, NULL, 10);
                 if (errno || port_nr > 65535) {
                         struct servent *tserv = getservbyname(port, protocol);
-                        port_nr = default_port;
-                        if (tserv)
-                                port_nr = ntohs(tserv->s_port);
-//FIXME: else: port string was garbage, but we don't report that???
+                        if (!tserv)
+                                bb_error_msg_and_die("bad port '%s'", port);
+                        port_nr = ntohs(tserv->s_port);
                 }
-                errno = old_errno;
         }
         return (uint16_t)port_nr;
 }
@@ -241,7 +233,7 @@ IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
                 cp++; /* skip ':' */
                 port = bb_strtou(cp, NULL, 10);
                 if (errno || (unsigned)port > 0xffff) {
-                        bb_error_msg("bad port spec '%s'", org_host);
+                        bb_error_msg("bad port '%s'", cp);
                         if (ai_flags & DIE_ON_ERROR)
                                 xfunc_die();
                         return NULL;