diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-03 06:34:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-03 06:34:08 +0000 |
| commit | 205443100fccf409e9cdaf1b0792c7cdff02ea48 (patch) | |
| tree | a2b5b2788901fa4ffdee63c62429d99d04076297 /net-misc | |
| parent | Bump for XCB1.0RC3. (diff) | |
| download | gentoo-2-205443100fccf409e9cdaf1b0792c7cdff02ea48.tar.gz gentoo-2-205443100fccf409e9cdaf1b0792c7cdff02ea48.tar.bz2 gentoo-2-205443100fccf409e9cdaf1b0792c7cdff02ea48.zip | |
touchup glue some more
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch index e10365e5ec19..e7737066c5ad 100644 --- a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch +++ b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch @@ -2,6 +2,44 @@ move things around so hpn applies cleanly when using X509 --- servconf.c +++ servconf.c +@@ -106,6 +106,18 @@ + options->log_level = SYSLOG_LEVEL_NOT_SET; + options->rhosts_rsa_authentication = -1; + options->hostbased_authentication = -1; ++ ++ options->hostbased_algorithms = NULL; ++ options->pubkey_algorithms = NULL; ++ ssh_x509flags_initialize(&options->x509flags, 1); ++#ifndef SSH_X509STORE_DISABLED ++ ssh_x509store_initialize(&options->ca); ++#endif /*ndef SSH_X509STORE_DISABLED*/ ++#ifdef SSH_OCSP_ENABLED ++ options->va.type = -1; ++ options->va.certificate_file = NULL; ++ options->va.responder_url = NULL; ++#endif /*def SSH_OCSP_ENABLED*/ + options->hostbased_uses_name_from_packet_only = -1; + options->rsa_authentication = -1; + options->pubkey_authentication = -1; +@@ -146,18 +158,6 @@ + options->permit_tun = -1; + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; +- +- options->hostbased_algorithms = NULL; +- options->pubkey_algorithms = NULL; +- ssh_x509flags_initialize(&options->x509flags, 1); +-#ifndef SSH_X509STORE_DISABLED +- ssh_x509store_initialize(&options->ca); +-#endif /*ndef SSH_X509STORE_DISABLED*/ +-#ifdef SSH_OCSP_ENABLED +- options->va.type = -1; +- options->va.certificate_file = NULL; +- options->va.responder_url = NULL; +-#endif /*def SSH_OCSP_ENABLED*/ + } + + void @@ -329,6 +329,16 @@ /* Portable-specific options */ sUsePAM, |