rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

resolve warnings in port_linux.c

Browse Source
This commit is contained in:
Jan F 2011-03-31 13:43:13 +02:00
parent 11896aa047
commit 8a77a1dfd5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssh-5.8p1-mls.patch
View File

@ -191,7 +191,7 @@ diff -up openssh-5.8p1/openbsd-compat/port-linux.c.mls openssh-5.8p1/openbsd-com
static void static void
ssh_selinux_get_role_level(char **role, const char **level) 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 */ /* 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, +ssh_selinux_getctxbyname(char *pwname,
+ security_context_t *default_sc, security_context_t *user_sc) + security_context_t *default_sc, security_context_t *user_sc)
{ {
security_context_t sc = NULL; - security_context_t sc = NULL;
char *sename, *lvl; char *sename, *lvl;
char *role; char *role;
const char *reqlvl; const char *reqlvl;
int r = 0; int r = 0;
+ context_t con; + context_t con = NULL;
ssh_selinux_get_role_level(&role, &reqlvl); ssh_selinux_get_role_level(&role, &reqlvl);
#ifdef HAVE_GETSEUSERBYNAME #ifdef HAVE_GETSEUSERBYNAME

5
openssh.spec
View File

@ -71,7 +71,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 # 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_ver 5.8p1
%define openssh_rel 23 %define openssh_rel 24
%define pam_ssh_agent_ver 0.9.2 %define pam_ssh_agent_ver 0.9.2
%define pam_ssh_agent_rel 30 %define pam_ssh_agent_rel 30
@ -672,6 +672,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Mar 31 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p1-24 + 0.9.2-30
- resolve warnings in port_linux.c
* Tue Mar 29 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p1-23 + 0.9.2-30 * Tue Mar 29 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p1-23 + 0.9.2-30
- add /etc/sysconfig/sshd - add /etc/sysconfig/sshd