More sign compare fixes. On Solaris id_t is signed so use uid_t

in the set_perms.c ID macro instead.

diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c
index 095cf62319e81b83356d3f8c0bf214fd9b494182..e37e38baa62b6b2a5971638156835303e6627f96 100644 (file)
--- a/plugins/sudoers/set_perms.c
+++ b/plugins/sudoers/set_perms.c
@@ -79,9 +79,9 @@ static struct perm_state perm_stack[PERM_STACK_MAX];
 static int perm_stack_depth = 0;
 
 #undef ID
-#define ID(x) (state->x == ostate->x ? (id_t)-1 : state->x)
+#define ID(x) (state->x == ostate->x ? (uid_t)-1 : state->x)
 #undef OID
-#define OID(x) (ostate->x == state->x ? (id_t)-1 : ostate->x)
+#define OID(x) (ostate->x == state->x ? (uid_t)-1 : ostate->x)
 
 void
 rewind_perms(void)

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 71525244c419ceb04e3e5c1c55e106167214e3ef..bef76d7d8e597e52f03cb01c2426c624f9eda566 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -1022,7 +1022,7 @@ create_admin_success_flag(void)
     /* Build path to flag file. */
     n = snprintf(flagfile, sizeof(flagfile), "%s/.sudo_as_admin_successful",
        user_dir);
-    if (n <= 0 || n >= sizeof(flagfile))
+    if (n <= 0 || (size_t)n >= sizeof(flagfile))
        debug_return;
 
     /* Create admin flag file if it doesn't already exist. */

diff --git a/src/ttyname.c b/src/ttyname.c
index 0e77c644e0c8caa2fb2fdab8d662e9d79f9438ec..4ffb4dd21dc282c78aa9a6afc483550d99319a65 100644 (file)
--- a/src/ttyname.c
+++ b/src/ttyname.c
@@ -193,7 +193,7 @@ sudo_ttyname_scan(const char *dir, dev_t rdev, bool builtin)
     size_t sdlen, d_len, len, num_subdirs = 0, max_subdirs = 0;
     struct dirent *dp;
     struct stat sb;
-    int i;
+    unsigned int i;
     debug_decl(sudo_ttyname_scan, SUDO_DEBUG_UTIL)
 
     if (dir[0] == '\0' || (d = opendir(dir)) == NULL)