PM: clean up endpoint info API/ABI

diff --git a/include/minix/callnr.h b/include/minix/callnr.h
index c37761681dcf3ac903a3aa60b6bf7c84ebfe3221..75b4b78bbe724f607cc6ce080e533b8cf18e8a03 100755 (executable)
--- a/include/minix/callnr.h
+++ b/include/minix/callnr.h
@@ -97,7 +97,7 @@
 #if 0
 #define FREEMEM                106     /* to PM, not used, not implemented */
 #endif
-#define GETPUID                107     /* to PM: get the uid of a process (endpoint) */
+#define GETEPINFO      107     /* to PM: get pid/uid/gid of an endpoint */
 #define ADDDMA         108     /* to PM: inform PM about a region of memory
                                 * that is used for bus-master DMA
                                 */

diff --git a/include/unistd.h b/include/unistd.h
index ad46bc0b2d212c209fa496fe2722ef07d8a8cb21..3c9e15eaf956d64926a88f057f324ee9cdfa29f7 100755 (executable)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -121,9 +121,6 @@ _PROTOTYPE( int getgroups, (int _gidsetsize, gid_t _grouplist[])    );
 _PROTOTYPE( char *getlogin, (void)                                     );
 _PROTOTYPE( pid_t getpgrp, (void)                                      );
 _PROTOTYPE( pid_t getpid, (void)                                       );
-_PROTOTYPE( pid_t getnpid, (int proc_nr)                               );
-_PROTOTYPE( uid_t getnuid, (int proc_nr)                               );
-_PROTOTYPE( gid_t getngid, (int proc_nr)                               );
 _PROTOTYPE( pid_t getppid, (void)                                      );
 _PROTOTYPE( uid_t getuid, (void)                                       );
 _PROTOTYPE( int isatty, (int _fd)                                      );
@@ -201,7 +198,6 @@ _PROTOTYPE( int devctl, (int ctl_req, int driver, int device, int style,
        int force)                                                      );
 _PROTOTYPE( int mapdriver5, (char *label, size_t len, int major,
        int style, int force)                                           );
-_PROTOTYPE( uid_t getpeuid, (endpoint_t ep)                            );
 _PROTOTYPE(int adddma, (endpoint_t proc_e,
                                phys_bytes start, phys_bytes size)      );
 _PROTOTYPE(int deldma, (endpoint_t proc_e,
@@ -209,6 +205,10 @@ _PROTOTYPE(int deldma, (endpoint_t proc_e,
 _PROTOTYPE(int getdma, (endpoint_t *procp, phys_bytes *basep, 
                                                phys_bytes *sizep)      );
 
+_PROTOTYPE( pid_t getnpid, (endpoint_t proc_ep)                                );
+_PROTOTYPE( uid_t getnuid, (endpoint_t proc_ep)                                );
+_PROTOTYPE( gid_t getngid, (endpoint_t proc_ep)                                );
+
 /* For compatibility with other Unix systems */
 _PROTOTYPE( int getpagesize, (void)                                    );
 _PROTOTYPE( int setgroups, (int ngroups, const gid_t *gidset)          );

diff --git a/lib/other/Makefile.in b/lib/other/Makefile.in
index b7e6e10a9f4d3f37e3dd6df7bef0c6c05c2b6f8a..344a34a81133bdda873bac94fe8a63c944e04249 100644 (file)
--- a/lib/other/Makefile.in
+++ b/lib/other/Makefile.in
@@ -54,7 +54,6 @@ libc_FILES=" \
        getlogin.c \
        getpagesize.c \
        getpass.c \
-       getpeuid.c \
        getpwent.c \
        getttyent.c \
        getw.c \

diff --git a/lib/other/_getngid.c b/lib/other/_getngid.c
index cabb7e3d0e2fd5d5cc64170a75c45e27248e7ed2..22c1144912e5abba7514d41ac7db6a29d7bddbc8 100644 (file)
--- a/lib/other/_getngid.c
+++ b/lib/other/_getngid.c
@@ -2,10 +2,10 @@
 #define getngid        _getngid
 #include <unistd.h>
 
-PUBLIC gid_t getngid(int proc_nr)
+PUBLIC gid_t getngid(endpoint_t proc_ep)
 {
   message m;
-  m.m1_i1 = proc_nr;           /* search gid for this process */
-  if (_syscall(MM, GETGID, &m) < 0) return ( (gid_t) -1);
+  m.m1_i1 = proc_ep;           /* search gid for this process */
+  if (_syscall(MM, GETEPINFO, &m) < 0) return ( (gid_t) -1);
   return( (gid_t) m.m2_i2);    /* return search result */
 }

diff --git a/lib/other/_getnpid.c b/lib/other/_getnpid.c
index 2f51b5a551cc6b3bc59402ef74d599fcb0dbd738..a04ee3c4bc347072b4bf4ea45f6e8031d85b09fb 100644 (file)
--- a/lib/other/_getnpid.c
+++ b/lib/other/_getnpid.c
@@ -2,10 +2,9 @@
 #define getnpid        _getnpid
 #include <unistd.h>
 
-PUBLIC pid_t getnpid(int proc_nr)
+PUBLIC pid_t getnpid(endpoint_t proc_ep)
 {
   message m;
-  m.m1_i1 = proc_nr;           /* search pid for this process */
-  if (_syscall(MM, MINIX_GETPID, &m) < 0) return ( (pid_t) -1);
-  return( (pid_t) m.m2_i2);    /* return search result */
+  m.m1_i1 = proc_ep;           /* search pid for this process */
+  return _syscall(MM, GETEPINFO, &m);
 }

diff --git a/lib/other/_getnuid.c b/lib/other/_getnuid.c
index 67244cff7f43d7a0d204907a713d09f15861d999..29202a86b7b85a74552ea26c5577dde3cbcfa994 100644 (file)
--- a/lib/other/_getnuid.c
+++ b/lib/other/_getnuid.c
@@ -2,10 +2,10 @@
 #define getnuid        _getnuid
 #include <unistd.h>
 
-PUBLIC uid_t getnuid(int proc_nr)
+PUBLIC uid_t getnuid(endpoint_t proc_ep)
 {
   message m;
-  m.m1_i1 = proc_nr;           /* search uid for this process */
-  if (_syscall(MM, GETUID, &m) < 0) return ( (uid_t) -1);
-  return( (uid_t) m.m2_i2);    /* return search result */
+  m.m1_i1 = proc_ep;           /* search uid for this process */
+  if (_syscall(MM, GETEPINFO, &m) < 0) return ( (uid_t) -1);
+  return( (uid_t) m.m2_i1);    /* return search result */
 }

diff --git a/lib/other/getpeuid.c b/lib/other/getpeuid.c
deleted file mode 100755 (executable)
index 4c7e2cd..0000000
--- a/lib/other/getpeuid.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <lib.h>
-#include <unistd.h>
-
-PUBLIC uid_t getpeuid(ep)
-endpoint_t ep;
-{
-  message m;
-
-  m.m1_i1= ep;
-  if (_syscall(MM, GETPUID, &m) < 0) return ( (uid_t) -1);
-  return( (uid_t) m.m2_i1);
-}

diff --git a/servers/pm/getset.c b/servers/pm/getset.c
index dce214deaf31c30bcdeed43cedf2975e2dab991e..5fb6e8c73b5ac673b237802fadae62b0b1f22180 100644 (file)
--- a/servers/pm/getset.c
+++ b/servers/pm/getset.c
@@ -27,22 +27,16 @@ PUBLIC int do_get()
        case GETUID:
                r = rmp->mp_realuid;
                rmp->mp_reply.reply_res2 = rmp->mp_effuid;
-               if (pm_isokendpt(m_in.PM_ENDPT, &proc) == OK && proc >= 0)
-                       rmp->mp_reply.reply_res3 = mproc[proc].mp_effuid;
                break;
 
        case GETGID:
                r = rmp->mp_realgid;
                rmp->mp_reply.reply_res2 = rmp->mp_effgid;
-               if (pm_isokendpt(m_in.PM_ENDPT, &proc) == OK && proc >= 0)
-                       rmp->mp_reply.reply_res3 = mproc[proc].mp_effgid;
                break;
 
        case MINIX_GETPID:
                r = mproc[who_p].mp_pid;
                rmp->mp_reply.reply_res2 = mproc[rmp->mp_parent].mp_pid;
-               if(pm_isokendpt(m_in.PM_ENDPT, &proc) == OK && proc >= 0)
-                       rmp->mp_reply.reply_res3 = mproc[proc].mp_pid;
                break;
 
        case GETPGRP:

diff --git a/servers/pm/main.c b/servers/pm/main.c
index ce6fd90589ae6f3ebfea8008fd518418e8350fd1..6c317082ddc2df68bc189fb63c8f51b9892a0318 100644 (file)
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -128,8 +128,8 @@ PUBLIC int main()
        case GETPROCNR:
                result= do_getprocnr();
                break;
-       case GETPUID:
-               result= do_getpuid();
+       case GETEPINFO:
+               result= do_getepinfo();
                break;
        default:
                /* Else, if the system call number is valid, perform the

diff --git a/servers/pm/misc.c b/servers/pm/misc.c
index 699c0d7dddd78b02ed0a021abbb7f16479b511bb..2d2c3cdf7b54afbdb066eb2d8f1f0497bdaa9a73 100644 (file)
--- a/servers/pm/misc.c
+++ b/servers/pm/misc.c
@@ -5,7 +5,7 @@
  *   do_procstat: request process status  (Jorrit N. Herder)
  *   do_getsysinfo: request copy of PM data structure  (Jorrit N. Herder)
  *   do_getprocnr: lookup process slot number  (Jorrit N. Herder)
- *   do_getpuid: get the uid/euid of a process given its endpoint
+ *   do_getepinfo: get the pid/uid/gid of a process given its endpoint
  *   do_allocmem: allocate a chunk of memory  (Jorrit N. Herder)
  *   do_freemem: deallocate a chunk of memory  (Jorrit N. Herder)
  *   do_getsetpriority: get/set process priority
@@ -360,9 +360,9 @@ PUBLIC int do_getprocnr()
 }
 
 /*===========================================================================*
- *                             do_getpuid                                   *
+ *                             do_getepinfo                                 *
  *===========================================================================*/
-PUBLIC int do_getpuid()
+PUBLIC int do_getepinfo()
 {
   register struct mproc *rmp;
   endpoint_t ep;
@@ -370,7 +370,7 @@ PUBLIC int do_getpuid()
   /* This call should be moved to DS. */
   if (mp->mp_effuid != 0)
   {
-       printf("PM: unauthorized call of do_getpuid by proc %d\n",
+       printf("PM: unauthorized call of do_getepinfo by proc %d\n",
                mp->mp_endpoint);
        sys_sysctl_stacktrace(mp->mp_endpoint);
        return EPERM;
@@ -381,12 +381,13 @@ PUBLIC int do_getpuid()
   for (rmp = &mproc[0]; rmp < &mproc[NR_PROCS]; rmp++) {
        if ((rmp->mp_flags & IN_USE) && (rmp->mp_endpoint == ep)) {
                mp->mp_reply.reply_res2 = rmp->mp_effuid;
-               return(rmp->mp_realuid);
+               mp->mp_reply.reply_res3 = rmp->mp_effgid;
+               return(rmp->mp_pid);
        }
   } 
 
   /* Process not found */
-  return(ESRCH);                       
+  return(ESRCH);
 }
 
 /*===========================================================================*

diff --git a/servers/pm/proto.h b/servers/pm/proto.h
index 836bdbde55baa1a852ce32c50745d260f0901747..f8795d3d144b7e0b25bfdfa63cb544e20071b01a 100644 (file)
--- a/servers/pm/proto.h
+++ b/servers/pm/proto.h
@@ -52,7 +52,7 @@ _PROTOTYPE( int do_sysuname, (void)                                   );
 _PROTOTYPE( int do_getsysinfo, (void)                                  );
 _PROTOTYPE( int do_getsysinfo_up, (void)                                       );
 _PROTOTYPE( int do_getprocnr, (void)                                   );
-_PROTOTYPE( int do_getpuid, (void)                                     );
+_PROTOTYPE( int do_getepinfo, (void)                                   );
 _PROTOTYPE( int do_svrctl, (void)                                      );
 _PROTOTYPE( int do_allocmem, (void)                                    );
 _PROTOTYPE( int do_freemem, (void)                                     );

diff --git a/servers/rs/main.c b/servers/rs/main.c
index 55d909d8538f104b34d1b2ab0feff02cf1b5dd3d..d6e75219ff383b113f16d9d96d7f7f472f84a8c4 100644 (file)
--- a/servers/rs/main.c
+++ b/servers/rs/main.c
@@ -92,7 +92,7 @@ PUBLIC int main(void)
          }
 
          /* Only root can make calls to rs. unless it's RS_LOOKUP. */
-         euid= getpeuid(m.m_source);
+         euid= getnuid(m.m_source);
          if (euid != 0 && call_nr != RS_LOOKUP)
          {
                printf("RS: got unauthorized request %d from endpoint %d\n",