1 |
vapier 11/01/25 06:40:20 |
2 |
|
3 |
Added: openssh-5.7_p1-x509-hpn-glue.patch |
4 |
Log: |
5 |
Add x509/ldap/hpn support back in. Auto-remove ecdsa support from init.d if openssl lacks support #352645 by William Throwe. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/openssh/files/openssh-5.7_p1-x509-hpn-glue.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-5.7_p1-x509-hpn-glue.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-5.7_p1-x509-hpn-glue.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: openssh-5.7_p1-x509-hpn-glue.patch |
16 |
=================================================================== |
17 |
Move things around so hpn applies cleanly when using X509. |
18 |
|
19 |
--- a/Makefile.in |
20 |
+++ b/Makefile.in |
21 |
@@ -46,11 +46,12 @@ |
22 |
CC=@CC@ |
23 |
LD=@LD@ |
24 |
CFLAGS=@CFLAGS@ |
25 |
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
26 |
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
27 |
LIBS=@LIBS@ |
28 |
SSHDLIBS=@SSHDLIBS@ |
29 |
LIBEDIT=@LIBEDIT@ |
30 |
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ |
31 |
+CPPFLAGS+=@LDAP_CPPFLAGS@ |
32 |
AR=@AR@ |
33 |
AWK=@AWK@ |
34 |
RANLIB=@RANLIB@ |
35 |
--- a/servconf.c |
36 |
+++ b/servconf.c |
37 |
@@ -153,9 +153,6 @@ initialize_server_options(ServerOptions *options) |
38 |
options->zero_knowledge_password_authentication = -1; |
39 |
options->revoked_keys_file = NULL; |
40 |
options->trusted_user_ca_keys = NULL; |
41 |
- options->authorized_principals_file = NULL; |
42 |
- options->ip_qos_interactive = -1; |
43 |
- options->ip_qos_bulk = -1; |
44 |
|
45 |
options->hostbased_algorithms = NULL; |
46 |
options->pubkey_algorithms = NULL; |
47 |
@@ -168,6 +165,9 @@ initialize_server_options(ServerOptions *options) |
48 |
options->va.certificate_file = NULL; |
49 |
options->va.responder_url = NULL; |
50 |
#endif /*def SSH_OCSP_ENABLED*/ |
51 |
+ options->authorized_principals_file = NULL; |
52 |
+ options->ip_qos_interactive = -1; |
53 |
+ options->ip_qos_bulk = -1; |
54 |
} |
55 |
|
56 |
void |
57 |
@@ -367,9 +367,6 @@ typedef enum { |
58 |
sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, |
59 |
sMatch, sPermitOpen, sForceCommand, sChrootDirectory, |
60 |
sUsePrivilegeSeparation, sAllowAgentForwarding, |
61 |
- sZeroKnowledgePasswordAuthentication, sHostCertificate, |
62 |
- sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, |
63 |
- sKexAlgorithms, sIPQoS, |
64 |
sHostbasedAlgorithms, |
65 |
sPubkeyAlgorithms, |
66 |
sX509KeyAlgorithm, |
67 |
@@ -380,6 +377,9 @@ typedef enum { |
68 |
sCAldapVersion, sCAldapURL, |
69 |
sVAType, sVACertificateFile, |
70 |
sVAOCSPResponderURL, |
71 |
+ sZeroKnowledgePasswordAuthentication, sHostCertificate, |
72 |
+ sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, |
73 |
+ sKexAlgorithms, sIPQoS, |
74 |
sDeprecated, sUnsupported |
75 |
} ServerOpCodes; |