[openssh] resolve warnings in port_linux.c

[Jan F. Chadima]

commit 8a77a1dfd58d33d770a6c22b9b477edc0753f820
Author: Jan F <jfch at kerberos.example.com>
Date:   Thu Mar 31 13:43:13 2011 +0200

    resolve warnings in port_linux.c

 openssh-5.8p1-mls.patch |    6 +++---
 openssh.spec            |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/openssh-5.8p1-mls.patch b/openssh-5.8p1-mls.patch
index 525e6b5..8312e1c 100644
--- a/openssh-5.8p1-mls.patch
+++ b/openssh-5.8p1-mls.patch
@@ -191,7 +191,7 @@ diff -up openssh-5.8p1/openbsd-compat/port-linux.c.mls openssh-5.8p1/openbsd-com
  static void
  ssh_selinux_get_role_level(char **role, const char **level)
  {
-@@ -65,14 +216,16 @@ ssh_selinux_get_role_level(char **role, 
+@@ -65,14 +216,15 @@ ssh_selinux_get_role_level(char **role, 
  }
  
  /* Return the default security context for the given username */
@@ -201,12 +201,12 @@ diff -up openssh-5.8p1/openbsd-compat/port-linux.c.mls openssh-5.8p1/openbsd-com
 +ssh_selinux_getctxbyname(char *pwname,
 +	security_context_t *default_sc, security_context_t *user_sc)
  {
- 	security_context_t sc = NULL;
+-	security_context_t sc = NULL;
  	char *sename, *lvl;
  	char *role;
  	const char *reqlvl;
  	int r = 0;
-+	context_t con;
++	context_t con = NULL;
  
  	ssh_selinux_get_role_level(&role, &reqlvl);
  #ifdef HAVE_GETSEUSERBYNAME
diff --git a/openssh.spec b/openssh.spec
index fb905bb..7a275ef 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.8p1
-%define openssh_rel 23
+%define openssh_rel 24
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 30
 
@@ -672,6 +672,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 31 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p1-24 + 0.9.2-30
+- resolve warnings in port_linux.c
+
 * Tue Mar 29 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p1-23 + 0.9.2-30
 - add /etc/sysconfig/sshd