From owner-svn-src-stable-7@FreeBSD.ORG  Sun Feb  7 16:55:45 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D03C6106566C;
	Sun,  7 Feb 2010 16:55:45 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C068B8FC08;
	Sun,  7 Feb 2010 16:55:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17GtjWW078414;
	Sun, 7 Feb 2010 16:55:45 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17GtjWr078412;
	Sun, 7 Feb 2010 16:55:45 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201002071655.o17GtjWr078412@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sun, 7 Feb 2010 16:55:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203612 - stable/7/sbin/ifconfig
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2010 16:55:45 -0000

Author: ru
Date: Sun Feb  7 16:55:45 2010
New Revision: 203612
URL: http://svn.freebsd.org/changeset/base/203612

Log:
  MFC: r203486: Shortening a passphrase caused wrong authentication key
  to be used.
  
  Approved by:	re (kib)

Modified:
  stable/7/sbin/ifconfig/ifcarp.c
Directory Properties:
  stable/7/sbin/ifconfig/   (props changed)

Modified: stable/7/sbin/ifconfig/ifcarp.c
==============================================================================
--- stable/7/sbin/ifconfig/ifcarp.c	Sun Feb  7 15:42:15 2010	(r203611)
+++ stable/7/sbin/ifconfig/ifcarp.c	Sun Feb  7 16:55:45 2010	(r203612)
@@ -96,6 +96,7 @@ setcarp_passwd(const char *val, int d, i
 	if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1)
 		err(1, "SIOCGVH");
 
+	memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key));
 	/* XXX Should hash the password into the key here, perhaps? */
 	strlcpy(carpr.carpr_key, val, CARP_KEY_LEN);