From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 23 Oct 2013 21:19:41 +0000 (-0600)
Subject: More sign compare fixes.  On Solaris id_t is signed so use uid_t
X-Git-Tag: SUDO_1_8_9^2~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0817429583c5e862737c382a0a51c78768d22e2e;p=sudo

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 095cf6231..e37e38baa 100644
--- 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 71525244c..bef76d7d8 100644
--- 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 0e77c644e..4ffb4dd21 100644
--- 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)