157 lines
5.4 KiB
Diff
157 lines
5.4 KiB
Diff
From 29e167a448eff9aaee13d3c51c56641959d4ca7f Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
Date: Tue, 22 Feb 2022 14:51:41 +0100
|
||
Subject: [PATCH] newrole: silence compiler warnings
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
newrole.c:636:12: warning: function declaration isn’t a prototype [-Wstrict-prototypes]
|
||
636 | static int transition_to_caller_uid()
|
||
| ^~~~~~~~~~~~~~~~~~~~~~~~
|
||
|
||
newrole.c:103:9: warning: macro is not used [-Wunused-macros]
|
||
#define DEFAULT_CONTEXT_SIZE 255 /* first guess at context size */
|
||
^
|
||
|
||
newrole.c:862:4: warning: 'break' will never be executed [-Wunreachable-code-break]
|
||
break;
|
||
^~~~~
|
||
|
||
newrole.c:168:13: warning: no previous extern declaration for non-static variable 'service_name' [-Wmissing-variable-declarations]
|
||
const char *service_name = "newrole";
|
||
^
|
||
|
||
hashtab.c:53:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
|
||
hvalue = h->hash_value(h, key);
|
||
~ ^~~~~~~~~~~~~~~~~~~~~
|
||
hashtab.c:92:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
|
||
hvalue = h->hash_value(h, key);
|
||
~ ^~~~~~~~~~~~~~~~~~~~~
|
||
hashtab.c:124:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
|
||
hvalue = h->hash_value(h, key);
|
||
~ ^~~~~~~~~~~~~~~~~~~~~
|
||
hashtab.c:172:10: warning: implicit conversion changes signedness: 'int' to 'unsigned int' [-Wsign-conversion]
|
||
ret = apply(cur->key, cur->datum, args);
|
||
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||
hashtab.c:174:12: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
|
||
return ret;
|
||
~~~~~~ ^~~
|
||
|
||
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||
---
|
||
policycoreutils/newrole/hashtab.c | 9 +++++----
|
||
policycoreutils/newrole/newrole.c | 15 ++++++---------
|
||
2 files changed, 11 insertions(+), 13 deletions(-)
|
||
|
||
diff --git a/policycoreutils/newrole/hashtab.c b/policycoreutils/newrole/hashtab.c
|
||
index bc502836..26d4f4c7 100644
|
||
--- a/policycoreutils/newrole/hashtab.c
|
||
+++ b/policycoreutils/newrole/hashtab.c
|
||
@@ -44,7 +44,7 @@ hashtab_t hashtab_create(unsigned int (*hash_value) (hashtab_t h,
|
||
|
||
int hashtab_insert(hashtab_t h, hashtab_key_t key, hashtab_datum_t datum)
|
||
{
|
||
- int hvalue;
|
||
+ unsigned int hvalue;
|
||
hashtab_ptr_t prev, cur, newnode;
|
||
|
||
if (!h)
|
||
@@ -83,7 +83,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
|
||
void (*destroy) (hashtab_key_t k,
|
||
hashtab_datum_t d, void *args), void *args)
|
||
{
|
||
- int hvalue;
|
||
+ unsigned int hvalue;
|
||
hashtab_ptr_t cur, last;
|
||
|
||
if (!h)
|
||
@@ -115,7 +115,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
|
||
hashtab_datum_t hashtab_search(hashtab_t h, const_hashtab_key_t key)
|
||
{
|
||
|
||
- int hvalue;
|
||
+ unsigned int hvalue;
|
||
hashtab_ptr_t cur;
|
||
|
||
if (!h)
|
||
@@ -160,8 +160,9 @@ int hashtab_map(hashtab_t h,
|
||
int (*apply) (hashtab_key_t k,
|
||
hashtab_datum_t d, void *args), void *args)
|
||
{
|
||
- unsigned int i, ret;
|
||
+ unsigned int i;
|
||
hashtab_ptr_t cur;
|
||
+ int ret;
|
||
|
||
if (!h)
|
||
return HASHTAB_SUCCESS;
|
||
diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c
|
||
index 9d68b6ab..c9989863 100644
|
||
--- a/policycoreutils/newrole/newrole.c
|
||
+++ b/policycoreutils/newrole/newrole.c
|
||
@@ -100,7 +100,6 @@
|
||
#endif
|
||
|
||
#define DEFAULT_PATH "/usr/bin:/bin"
|
||
-#define DEFAULT_CONTEXT_SIZE 255 /* first guess at context size */
|
||
|
||
extern char **environ;
|
||
|
||
@@ -115,7 +114,7 @@ extern char **environ;
|
||
*
|
||
* Returns malloc'd memory
|
||
*/
|
||
-static char *build_new_range(char *newlevel, const char *range)
|
||
+static char *build_new_range(const char *newlevel, const char *range)
|
||
{
|
||
char *newrangep = NULL;
|
||
const char *tmpptr;
|
||
@@ -166,7 +165,7 @@ static char *build_new_range(char *newlevel, const char *range)
|
||
#include <security/pam_appl.h> /* for PAM functions */
|
||
#include <security/pam_misc.h> /* for misc_conv PAM utility function */
|
||
|
||
-const char *service_name = "newrole";
|
||
+static const char *service_name = "newrole";
|
||
|
||
/* authenticate_via_pam()
|
||
*
|
||
@@ -230,14 +229,13 @@ static int free_hashtab_entry(hashtab_key_t key, hashtab_datum_t d,
|
||
|
||
static unsigned int reqsymhash(hashtab_t h, const_hashtab_key_t key)
|
||
{
|
||
- char *p, *keyp;
|
||
+ const char *p;
|
||
size_t size;
|
||
unsigned int val;
|
||
|
||
val = 0;
|
||
- keyp = (char *)key;
|
||
- size = strlen(keyp);
|
||
- for (p = keyp; ((size_t) (p - keyp)) < size; p++)
|
||
+ size = strlen(key);
|
||
+ for (p = key; ((size_t) (p - key)) < size; p++)
|
||
val =
|
||
(val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^ (*p);
|
||
return val & (h->size - 1);
|
||
@@ -623,7 +621,7 @@ static inline int drop_capabilities(__attribute__ ((__unused__)) int full)
|
||
* This function will set the uid values to be that of caller's uid, and
|
||
* will drop any privilege which may have been raised.
|
||
*/
|
||
-static int transition_to_caller_uid()
|
||
+static int transition_to_caller_uid(void)
|
||
{
|
||
uid_t uid = getuid();
|
||
|
||
@@ -850,7 +848,6 @@ static int parse_command_line_arguments(int argc, char **argv, char *ttyn,
|
||
case 'V':
|
||
printf("newrole: %s version %s\n", PACKAGE, VERSION);
|
||
exit(0);
|
||
- break;
|
||
case 'p':
|
||
*preserve_environment = 1;
|
||
break;
|
||
--
|
||
2.33.0
|
||
|