[openssh] - Repaired the kuserok patch

[Jan F. Chadima]

commit 4c4aa13bbb076515d09580540926502750e515ce
Author: Jan F <jfch at hagar.bobr>
Date:   Wed Sep 15 10:07:41 2010 +0200

    - Repaired the kuserok patch

 openssh-5.6p1-kuserok.patch |   32 +++++++++++++++++++++-----------
 openssh.spec                |    5 ++++-
 2 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/openssh-5.6p1-kuserok.patch b/openssh-5.6p1-kuserok.patch
index 7754032..dc3342c 100644
--- a/openssh-5.6p1-kuserok.patch
+++ b/openssh-5.6p1-kuserok.patch
@@ -1,7 +1,7 @@
 diff -up openssh-5.6p1/auth-krb5.c.kuserok openssh-5.6p1/auth-krb5.c
---- openssh-5.6p1/auth-krb5.c.kuserok	2010-08-23 13:01:19.000000000 +0200
-+++ openssh-5.6p1/auth-krb5.c	2010-08-23 13:01:21.000000000 +0200
-@@ -146,9 +146,11 @@ auth_krb5_password(Authctxt *authctxt, c
+--- openssh-5.6p1/auth-krb5.c.kuserok	2010-09-15 09:23:18.000000000 +0200
++++ openssh-5.6p1/auth-krb5.c	2010-09-15 09:31:56.000000000 +0200
+@@ -146,9 +146,21 @@ auth_krb5_password(Authctxt *authctxt, c
  	if (problem)
  		goto out;
  
@@ -13,12 +13,22 @@ diff -up openssh-5.6p1/auth-krb5.c.kuserok openssh-5.6p1/auth-krb5.c
 +			problem = -1;
 +			goto out;
 +		}
++	} else {
++		char kuser[65];
++		if (krb5_aname_to_localname(authctxt->krb5_ctx, authctxt->krb5_user, sizeof(kuser), kuser)) {
++			problem = -1;
++			goto out;
++		}
++		if (strcmp(kuser, client)) {
++			problem = -1;
++			goto out;
++		}
  	}
  
  	problem = ssh_krb5_cc_gen(authctxt->krb5_ctx, &authctxt->krb5_fwd_ccache);
 diff -up openssh-5.6p1/servconf.c.kuserok openssh-5.6p1/servconf.c
---- openssh-5.6p1/servconf.c.kuserok	2010-08-23 13:01:20.000000000 +0200
-+++ openssh-5.6p1/servconf.c	2010-08-23 13:02:14.000000000 +0200
+--- openssh-5.6p1/servconf.c.kuserok	2010-09-15 09:23:19.000000000 +0200
++++ openssh-5.6p1/servconf.c	2010-09-15 09:23:19.000000000 +0200
 @@ -138,6 +138,7 @@ initialize_server_options(ServerOptions 
  	options->revoked_keys_file = NULL;
  	options->trusted_user_ca_keys = NULL;
@@ -87,8 +97,8 @@ diff -up openssh-5.6p1/servconf.c.kuserok openssh-5.6p1/servconf.c
  	/* string arguments */
  	dump_cfg_string(sPidFile, o->pid_file);
 diff -up openssh-5.6p1/servconf.h.kuserok openssh-5.6p1/servconf.h
---- openssh-5.6p1/servconf.h.kuserok	2010-08-23 13:01:20.000000000 +0200
-+++ openssh-5.6p1/servconf.h	2010-08-23 13:01:21.000000000 +0200
+--- openssh-5.6p1/servconf.h.kuserok	2010-09-15 09:23:19.000000000 +0200
++++ openssh-5.6p1/servconf.h	2010-09-15 09:23:19.000000000 +0200
 @@ -157,6 +157,7 @@ typedef struct {
  
  	int	num_permitted_opens;
@@ -98,8 +108,8 @@ diff -up openssh-5.6p1/servconf.h.kuserok openssh-5.6p1/servconf.h
  	char   *revoked_keys_file;
  	char   *trusted_user_ca_keys;
 diff -up openssh-5.6p1/sshd_config.5.kuserok openssh-5.6p1/sshd_config.5
---- openssh-5.6p1/sshd_config.5.kuserok	2010-08-23 13:01:21.000000000 +0200
-+++ openssh-5.6p1/sshd_config.5	2010-08-23 13:03:15.000000000 +0200
+--- openssh-5.6p1/sshd_config.5.kuserok	2010-09-15 09:23:19.000000000 +0200
++++ openssh-5.6p1/sshd_config.5	2010-09-15 09:23:19.000000000 +0200
 @@ -564,6 +564,10 @@ Specifies whether to automatically destr
  file on logout.
  The default is
@@ -120,8 +130,8 @@ diff -up openssh-5.6p1/sshd_config.5.kuserok openssh-5.6p1/sshd_config.5
  .Cm MaxSessions ,
  .Cm PubkeyAuthentication ,
 diff -up openssh-5.6p1/sshd_config.kuserok openssh-5.6p1/sshd_config
---- openssh-5.6p1/sshd_config.kuserok	2010-08-23 13:01:21.000000000 +0200
-+++ openssh-5.6p1/sshd_config	2010-08-23 13:01:21.000000000 +0200
+--- openssh-5.6p1/sshd_config.kuserok	2010-09-15 09:23:19.000000000 +0200
++++ openssh-5.6p1/sshd_config	2010-09-15 09:23:19.000000000 +0200
 @@ -72,6 +72,7 @@ ChallengeResponseAuthentication no
  #KerberosOrLocalPasswd yes
  #KerberosTicketCleanup yes
diff --git a/openssh.spec b/openssh.spec
index 38af3fb..24a55e3 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -71,7 +71,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.6p1
-%define openssh_rel 6
+%define openssh_rel 7
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 27
 
@@ -584,6 +584,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 15 2010 Jan F. Chadima <jchadima at redhat.com> - 5.6p1-7 + 0.9.2-27
+- Repaired the kuserok patch
+
 * Mon Sep 13 2010 Jan F. Chadima <jchadima at redhat.com> - 5.6p1-6 + 0.9.2-27
 - Repaired the problem with puting entries with very big uid into lastlog