From b54197c2e175cfae29b65e3f6c6a853b004f20db Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 18 Jan 2000 11:29:44 +0000 Subject: [PATCH] perl -pni -e 's,server->machine,server->_priv->machine,g' *.c *.h --- sysdeps/osf1/glibtop_suid.h | 4 ++-- sysdeps/osf1/open_suid.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sysdeps/osf1/glibtop_suid.h b/sysdeps/osf1/glibtop_suid.h index bd4e6862..7a06aedb 100644 --- a/sysdeps/osf1/glibtop_suid.h +++ b/sysdeps/osf1/glibtop_suid.h @@ -31,11 +31,11 @@ BEGIN_LIBGTOP_DECLS static inline void glibtop_suid_enter (glibtop *server) { - setreuid (server->machine.uid, server->machine.euid); + setreuid (server->_priv->machine.uid, server->_priv->machine.euid); }; static inline void glibtop_suid_leave (glibtop *server) { - if (setreuid (server->machine.euid, server->machine.uid)) + if (setreuid (server->_priv->machine.euid, server->_priv->machine.uid)) _exit (1); }; diff --git a/sysdeps/osf1/open_suid.c b/sysdeps/osf1/open_suid.c index f9270916..fda98d8c 100644 --- a/sysdeps/osf1/open_suid.c +++ b/sysdeps/osf1/open_suid.c @@ -64,12 +64,12 @@ glibtop_open_p (glibtop *server, const char *program_name, server->name = program_name; - server->machine.uid = getuid (); - server->machine.euid = geteuid (); - server->machine.gid = getgid (); - server->machine.egid = getegid (); + server->_priv->machine.uid = getuid (); + server->_priv->machine.euid = geteuid (); + server->_priv->machine.gid = getgid (); + server->_priv->machine.egid = getegid (); - server->machine.proctable_entries = table + server->_priv->machine.proctable_entries = table (TBL_PROCINFO, 0, NULL, INT_MAX, 0); /* Drop priviledges; we only become root when necessary. @@ -79,10 +79,10 @@ glibtop_open_p (glibtop *server, const char *program_name, */ - if (setreuid (server->machine.euid, server->machine.uid)) + if (setreuid (server->_priv->machine.euid, server->_priv->machine.uid)) _exit (1); - if (setregid (server->machine.egid, server->machine.gid)) + if (setregid (server->_priv->machine.egid, server->_priv->machine.gid)) _exit (1); /* !!! END OF SUID ROOT PART !!! */