- release 2

[packages/openssh.git] / openssh-lpk.patch

diff --git a/openssh-lpk.patch b/openssh-lpk.patch
index 6972dcb47951f9597e703713b2b0f56ed9b78e44..f87e4000690aaf2ffea0d42b25cb0de08869bb4c 100644 (file)
--- a/openssh-lpk.patch
+++ b/openssh-lpk.patch
@@ -1205,15 +1205,15 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/lpk-user-exam
 diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/Makefile.in openssh-5.1p1+lpk/Makefile.in
 --- openssh-5.1p1.orig/Makefile.in     2008-07-08 07:21:12.000000000 -0700
 +++ openssh-5.1p1+lpk/Makefile.in      2008-08-23 15:02:47.000000000 -0700
-@@ -78,7 +78,7 @@
+@@ -91,7 +91,7 @@
+       auth2-gss.o gss-serv.o gss-serv-krb5.o \
+       loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
+       audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+-      roaming_common.o roaming_serv.o
++      roaming_common.o roaming_serv.o ldapauth.o
  
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
-       sshconnect.o sshconnect1.o sshconnect2.o mux.o \
--      roaming_common.o roaming_client.o
-+      roaming_common.o roaming_client.o ldapauth.o
- 
- SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
-       sshpty.o sshlogin.o servconf.o serverloop.o \
+ MANPAGES      = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
+ MANPAGES_IN   = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
 diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/openssh-lpk_openldap.schema openssh-5.1p1+lpk/openssh-lpk_openldap.schema
 --- openssh-5.1p1.orig/openssh-lpk_openldap.schema     1969-12-31 16:00:00.000000000 -0800
 +++ openssh-5.1p1+lpk/openssh-lpk_openldap.schema      2008-08-23 15:02:47.000000000 -0700
@@ -1533,9 +1533,8 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/README.lpk op
 +- CONTACT :
 +  - Eric AUGE <eau@phear.org>
 +  - Andrea Barisani <andrea@inversepath.com>
-diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c openssh-5.1p1+lpk/servconf.c
---- openssh-5.1p1.orig/servconf.c      2008-07-03 20:51:12.000000000 -0700
-+++ openssh-5.1p1+lpk/servconf.c       2008-08-23 15:02:47.000000000 -0700
+--- openssh-5.6p1/servconf.c~  2010-08-24 14:07:30.000000000 +0300
++++ openssh-5.6p1/servconf.c   2010-08-24 14:09:08.999656164 +0300
 @@ -42,6 +42,10 @@
  #include "channels.h"
  #include "groupaccess.h"
@@ -1547,10 +1546,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
  static void add_listen_addr(ServerOptions *, char *, int);
  static void add_one_listen_addr(ServerOptions *, char *, int);
  
-@@ -127,6 +131,25 @@
-       options->zero_knowledge_password_authentication = -1;
+@@ -136,6 +136,24 @@
        options->revoked_keys_file = NULL;
        options->trusted_user_ca_keys = NULL;
+       options->authorized_principals_file = NULL;
 +#ifdef WITH_LDAP_PUBKEY
 +      /* XXX dirty */
 +      options->lpk.ld = NULL;
@@ -1569,7 +1568,6 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
 +      options->lpk.s_timeout.tv_sec = -1;
 +      options->lpk.flags = FLAG_EMPTY;
 +#endif
-+
  }
  
  void
@@ -1619,10 +1617,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
  } ServerOpCodes;
  
  #define SSHCFG_GLOBAL 0x01    /* allowed in main section of sshd_config */
-@@ -408,6 +463,20 @@
+@@ -459,6 +477,20 @@
        { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
-       { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
-       { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
+       { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
+       { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
 +#ifdef WITH_LDAP_PUBKEY
 +      { _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
 +      { _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
@@ -1639,7 +1637,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
 +#endif
        { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
        { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
-       { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
+       { "permittunnel", sPermitTunnel, SSHCFG_ALL },
 @@ -1294,6 +1363,107 @@
                while (arg)
                    arg = strdelim(&cp);