Correctly cast uid and gid sentinel values.

diff --git a/fw.c b/fw.c
index c2c345c..b0eed70 100644 (file)
--- a/fw.c
+++ b/fw.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: fw.c,v 1.13 2002/02/22 23:45:20 mdw Exp $
+ * $Id: fw.c,v 1.14 2003/01/24 20:12:40 mdw Exp $

  *
  * Port forwarding thingy
  *
  *
  * Port forwarding thingy
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $

+ * Revision 1.14  2003/01/24 20:12:40  mdw
+ * Correctly cast uid and gid sentinel values.
+ *

  * Revision 1.13  2002/02/22 23:45:20  mdw
  * Add option to change the listen(2) parameter.  Receive `fw'-specific
  * code from `conf.c'.
  * Revision 1.13  2002/02/22 23:45:20  mdw
  * Add option to change the listen(2) parameter.  Receive `fw'-specific
  * code from `conf.c'.


@@ -797,12 +800,12 @@ int main(int argc, char *argv[])
   /* --- Drop privileges --- */
 
 #ifdef HAVE_SETGROUPS
   /* --- Drop privileges --- */
 
 #ifdef HAVE_SETGROUPS

-  if ((dropg != -1 && (setgid(dropg) || setgroups(1, &dropg))) ||
-      (drop != -1 && setuid(drop)))
+  if ((dropg != (gid_t)-1 && (setgid(dropg) || setgroups(1, &dropg))) ||
+      (drop != (uid_t)-1 && setuid(drop)))

     die(1, "couldn't drop privileges: %s", strerror(errno));
 #else
     die(1, "couldn't drop privileges: %s", strerror(errno));
 #else

-  if ((dropg != -1 && setgid(dropg)) ||
-      (drop != -1 && setuid(drop)))
+  if ((dropg != (gid_t)-1 && setgid(dropg)) ||
+      (drop != (uid_t)-1 && setuid(drop)))

     die(1, "couldn't drop privileges: %s", strerror(errno));
 #endif
 
     die(1, "couldn't drop privileges: %s", strerror(errno));
 #endif