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;
+ 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)
{