- resolve conflict with other patches

Changed files:
    openssh-kuserok.patch -> 1.2

diff --git a/openssh-kuserok.patch b/openssh-kuserok.patch
index fcd05d78e3241a988c748bae181d89d7fe78d7d9..31e03f7707a8be3bc8659655d23490cc7060311c 100644 (file)
--- a/openssh-kuserok.patch
+++ b/openssh-kuserok.patch
@@ -59,9 +59,9 @@ diff -up openssh-5.8p1/servconf.c.kuserok openssh-5.8p1/servconf.c
        options->ip_qos_interactive = -1;
        options->ip_qos_bulk = -1;
 +      options->use_kuserok = -1;
- }
- 
- void
+ #ifdef WITH_LDAP_PUBKEY
+       /* XXX dirty */
+       options->lpk.ld = NULL;
 @@ -291,6 +292,8 @@ fill_default_server_options(ServerOption
        if (use_privsep == -1)
                use_privsep = 1;