fix datatype

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>

4 files changed, 16 insertions, 14 deletions

diff --git a/src/extern.h b/src/extern.h
index a833a98..435e5f7 100644
--- a/src/extern.h
+++ b/src/extern.h
@@ -511,8 +511,6 @@ extern int defmousetrack;
 extern int defnonblock;
 extern int defobuflimit;
 extern int dflag;
-extern int eff_gid;
-extern int eff_uid;
 extern int focusminheight;
 extern int focusminwidth;
 extern int force_vt;
@@ -539,8 +537,6 @@ extern int search_ic;
 extern int separate_sids;
 extern int queryflag;
 extern int quietflag;
-extern int real_gid;
-extern int real_uid;
 extern int renditions[];
 extern int rflag;
 extern int tty_mode;
@@ -598,6 +594,10 @@ extern struct event serv_read;
 extern struct mode attach_Mode;
 extern struct passwd *ppp;
 
+extern gid_t eff_gid;
+extern gid_t real_gid;
+extern uid_t eff_uid;
+extern uid_t real_uid;
 
 #ifdef NETHACK
 extern int nethackflag;
diff --git a/src/screen.c b/src/screen.c
index 3917b66..00434c7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -183,7 +183,8 @@ int tty_oldmode = -1;
 
 char HostName[MAXSTR];
 int MasterPid, PanicPid;
-int real_uid, real_gid, eff_uid, eff_gid;
+uid_t real_uid, eff_uid;
+gid_t real_gid, eff_gid; 
 int default_startup;
 int ZombieKey_destroy, ZombieKey_resurrect, ZombieKey_onerror;
 char *preselect = NULL;		/* only used in Attach() */
@@ -827,7 +828,7 @@ main(int argc, char **argv)
   if ((LoginName = getlogin()) && LoginName[0] != '\0')
     {
       if ((ppp = getpwnam(LoginName)) != (struct passwd *) 0)
-	if ((int)ppp->pw_uid != real_uid)
+	if (ppp->pw_uid != real_uid)
 	  ppp = (struct passwd *) 0;
     }
   if (ppp == 0)
@@ -992,10 +993,10 @@ main(int argc, char **argv)
 	    {
 	      if (!S_ISDIR(st.st_mode))
 		Panic(0, "'%s' must be a directory.", SockDir);
-              if (eff_uid == 0 && real_uid && (int)st.st_uid != eff_uid)
+              if (eff_uid == 0 && real_uid && st.st_uid != eff_uid)
 		Panic(0, "Directory '%s' must be owned by root.", SockDir);
 	      n = (eff_uid == 0 && (real_uid || (st.st_mode & 0775) != 0775)) ? 0755 :
-	          (eff_gid == (int)st.st_gid && eff_gid != real_gid) ? 0775 :
+	          (eff_gid == st.st_gid && eff_gid != real_gid) ? 0775 :
 		  0777;
 	      if (((int)st.st_mode & 0777) != n)
 		Panic(0, "Directory '%s' must have mode %03o.", SockDir, n);
@@ -1018,12 +1019,12 @@ main(int argc, char **argv)
     Panic(0, "%s is not a directory.", SockPath);
   if (multi)
     {
-      if ((int)st.st_uid != multi_uid)
+      if (st.st_uid != multi_uid)
 	Panic(0, "%s is not the owner of %s.", multi, SockPath);
     }
   else
     {
-      if ((int)st.st_uid != real_uid)
+      if (st.st_uid != real_uid)
 	Panic(0, "You are not the owner of %s.", SockPath);
     }
   if ((st.st_mode & 0777) != 0700)
diff --git a/src/socket.c b/src/socket.c
index b05313c..2f65844 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -200,7 +200,7 @@ FindSocket(int *fdp, int *nfoundp, int *notherp, char *match)
 #endif
 
       debug2("st.st_uid = %d, real_uid = %d\n", st.st_uid, real_uid);
-      if ((int)st.st_uid != real_uid)
+      if (st.st_uid != real_uid)
 	continue;
       mode = (int)st.st_mode & 0777;
       debug1("  has mode 0%03o\n", mode);
@@ -1178,7 +1178,8 @@ sconnect(int s, struct sockaddr *sapp, int len)
 int
 chsock()
 {
-  int r, euid = geteuid();
+  int r;
+  uid_t euid = geteuid();
   if (euid != real_uid)
     {
       if (UserContext() <= 0)
@@ -1204,7 +1205,7 @@ int
 RecoverSocket()
 {
   close(ServerSocket);
-  if ((int)geteuid() != real_uid)
+  if (geteuid() != real_uid)
     {
       if (UserContext() > 0)
 	UserReturn(unlink(SockPath));
diff --git a/src/utmp.c b/src/utmp.c
index 02e5867..69b5c58 100644
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -335,7 +335,7 @@ RemoveLoginSlot()
       char *tty;
       debug("couln't zap slot -> do mesg n\n");
       D_loginttymode = 0;
-      if ((tty = ttyname(D_userfd)) && stat(tty, &stb) == 0 && (int)stb.st_uid == real_uid && !CheckTtyname(tty) && ((int)stb.st_mode & 0777) != 0666)
+      if ((tty = ttyname(D_userfd)) && stat(tty, &stb) == 0 && stb.st_uid == real_uid && !CheckTtyname(tty) && ((int)stb.st_mode & 0777) != 0666)
 	{
 	  D_loginttymode = (int)stb.st_mode & 0777;
 	  chmod(D_usertty, stb.st_mode & 0600);