From owner-svn-src-stable-8@FreeBSD.ORG  Wed Jun  2 10:26:31 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD011106566B;
	Wed,  2 Jun 2010 10:26:31 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C18F8FC25;
	Wed,  2 Jun 2010 10:26:31 +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 o52AQV5j026567;
	Wed, 2 Jun 2010 10:26:31 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o52AQVBG026565;
	Wed, 2 Jun 2010 10:26:31 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201006021026.o52AQVBG026565@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 2 Jun 2010 10:26:31 +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: r208735 - stable/8/crypto/openssh
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2010 10:26:31 -0000

Author: des
Date: Wed Jun  2 10:26:31 2010
New Revision: 208735
URL: http://svn.freebsd.org/changeset/base/208735

Log:
  Fix expansion of AuthorizedKeysFile (upstream patch)
  
  PR:		146334, 145940
  Approved by:	re (kib@)

Modified:
  stable/8/crypto/openssh/servconf.c

Modified: stable/8/crypto/openssh/servconf.c
==============================================================================
--- stable/8/crypto/openssh/servconf.c	Wed Jun  2 10:20:38 2010	(r208734)
+++ stable/8/crypto/openssh/servconf.c	Wed Jun  2 10:26:31 2010	(r208735)
@@ -1227,7 +1227,17 @@ process_server_config_line(ServerOptions
 		charptr = (opcode == sAuthorizedKeysFile) ?
 		    &options->authorized_keys_file :
 		    &options->authorized_keys_file2;
-		goto parse_filename;
+		arg = strdelim(&cp);
+		if (!arg || *arg == '\0')
+			fatal("%s line %d: missing file name.",
+			    filename, linenum);
+		if (*activep && *charptr == NULL) {
+			*charptr = tilde_expand_filename(arg, getuid());
+			/* increase optional counter */
+			if (intptr != NULL)
+				*intptr = *intptr + 1;
+		}
+		break;
 
 	case sClientAliveInterval:
 		intptr = &options->client_alive_interval;