diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-08-23 22:14:17 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-08-23 22:14:17 +0000 |
| commit | de407944271fa79ad761b60a4e78539f75cc4178 (patch) | |
| tree | a629b728e879e36db909ca08ec23118f806b0dcb /net-misc/openssh/files | |
| parent | Forward-port the X509/hpn glue patch per bug #235086. (diff) | |
| download | gentoo-2-de407944271fa79ad761b60a4e78539f75cc4178.tar.gz gentoo-2-de407944271fa79ad761b60a4e78539f75cc4178.tar.bz2 gentoo-2-de407944271fa79ad761b60a4e78539f75cc4178.zip | |
Update the LDAP patches, also mailed to upstream.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch b/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch new file mode 100644 index 000000000000..e6e22e865da6 --- /dev/null +++ b/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch @@ -0,0 +1,55 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.1p1+lpk/servconf.c openssh-5.1p1+lpk+glue/servconf.c +--- openssh-5.1p1+lpk/servconf.c 2008-08-23 14:37:18.000000000 -0700 ++++ openssh-5.1p1+lpk+glue/servconf.c 2008-08-23 14:52:19.000000000 -0700 +@@ -111,6 +111,25 @@ + options->num_allow_groups = 0; + options->num_deny_groups = 0; + options->ciphers = NULL; ++#ifdef WITH_LDAP_PUBKEY ++ /* XXX dirty */ ++ options->lpk.ld = NULL; ++ options->lpk.on = -1; ++ options->lpk.servers = NULL; ++ options->lpk.u_basedn = NULL; ++ options->lpk.g_basedn = NULL; ++ options->lpk.binddn = NULL; ++ options->lpk.bindpw = NULL; ++ options->lpk.sgroup = NULL; ++ options->lpk.filter = NULL; ++ options->lpk.fgroup = NULL; ++ options->lpk.l_conf = NULL; ++ options->lpk.tls = -1; ++ options->lpk.b_timeout.tv_sec = -1; ++ options->lpk.s_timeout.tv_sec = -1; ++ options->lpk.flags = FLAG_EMPTY; ++#endif ++ + options->macs = NULL; + options->protocol = SSH_PROTO_UNKNOWN; + options->gateway_ports = -1; +@@ -131,25 +150,6 @@ + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; + options->chroot_directory = NULL; +-#ifdef WITH_LDAP_PUBKEY +- /* XXX dirty */ +- options->lpk.ld = NULL; +- options->lpk.on = -1; +- options->lpk.servers = NULL; +- options->lpk.u_basedn = NULL; +- options->lpk.g_basedn = NULL; +- options->lpk.binddn = NULL; +- options->lpk.bindpw = NULL; +- options->lpk.sgroup = NULL; +- options->lpk.filter = NULL; +- options->lpk.fgroup = NULL; +- options->lpk.l_conf = NULL; +- options->lpk.tls = -1; +- options->lpk.b_timeout.tv_sec = -1; +- options->lpk.s_timeout.tv_sec = -1; +- options->lpk.flags = FLAG_EMPTY; +-#endif +- + } + + void |