From owner-svn-src-stable-9@FreeBSD.ORG  Mon Aug 20 17:46:23 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15ABA106564A;
	Mon, 20 Aug 2012 17:46:23 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F36688FC0C;
	Mon, 20 Aug 2012 17:46:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KHkMF9070229;
	Mon, 20 Aug 2012 17:46:22 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KHkM9f070227;
	Mon, 20 Aug 2012 17:46:22 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201208201746.q7KHkM9f070227@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 20 Aug 2012 17:46:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239453 - stable/9/lib/libpam/modules/pam_ssh
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 17:46:23 -0000

Author: des
Date: Mon Aug 20 17:46:22 2012
New Revision: 239453
URL: http://svn.freebsd.org/changeset/base/239453

Log:
  MFH r236106: avoid segfault with SSH 1 keys

Modified:
  stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c
Directory Properties:
  stable/9/lib/libpam/   (props changed)

Modified: stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Aug 20 17:36:10 2012	(r239452)
+++ stable/9/lib/libpam/modules/pam_ssh/pam_ssh.c	Mon Aug 20 17:46:22 2012	(r239453)
@@ -110,7 +110,7 @@ pam_ssh_load_key(const char *dir, const 
 	 * with an empty passphrase, and if the key is not encrypted,
 	 * accept only an empty passphrase.
 	 */
-	key = key_load_private(fn, NULL, &comment);
+	key = key_load_private(fn, "", &comment);
 	if (key != NULL && !(*passphrase == '\0' && nullok)) {
 		key_free(key);
 		return (NULL);