From owner-svn-src-all@FreeBSD.ORG Sun Feb 7 06:22:29 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AAF91065672; Sun, 7 Feb 2010 06:22:29 +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 184DA8FC15; Sun, 7 Feb 2010 06:22:29 +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 o176MSX1063098; Sun, 7 Feb 2010 06:22:28 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o176MSJP063096; Sun, 7 Feb 2010 06:22:28 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <201002070622.o176MSJP063096@svn.freebsd.org> From: Ruslan Ermilov Date: Sun, 7 Feb 2010 06:22:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203603 - stable/8/sbin/ifconfig X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 06:22:29 -0000 Author: ru Date: Sun Feb 7 06:22:28 2010 New Revision: 203603 URL: http://svn.freebsd.org/changeset/base/203603 Log: MFC: r203486: Shortening a passphrase caused wrong authentication key to be used. Modified: stable/8/sbin/ifconfig/ifcarp.c Directory Properties: stable/8/sbin/ifconfig/ (props changed) Modified: stable/8/sbin/ifconfig/ifcarp.c ============================================================================== --- stable/8/sbin/ifconfig/ifcarp.c Sun Feb 7 05:50:00 2010 (r203602) +++ stable/8/sbin/ifconfig/ifcarp.c Sun Feb 7 06:22:28 2010 (r203603) @@ -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);