Commit b8cd80d9 authored by Jiri Popelka's avatar Jiri Popelka

Fixed 2 SELinux related compiler warnings.

parent a1de6479
...@@ -91,8 +91,6 @@ ...@@ -91,8 +91,6 @@
#if HAVE_SELINUX #if HAVE_SELINUX
#include <selinux/selinux.h> #include <selinux/selinux.h>
#else
#define security_context_t char*
#endif #endif
#include "net-support.h" #include "net-support.h"
#include "pathnames.h" #include "pathnames.h"
...@@ -300,7 +298,7 @@ static void prg_cache_add(unsigned long inode, char *name, const char *scon) ...@@ -300,7 +298,7 @@ static void prg_cache_add(unsigned long inode, char *name, const char *scon)
strcpy(pn->name, name); strcpy(pn->name, name);
{ {
size_t len = (strlen(scon) - sizeof(pn->scon)) + 1; int len = (strlen(scon) - sizeof(pn->scon)) + 1;
if (len > 0) if (len > 0)
strcpy(pn->scon, &scon[len + 1]); strcpy(pn->scon, &scon[len + 1]);
else else
...@@ -408,7 +406,9 @@ static void prg_cache_load(void) ...@@ -408,7 +406,9 @@ static void prg_cache_load(void)
const char *cs, *cmdlp; const char *cs, *cmdlp;
DIR *dirproc = NULL, *dirfd = NULL; DIR *dirproc = NULL, *dirfd = NULL;
struct dirent *direproc, *direfd; struct dirent *direproc, *direfd;
#if HAVE_SELINUX
security_context_t scon = NULL; security_context_t scon = NULL;
#endif
if (prg_cache_loaded || !flag_prg) return; if (prg_cache_loaded || !flag_prg) return;
prg_cache_loaded = 1; prg_cache_loaded = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment