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