summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-02 00:55:00 +0000
committerColin Watson <cjwatson@debian.org>2010-01-02 00:55:00 +0000
commitdcb1c932a27f8b4dbc1de7ecd2567c0b59f3cbb4 (patch)
tree126e9475298e62ca2124a88cd66c08deb958813b
parentc4ee4042fcb3bfa23696ad73a6319363cd625740 (diff)
Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
closes: #498684).
-rw-r--r--debian/changelog2
-rw-r--r--openbsd-compat/port-linux.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0b688f8ca..5fbc487b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
35 * Add debian/README.source with instructions on bzr handling. 35 * Add debian/README.source with instructions on bzr handling.
36 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes: 36 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
37 #556644). 37 #556644).
38 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
39 closes: #498684).
38 40
39 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 41 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
40 42
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index b7142ba90..9cb58e369 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -69,7 +69,7 @@ ssh_selinux_enabled(void)
69static security_context_t 69static security_context_t
70ssh_selinux_getctxbyname(char *pwname) 70ssh_selinux_getctxbyname(char *pwname)
71{ 71{
72 security_context_t sc; 72 security_context_t sc = NULL;
73 char *sename = NULL, *role = NULL, *lvl = NULL; 73 char *sename = NULL, *role = NULL, *lvl = NULL;
74 int r; 74 int r;
75 75