diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2016-03-04 14:15:31 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2016-03-04 14:15:31 +0100 |
| commit | 144f8c64cbb906c1f4a7f6bf5fbed16e35ae7bc2 (patch) | |
| tree | e3a162519956a8af812e7e2d584b9831d0e47dd9 | |
| parent | 51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5 (diff) | |
pam_unix: Silence warnings and fix a minor bug.
Fixes a minor bug in behavior when is_selinux_enabled()
returned negative value.
* modules/pam_unix/passverify.c: Add parentheses to SELINUX_ENABLED macro.
(unix_update_shadow): Safe cast forwho to non-const char *.
* modules/pam_unix/support.c: Remove unused SELINUX_ENABLED macro.
| -rw-r--r-- | modules/pam_unix/passverify.c | 4 | ||||
| -rw-r--r-- | modules/pam_unix/support.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index 078adc62..5d6a1484 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -31,7 +31,7 @@ #ifdef WITH_SELINUX #include <selinux/selinux.h> -#define SELINUX_ENABLED is_selinux_enabled()>0 +#define SELINUX_ENABLED (is_selinux_enabled()>0) #else #define SELINUX_ENABLED 0 #endif @@ -958,7 +958,7 @@ PAMH_ARG_DECL(int unix_update_shadow, fclose(opwfile); if (!wroteentry && !err) { - spwdent.sp_namp = forwho; + spwdent.sp_namp = (char *)forwho; spwdent.sp_pwdp = towhat; spwdent.sp_lstchg = time(NULL) / (60 * 60 * 24); if (spwdent.sp_lstchg == 0) diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index abccd828..0fd1dba4 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -30,12 +30,6 @@ #include "support.h" #include "passverify.h" -#ifdef WITH_SELINUX -#include <selinux/selinux.h> -#define SELINUX_ENABLED is_selinux_enabled()>0 -#else -#define SELINUX_ENABLED 0 -#endif static char * search_key (const char *key, const char *filename) |