* 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.
212 lines
5.4 KiB
C
212 lines
5.4 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/xmalloc.h>
|
|
#include <glibtop/parameter.h>
|
|
|
|
#ifndef DEFAULT_PORT
|
|
#define DEFAULT_PORT 42800
|
|
#endif
|
|
|
|
static glibtop _glibtop_global_server;
|
|
glibtop *glibtop_global_server = &_glibtop_global_server;
|
|
|
|
|
|
void
|
|
_init_server (glibtop *server, const unsigned features)
|
|
{
|
|
char *command, *temp;
|
|
|
|
/* Try to get server command, but don't override if already
|
|
* set via glibtop_set_parameter () */
|
|
|
|
if (server->server_command == NULL) {
|
|
const char *temp = getenv ("LIBGTOP_SERVER") ?
|
|
getenv ("LIBGTOP_SERVER") : GTOP_SERVER;
|
|
|
|
server->server_command = glibtop_strdup_r (server, temp);
|
|
}
|
|
|
|
if (server->server_rsh == NULL) {
|
|
const char *temp = getenv ("LIBGTOP_RSH") ?
|
|
getenv ("LIBGTOP_RSH") : "/usr/bin/ssh";
|
|
|
|
server->server_rsh = glibtop_strdup_r (server, temp);
|
|
}
|
|
|
|
/* Try to get server method, but don't override if already
|
|
* set via glibtop_set_parameter () */
|
|
|
|
if (server->method) return;
|
|
|
|
/* If server->command doesn't start with a colon, then it is
|
|
* the full pathname of the server executable. */
|
|
|
|
if (server->server_command [0] != ':') {
|
|
if (features & glibtop_server_features) {
|
|
/* We really need the server. */
|
|
server->method = GLIBTOP_METHOD_PIPE;
|
|
} else {
|
|
/* Fine. No server is needed, so we call the
|
|
* sysdeps functions directly. */
|
|
server->method = GLIBTOP_METHOD_DIRECT;
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/* If the first character of 'server_command' is a colon,
|
|
* the first field is the method to connect to the server. */
|
|
|
|
/* Everything up to the next colon is the method. */
|
|
|
|
command = glibtop_strdup_r (server, server->server_command+1);
|
|
temp = strstr (command, ":");
|
|
if (temp) *temp = 0;
|
|
|
|
/* Dispatch method. */
|
|
|
|
if (!strcmp (command, "direct")) {
|
|
/* Use sysdeps dir instead of connecting to server
|
|
* even if using the server would be required on
|
|
* the current system. */
|
|
server->method = GLIBTOP_METHOD_DIRECT;
|
|
|
|
} else if (!strcmp (command, "inet")) {
|
|
|
|
server->method = GLIBTOP_METHOD_INET;
|
|
|
|
/* Connect to internet server. */
|
|
|
|
if (temp == NULL) {
|
|
/* If no value was set, we use 'localhost'. */
|
|
if (server->server_host == NULL)
|
|
server->server_host = glibtop_strdup_r
|
|
(server, "localhost");
|
|
} else {
|
|
char *temp2 = strstr (temp+1, ":");
|
|
if (temp2) *temp2 = 0;
|
|
|
|
/* Override default. */
|
|
if (server->server_host)
|
|
glibtop_free_r (server, (char *) server->server_host);
|
|
|
|
server->server_host = glibtop_strdup_r
|
|
(server, temp+1);
|
|
|
|
temp = temp2;
|
|
}
|
|
|
|
if (temp == NULL) {
|
|
/* If no value was set, we use DEFAULT_PORT. */
|
|
if (server->server_port == 0)
|
|
server->server_port = DEFAULT_PORT;
|
|
} else {
|
|
char *temp2 = strstr (temp+1, ":");
|
|
if (temp2) *temp2 = 0;
|
|
|
|
if (sscanf (temp+1, "%ld", &server->server_port) != 1)
|
|
server->server_port = DEFAULT_PORT;
|
|
|
|
temp = temp2 ? temp2 + 1 : temp2;
|
|
}
|
|
|
|
} else if (!strcmp (command, "unix")) {
|
|
|
|
/* Connect to unix domain socket. */
|
|
server->method = GLIBTOP_METHOD_UNIX;
|
|
|
|
} else if (!strcmp (command, "pipe")) {
|
|
|
|
/* Open pipe to server. */
|
|
server->method = GLIBTOP_METHOD_PIPE;
|
|
|
|
} else {
|
|
|
|
glibtop_error_r (server, "Unknown server method '%s'",
|
|
server->server_command+1);
|
|
|
|
}
|
|
|
|
glibtop_free_r (server, command);
|
|
}
|
|
|
|
glibtop *
|
|
glibtop_init_r (glibtop **server_ptr, const unsigned long features,
|
|
const unsigned flags)
|
|
{
|
|
glibtop *server;
|
|
|
|
if (server_ptr == NULL)
|
|
return NULL;
|
|
|
|
if (*server_ptr == NULL)
|
|
*server_ptr = glibtop_global_server;
|
|
|
|
server = *server_ptr;
|
|
|
|
/* Should we do the initialization? */
|
|
|
|
if (flags & GLIBTOP_INIT_NO_INIT)
|
|
return server;
|
|
|
|
/* Do the initialization, but only if not already initialized. */
|
|
|
|
if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
|
|
_init_server (server, features);
|
|
|
|
server->flags |= _GLIBTOP_INIT_STATE_INIT;
|
|
}
|
|
|
|
/* Should we open the server? */
|
|
|
|
if (flags & GLIBTOP_INIT_NO_OPEN)
|
|
return server;
|
|
|
|
/* Open server, but only if not already opened. */
|
|
|
|
if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
|
|
glibtop_open_l (glibtop_global_server, "glibtop",
|
|
features, flags);
|
|
|
|
return server;
|
|
}
|
|
|
|
glibtop *
|
|
glibtop_init_s (glibtop **server, const unsigned long features,
|
|
const unsigned flags)
|
|
{
|
|
if (*server != NULL)
|
|
return *server;
|
|
|
|
fprintf (stderr, "DEBUG: %s (%d)\n", __FILE__, __LINE__);
|
|
|
|
if (glibtop_global_server == NULL) {
|
|
glibtop_global_server = &_glibtop_global_server;
|
|
glibtop_open_s (glibtop_global_server, "glibtop",
|
|
features, flags);
|
|
}
|
|
|
|
return *server = glibtop_global_server;
|
|
}
|