packages: openssh/openssh-5.2p1-hpn13v6.diff - adjust to apply with lpk.patch

[glen]

Author: glen                         Date: Fri Sep  4 11:46:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust to apply with lpk.patch

---- Files affected:
packages/openssh:
   openssh-5.2p1-hpn13v6.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/openssh/openssh-5.2p1-hpn13v6.diff
diff -u packages/openssh/openssh-5.2p1-hpn13v6.diff:1.1 packages/openssh/openssh-5.2p1-hpn13v6.diff:1.2
--- packages/openssh/openssh-5.2p1-hpn13v6.diff:1.1	Fri Sep  4 13:40:29 2009
+++ packages/openssh/openssh-5.2p1-hpn13v6.diff	Fri Sep  4 13:46:14 2009
@@ -3054,7 +3054,7 @@
 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 @@
 +	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)
  {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-5.2p1-hpn13v6.diff?r1=1.1&r2=1.2&f=u