* Splitted `libgtop_sysdeps.la' into `libgtop_sysdeps.la' and `libgtop_sysdeps_suid.la'. Everything that needs to be suid/sgid is in `libgtop_sysdeps_suid.la' and the rest in `libgtop_sysdeps.la'. The functions from `libgtop_sysdeps_suid.la' have the `_p' prefix and the ones from `libgtop_sysdeps.la' the `_s' prefix. The suid library uses `glibtop_open_p' and `glibtop_close_p', the normal one `glibtop_init_s' (found in lib/init.c), `glibtop_open_s' and `glibtop_close_s'. * Added `libgtop_suid_common.la' containing stuff from sysdeps/common that is required from the suid server (currently everything from error.c and xmalloc.c). This means, we can add some more stuff to `libgtop_common.la' without the risk that it may be dangerous in the suid server. * The ``library order'' is much clearer now: -> `libgtop.la' (from lib/) contains user-level stuff; all functions except `glibtop_init_r' have the `_l' suffix. -> `libgtop_common.la' (from sysdeps/common/) contains stuff that is common among the sysdeps directories. use anything from `libgtop_sysdeps.la' and `libgtop_sysdeps_suid.la'. -> `libgtop_sysdeps.la' (from sysdeps/<sysdeps_dir>/) contains everything from the sysdeps directory that doesn't need to be suid/sgid. -> `libgtop_suid_common.la' (from sysdeps/common/) is used from the suid server instead of `libgtop_common.la'. -> `libgtop_sysdeps_suid.la' (from sysdeps/<sysdeps_dir>/) contains everything from the sysdeps directory that needs to be in the suid server. * To summarize: the server is linked only with functions that need to be suid and everything else is linked only with functions that do not need to be suid. Martin 1998-07-22 Martin Baulig <martin@home-of-linux.org> * lib/init.c (glibtop_init_s): Added this init function of the sysdeps directory `libgtop_sysdeps.la'. * lib/open.c (glibtop_open_l): Unconditionally calling `glibtop_init_s' after server initialization. * lib/lib.awk: Removed references to functions from `libgtop_sysdeps_suid.la' to avoid undefined symbols. * sysdeps/stub/open.c (glibtop_open_s): Renamed this function from `glibtop_open_r'. * sysdeps/stub/close.c (glibtop_close_s): Renamed this function from `glibtop_close_l'. * sysdeps/kernel/open.c (glibtop_open_s): Renamed this function from `glibtop_open_r'. * sysdeps/kernel/close.c (glibtop_close_s): Renamed this function from `glibtop_close_l'. * sysdeps/linux/open.c (glibtop_open_s): Renamed this function from `glibtop_open_r'. * sysdeps/linux/close.c (glibtop_close_s): Renamed this function from `glibtop_close_l'. * sysdeps/osf1/Makefile.am (lib_LTLIBRARIES): Added `libgtop_sysdeps_suid.la' for the suid server. * sysdeps/osf1/open_suid.c (glibtop_open_p): New file. Contains all stuff that was formerly in `open.c'. * sysdeps/osf1/open.c: Moved everything from here into the new file `open_suid.c'. * sysdeps/osf1/open.c (glibtop_open_s): New function. * sysdeps/osf1/close_suid.c (glibtop_close_p): New file. * sysdeps/osf1/close.c (glibtop_close_s): New function. * sysdeps/osf1/*.c: Using the new init, open and close functions. * sysdeps/sun4/Makefile.am (lib_LTLIBRARIES): Added `libgtop_sysdeps_suid.la' for the suid server. * sysdeps/sun4/nosuid.c (glibtop_open_s, glibtop_close_s): New file * sysdeps/sun4/*.c: All functions now have the `_p' suffix. * sysdeps/common/Makefile.am (lib_LTLIBRARIES): Added `libgtop_suid_common.la' which only contains stuff that is needed in the suid parts. * sysdeps/common/xmalloc.c: Using `glibtop_error_io_r' instead of `glibtop_error_r'. * sysdeps/{kernel, linux, osf1, sun4, stub}/init.c: Removed. `glibtop_init_s' has been moved into `lib/init.c' since it's the same in all the sysdeps directories. * src/server/main.c: It is now an error to request a feature that does not need the suid server. * src/proxy: Removed.
152 lines
4.2 KiB
C
152 lines
4.2 KiB
C
/* $Id$ */
|
|
|
|
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the Gnome Top Library.
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
The Gnome Top Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The Gnome Top Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <glibtop.h>
|
|
#include <glibtop/open.h>
|
|
#include <glibtop/sysdeps.h>
|
|
#include <glibtop/command.h>
|
|
#include <glibtop/xmalloc.h>
|
|
|
|
#include <glibtop/gnuserv.h>
|
|
|
|
/* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
|
|
|
|
void
|
|
glibtop_open_l (glibtop *server, const char *program_name,
|
|
const unsigned long features, const unsigned flags)
|
|
{
|
|
char version [BUFSIZ], buffer [BUFSIZ];
|
|
int connect_type;
|
|
unsigned nbytes;
|
|
|
|
server->name = program_name;
|
|
|
|
/* It is important to set _GLIBTOP_INIT_STATE_OPEN here when we
|
|
* do recursive calls to glibtop_init_r (). */
|
|
|
|
server->flags |= _GLIBTOP_INIT_STATE_OPEN;
|
|
|
|
server->features = features;
|
|
|
|
switch (server->method) {
|
|
case GLIBTOP_METHOD_PIPE:
|
|
case GLIBTOP_METHOD_UNIX:
|
|
if (glibtop_server_features & features)
|
|
break;
|
|
|
|
fprintf (stderr, "Using the server is not required.\n");
|
|
|
|
server->method = GLIBTOP_METHOD_DIRECT;
|
|
break;
|
|
}
|
|
|
|
switch (server->method) {
|
|
case GLIBTOP_METHOD_DIRECT:
|
|
server->features = 0;
|
|
break;
|
|
case GLIBTOP_METHOD_INET:
|
|
fprintf (stderr, "Connecting to '%s' port %ld.\n",
|
|
server->server_host, server->server_port);
|
|
|
|
connect_type = glibtop_make_connection
|
|
(server->server_host, server->server_port,
|
|
&server->socket);
|
|
|
|
fprintf (stderr, "Connect Type is %d.\n", connect_type);
|
|
|
|
server->flags |= _GLIBTOP_INIT_STATE_SERVER;
|
|
|
|
server->features = -1;
|
|
break;
|
|
case GLIBTOP_METHOD_UNIX:
|
|
fprintf (stderr, "Connecting to Unix Domain Socket.\n");
|
|
|
|
connect_type = glibtop_make_connection
|
|
("unix", 0, &server->socket);
|
|
|
|
fprintf (stderr, "Connect Type is %d.\n", connect_type);
|
|
|
|
server->flags |= _GLIBTOP_INIT_STATE_SERVER;
|
|
|
|
server->features = -1;
|
|
break;
|
|
case GLIBTOP_METHOD_PIPE:
|
|
fprintf (stderr, "Opening pipe to server (%s).\n",
|
|
GTOP_SERVER);
|
|
|
|
if (pipe (server->input) || pipe (server->output))
|
|
glibtop_error_io_r (server, "cannot make a pipe");
|
|
|
|
server->pid = fork ();
|
|
|
|
if (server->pid < 0) {
|
|
glibtop_error_io_r (server, "fork failed");
|
|
} else if (server->pid == 0) {
|
|
close (0); close (1);
|
|
close (server->input [0]); close (server->output [1]);
|
|
dup2 (server->input [1], 1);
|
|
dup2 (server->output [0], 0);
|
|
execl (GTOP_SERVER, NULL);
|
|
glibtop_error_io_r (server, "execl (%s)", GTOP_SERVER);
|
|
_exit (2);
|
|
}
|
|
|
|
close (server->input [1]);
|
|
close (server->output [0]);
|
|
|
|
sprintf (version, "%s server %s ready.\n", PACKAGE, VERSION);
|
|
|
|
glibtop_read_l (server, sizeof (nbytes), &nbytes);
|
|
|
|
if (nbytes != strlen (version))
|
|
glibtop_error_r (server, "Requested %u bytes but got %u",
|
|
strlen (version), nbytes);
|
|
|
|
glibtop_read_l (server, nbytes, buffer);
|
|
|
|
if (memcmp (version, buffer, strlen (version)))
|
|
glibtop_error_r (server, "server version is not %s",
|
|
VERSION);
|
|
break;
|
|
}
|
|
|
|
/* If the server has been started, ask it for its features. */
|
|
|
|
if (server->flags & _GLIBTOP_INIT_STATE_SERVER) {
|
|
glibtop_sysdeps sysdeps;
|
|
|
|
glibtop_call_l (server, GLIBTOP_CMND_SYSDEPS, 0, NULL,
|
|
sizeof (glibtop_sysdeps), &sysdeps);
|
|
|
|
server->features = sysdeps.features;
|
|
|
|
fprintf (stderr, "Server features are %lu.\n",
|
|
server->features);
|
|
}
|
|
|
|
/* In any case, we call the open functions of our own sysdeps
|
|
* directory. */
|
|
|
|
fprintf (stderr, "Calling sysdeps open function.\n");
|
|
|
|
glibtop_open_s (server, program_name, features, flags);
|
|
}
|