This commit was manufactured by cvs2git to create branch 'RA-branch'.

[packages/openssh.git] / ldappubkey-ossh3.6-v2.patch

diff --git a/ldappubkey-ossh3.6-v2.patch b/ldappubkey-ossh3.6-v2.patch
index e9dcc733ad2e44158d0d6d1019ae2bc3e199b86c..e0adc205b114504dac5bdeb28dcaaaaf6caa911a 100644 (file)
--- a/ldappubkey-ossh3.6-v2.patch
+++ b/ldappubkey-ossh3.6-v2.patch
@@ -384,7 +384,7 @@ diff -ru openssh-3.6.1p1/servconf.c openssh-3.6.1p1-ldappubkey/servconf.c
 @@ -303,6 +322,9 @@
        sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
        sUsePrivilegeSeparation,
-       sDeprecated
+       sDeprecated, sUnsupported
 +#ifdef WITH_LDAP_PUBKEY
 +          ,sPubkey_from_ldap, sLdap_server, sBinddn, sBindpw, sMgroup
 +#endif
@@ -489,7 +489,7 @@ diff -ru openssh-3.6.1p1/servconf.h openssh-3.6.1p1-ldappubkey/servconf.h
 @@ -132,6 +148,9 @@
        char   *authorized_keys_file;   /* File containing public keys */
        char   *authorized_keys_file2;
-       int     pam_authentication_via_kbd_int;
+       int     use_pam;                /* Enable auth via PAM */
 +#ifdef WITH_LDAP_PUBKEY
 +      ldap_opt myldap_opt;
 +#endif