From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 4 Sep 2009 11:46:14 +0000 (+0000)
Subject: - adjust to apply with lpk.patch
X-Git-Tag: auto/ac/openssh-5_2p1-2~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=13a276470b65ae403b184258dbdad538d01d101c;p=packages%2Fopenssh.git

- adjust to apply with lpk.patch

Changed files:
    openssh-5.2p1-hpn13v6.diff -> 1.2
---

diff --git a/openssh-5.2p1-hpn13v6.diff b/openssh-5.2p1-hpn13v6.diff
index a8f179e..0144968 100644
--- a/openssh-5.2p1-hpn13v6.diff
+++ b/openssh-5.2p1-hpn13v6.diff
@@ -3054,7 +3054,7 @@ diff -NupwB openssh-5.2p1-canonical/scp.c openssh-5.2p1-hpn13v6/scp.c
 diff -NupwB openssh-5.2p1-canonical/servconf.c openssh-5.2p1-hpn13v6/servconf.c
 --- openssh-5.2p1-canonical/servconf.c	2009-01-28 00:31:23.000000000 -0500
 +++ openssh-5.2p1-hpn13v6/servconf.c	2009-05-14 12:36:10.000000000 -0400
-@@ -128,11 +128,20 @@ initialize_server_options(ServerOptions 
+@@ -132,6 +132,10 @@
  	options->adm_forced_command = NULL;
  	options->chroot_directory = NULL;
  	options->zero_knowledge_password_authentication = -1;
@@ -3062,8 +3062,10 @@ diff -NupwB openssh-5.2p1-canonical/servconf.c openssh-5.2p1-hpn13v6/servconf.c
 +	options->tcp_rcv_buf_poll = -1;
 +	options->hpn_disabled = -1;
 +	options->hpn_buffer_size = -1;
- }
- 
+ #ifdef WITH_LDAP_PUBKEY
+  	/* XXX dirty */
+  	options->lpk.ld = NULL;
+@@ -156,6 +160,11 @@
  void
  fill_default_server_options(ServerOptions *options)
  {