Summary of this long ChangeLog:

 * 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.

1 files changed, 53 insertions, 8 deletions

diff --git a/src/daemon/slave.c b/src/daemon/slave.c
index 19c07025..cefeda2d 100644
--- a/src/daemon/slave.c
+++ b/src/daemon/slave.c
@@ -19,17 +19,62 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <glibtop.h>
-#include <glibtop/gnuserv.h>
+#include "daemon.h"
 
-#include <glibtop/open.h>
-#include <glibtop/union.h>
+void
+handle_slave_connection (int input, int output)
+{
+	glibtop *server = glibtop_global_server;
+	glibtop_response _resp, *resp = &_resp;
+	glibtop_command _cmnd, *cmnd = &_cmnd;
+	char parameter [BUFSIZ];
+	void *ptr;
 
-#include <glibtop/command.h>
-#include <glibtop/parameter.h>
+	while (do_read (input, cmnd, sizeof (glibtop_command))) {
+#ifdef SLAVE_DEBUG
+		fprintf (stderr, "Slave %d received command "
+			 "%d from client.\n", getpid (), cmnd->command);
+#endif
+		
+		if (cmnd->data_size >= BUFSIZ)
+			glibtop_error ("Client sent %d bytes, "
+				       "but buffer is %d",
+				       cmnd->size, BUFSIZ);
 
-#define _offset_union(p)	((char *) &resp->u.p - (char *) resp)
-#define _offset_data(p)		_offset_union (data.p)
+		memset (parameter, 0, sizeof (parameter));
+		
+		if (cmnd->data_size) {
+#ifdef SLAVE_DEBUG
+			fprintf (stderr, "Client has %d bytes of data.\n",
+				 cmnd->data_size);
+#endif
+			
+			do_read (input, parameter, cmnd->data_size);
+			
+		} else if (cmnd->size) {
+			memcpy (parameter, cmnd->parameter, cmnd->size);
+		}
+    
+		switch (cmnd->command) {
+		case GLIBTOP_CMND_QUIT:
+			do_output (output, resp, 0, 0, NULL);
+			return;
+#if GLIBTOP_SUID_PROCLIST
+		case GLIBTOP_CMND_PROCLIST:
+			ptr = glibtop_get_proclist_p
+				(server, &resp->u.data.proclist);
+			do_output (output, resp, _offset_data (proclist),
+				   resp->u.data.proclist.total, ptr);
+			glibtop_free_r (server, ptr);
+			break;
+#endif
+		default:
+			handle_slave_command (cmnd, resp, parameter);
+			do_output (output, resp, resp->offset, 0, NULL);
+			break;
+		}
+	}
+}
 
 void
 handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,