From owner-svn-src-all@FreeBSD.ORG  Thu Apr 17 11:49:19 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC04B94C;
 Thu, 17 Apr 2014 11:49:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 C848610C5;
 Thu, 17 Apr 2014 11:49:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3HBnJ3i010948;
 Thu, 17 Apr 2014 11:49:19 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3HBnJrW010947;
 Thu, 17 Apr 2014 11:49:19 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201404171149.s3HBnJrW010947@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Thu, 17 Apr 2014 11:49:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264592 - stable/10/lib/libc/net
X-SVN-Group: stable-10
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.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Apr 2014 11:49:19 -0000

Author: jmmv
Date: Thu Apr 17 11:49:19 2014
New Revision: 264592
URL: http://svnweb.freebsd.org/changeset/base/264592

Log:
  MFC r263090: Make ether_line really report an error when all input is invalid.

Modified:
  stable/10/lib/libc/net/ether_addr.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/net/ether_addr.c
==============================================================================
--- stable/10/lib/libc/net/ether_addr.c	Thu Apr 17 11:48:34 2014	(r264591)
+++ stable/10/lib/libc/net/ether_addr.c	Thu Apr 17 11:49:19 2014	(r264592)
@@ -72,11 +72,13 @@ ether_line(const char *l, struct ether_a
 
 	i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3],
 	    &o[4], &o[5], hostname);
-	if (i != 7)
-		return (i);
-	for (i=0; i<6; i++)
-		e->octet[i] = o[i];
-	return (0);
+	if (i == 7) {
+		for (i = 0; i < 6; i++)
+			e->octet[i] = o[i];
+		return (0);
+	} else {
+		return (-1);
+	}
 }
 
 /*