Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Jun 2010 10:30:06 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-bugs@FreeBSD.org
Subject:   Re: kern/145940: commit references a PR
Message-ID:  <201006021030.o52AU6BG073282@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR kern/145940; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/145940: commit references a PR
Date: Wed,  2 Jun 2010 10:26:52 +0000 (UTC)

 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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006021030.o52AU6BG073282>