From: basney <basney>
Date: Wed, 30 Jul 2008 21:25:31 +0000 (+0000)
Subject: 4.4 release
X-Git-Tag: OPENSSH_GSI_GPT_4_4
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/382d31f1ba53719d267ef3c1f1a146c895237281

4.4 release
---

diff --git a/bundle/scripts/version.sh b/bundle/scripts/version.sh
index d90af51..c8195c9 100644
--- a/bundle/scripts/version.sh
+++ b/bundle/scripts/version.sh
@@ -1 +1 @@
-VERSION="4.3"
+VERSION="4.4"
diff --git a/compat/make_gpt_dist b/compat/make_gpt_dist
index 14b029d..b0c5c6b 100755
--- a/compat/make_gpt_dist
+++ b/compat/make_gpt_dist
@@ -15,7 +15,7 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh_compat-4.3-src";
+$srcdirname = "gsi_openssh_compat-4.4-src";
 $srcpkgname = $srcdirname;
 
 #
diff --git a/compat/pkg_data_src.gpt b/compat/pkg_data_src.gpt
index fce070f..eb3f97a 100644
--- a/compat/pkg_data_src.gpt
+++ b/compat/pkg_data_src.gpt
@@ -3,14 +3,14 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh_compat" >
 
-  <Aging_Version Major="4" Minor="3" Age="0" />
+  <Aging_Version Major="4" Minor="4" Age="0" />
   <Description>GSI-Enabled OpenSSH compat package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Version_Label>GSI-OpenSSH 4.3 / OpenSSH 5.0p1 / HPN13v1</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.4 / OpenSSH 5.1p1 / HPN13v5</Version_Label>
 
     <With_Flavors build="no" />
 
diff --git a/setup/make_gpt_dist b/setup/make_gpt_dist
index 22e151d..597869b 100755
--- a/setup/make_gpt_dist
+++ b/setup/make_gpt_dist
@@ -15,7 +15,7 @@
 # to the name gpt-bundle gives in its 'packaging_list'.
 #
 
-$srcdirname = "gsi_openssh_setup-4.3-src";
+$srcdirname = "gsi_openssh_setup-4.4-src";
 $srcpkgname = $srcdirname;
 
 #
diff --git a/setup/pkg_data_src.gpt b/setup/pkg_data_src.gpt
index c0df67b..6a69c97 100644
--- a/setup/pkg_data_src.gpt
+++ b/setup/pkg_data_src.gpt
@@ -3,14 +3,14 @@
 
 <gpt_package_metadata Format_Version="0.02" Name="gsi_openssh_setup" >
 
-  <Aging_Version Major="4" Minor="3" Age="0" />
+  <Aging_Version Major="4" Minor="4" Age="0" />
   <Description>GSI-Enabled OpenSSH setup package</Description>
   <Functional_Group >gsi_openssh</Functional_Group>
   <Version_Stability Release="stable" />
 
   <src_pkg >
 
-    <Version_Label>GSI-OpenSSH 4.3 / OpenSSH 5.0p1 / HPN13v1</Version_Label>
+    <Version_Label>GSI-OpenSSH 4.4 / OpenSSH 5.1p1 / HPN13v5</Version_Label>
 
     <With_Flavors build="no" />
 
@@ -36,7 +36,7 @@
     </Post_Install_Message>
 
     <Setup Name="gsi_openssh_setup">
-      <Aging_Version Major="4" Minor="3" Age="0" />
+      <Aging_Version Major="4" Minor="4" Age="0" />
     </Setup>
 
   </src_pkg >
diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 69a82b0..6a4cdd5 100644
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -1075,7 +1075,7 @@ sub action
 
     if (($result or $?) and $command !~ m!patch!)
     {
-        exitDie("ERROR: Unable to execute command: $!\n");
+        exitDie("ERROR: Unable to execute $command: $!\n");
     }
 }
 
diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index bd21484..badf4af 100644
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $
+#	$OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -28,7 +28,7 @@ Protocol 2
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 768
+#ServerKeyBits 1024
 
 # Logging
 # obsoletes QuietMode and FascistLogging
@@ -41,6 +41,7 @@ Protocol 2
 #PermitRootLogin yes
 #StrictModes yes
 #MaxAuthTries 6
+#MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
@@ -76,6 +77,7 @@ Protocol 2
 
 # GSSAPI options
 #GSSAPIAuthentication yes
+#GSSAPIDelegateCredentials yes
 #GSSAPICleanupCredentials yes
 #GSSAPIStrictAcceptorCheck yes
 #GSSAPIKeyExchange yes
@@ -91,6 +93,7 @@ Protocol 2
 # and ChallengeResponseAuthentication to 'no'.
 #UsePAM yes
 
+#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
 X11Forwarding yes
@@ -117,7 +120,6 @@ X11Forwarding yes
 # override default of no subsystems
 Subsystem	sftp	/usr/libexec/sftp-server
 
-
 # the following are HPN related configuration options
 # tcp receive buffer polling. disable in non autotuning kernels
 #TcpRcvBufPoll yes