svn commit: r393002 - in head/security/openssh-portable: . files

[Bryan Drewery]

Author: bdrewery
Date: Mon Jul 27 18:41:02 2015
New Revision: 393002
URL: https://svnweb.freebsd.org/changeset/ports/393002

Log:
  Fix accidental revert of PermitRootLogin default to NO.
  
  This was due to the patch not being needed in the snapshot version
  which I based the 6.9 update off of. The default is changed in
  the upcoming 7.0 release

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/patch-servconf.c

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Mon Jul 27 18:39:32 2015	(r393001)
+++ head/security/openssh-portable/Makefile	Mon Jul 27 18:41:02 2015	(r393002)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssh
 DISTVERSION=	6.9p1
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	OPENBSD/OpenSSH/portable

Modified: head/security/openssh-portable/files/patch-servconf.c
==============================================================================
--- head/security/openssh-portable/files/patch-servconf.c	Mon Jul 27 18:39:32 2015	(r393001)
+++ head/security/openssh-portable/files/patch-servconf.c	Mon Jul 27 18:41:02 2015	(r393002)
@@ -17,6 +17,15 @@
  
  	/* X.509 Standard Options */
  #ifdef OPENSSL_FIPS
+@@ -277,7 +278,7 @@ fill_default_server_options(ServerOption
+ 	if (options->key_regeneration_time == -1)
+ 		options->key_regeneration_time = 3600;
+ 	if (options->permit_root_login == PERMIT_NOT_SET)
+-		options->permit_root_login = PERMIT_YES;
++		options->permit_root_login = PERMIT_NO;
+ 	if (options->ignore_rhosts == -1)
+ 		options->ignore_rhosts = 1;
+ 	if (options->ignore_user_known_hosts == -1)
 @@ -287,7 +288,7 @@ fill_default_server_options(ServerOption
  	if (options->print_lastlog == -1)
  		options->print_lastlog = 1;