packages: openssh/openssh-kuserok.patch - resolve conflict with other patches

[baggins]

Author: baggins                      Date: Tue Apr 19 12:10:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve conflict with other patches

---- Files affected:
packages/openssh:
   openssh-kuserok.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/openssh/openssh-kuserok.patch
diff -u packages/openssh/openssh-kuserok.patch:1.1 packages/openssh/openssh-kuserok.patch:1.2
--- packages/openssh/openssh-kuserok.patch:1.1	Tue Apr 19 14:08:10 2011
+++ packages/openssh/openssh-kuserok.patch	Tue Apr 19 14:10:06 2011
@@ -59,9 +59,9 @@
  	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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-kuserok.patch?r1=1.1&r2=1.2&f=u