From owner-svn-src-all@freebsd.org  Sun Sep 17 16:45:13 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4177EE1D4A3;
 Sun, 17 Sep 2017 16:45:13 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10DA564A05;
 Sun, 17 Sep 2017 16:45:12 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8HGjCwI046686;
 Sun, 17 Sep 2017 16:45:12 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HGjCuk046685;
 Sun, 17 Sep 2017 16:45:12 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201709171645.v8HGjCuk046685@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 17 Sep 2017 16:45:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r323680 - releng/10.4/lib/libfetch
X-SVN-Group: releng
X-SVN-Commit-Author: marius
X-SVN-Commit-Paths: releng/10.4/lib/libfetch
X-SVN-Commit-Revision: 323680
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Sep 2017 16:45:13 -0000

Author: marius
Date: Sun Sep 17 16:45:12 2017
New Revision: 323680
URL: https://svnweb.freebsd.org/changeset/base/323680

Log:
  MF10: r323660, MFC: r322669
  
  In fetch_resolve() if the port number or service name is included
  in the host argument (e. g. "www.freebsd.org:443"), correctly set
  the service pointer accordingly.  Previously, the service pointer
  was set to the separator instead, causing getaddrinfo(3) to fail.
  
  Approved by:	re (kib)

Modified:
  releng/10.4/lib/libfetch/common.c
Directory Properties:
  releng/10.4/   (props changed)

Modified: releng/10.4/lib/libfetch/common.c
==============================================================================
--- releng/10.4/lib/libfetch/common.c	Sun Sep 17 15:58:16 2017	(r323679)
+++ releng/10.4/lib/libfetch/common.c	Sun Sep 17 16:45:12 2017	(r323680)
@@ -291,7 +291,7 @@ fetch_resolve(const char *addr, int port, int af)
 			goto syserr;
 		service = sbuf;
 	} else if (*sep != '\0') {
-		service = sep;
+		service = sep + 1;
 	} else {
 		service = NULL;
 	}