oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

**** Merged from HEAD ****

Browse Source
This commit is contained in:
Martin Baulig
1999-09-16 21:38:03 +00:00
parent 2b6b2578be
commit 6799ce187b
25 changed files with 459 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/daemon/ChangeLog
View File

@@ -1,3 +1,8 @@
1999-07-29 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Link the `libgtop_daemon' and the `libgtop_server'
statically if possible.
1999-05-07 Martin Baulig <martin@home-of-linux.org>
* server.c (main): There's some problem with uname () - some systems

8
src/daemon/Makefile.am
View File

@@ -41,11 +41,19 @@ libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la \
$(GLIB_LIBS)\
@LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
if ENABLE_STATIC
libgtop_daemon_LDFLAGS = -static
endif
libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
$(top_builddir)/sysdeps/common/libgtop_suid_common.la \
@LIBSUPPORT@
if ENABLE_STATIC
libgtop_server_LDFLAGS = -static
endif
EXTRA_DIST = server_config.h.in server_config.pl
install-exec-hook:

5
src/daemon/gnuserv.c
View File

@@ -219,7 +219,7 @@ permitted (u_long host_addr, int fd)
* GNU_SECURE protocol....
*/
if (verbose_output)
if (verbose_output) {
if (changed_uid || invoked_from_inetd)
syslog_message (LOG_WARNING,
"Xauth authentication not allowed, "
@@ -228,6 +228,7 @@ permitted (u_long host_addr, int fd)
syslog_message (LOG_WARNING,
"Xauth authentication failed, "
"trying GNU_SECURE auth...");
}
}
/* Other auth protocols go here, and should execute only if
@@ -243,7 +244,7 @@ permitted (u_long host_addr, int fd)
if (enable_debug)
syslog_message (LOG_DEBUG, "Trying %lx - %lx",
host_addr, permitted_hosts [i]);
if (permitted_hosts [i] == NULL)
if (permitted_hosts [i] == 0L)
return (FALSE);
if (host_addr == permitted_hosts [i])
return (TRUE);

14
src/daemon/slave.c
View File

@@ -26,12 +26,12 @@
void
handle_slave_connection (int input, int output)
{
glibtop *server = glibtop_global_server;
int64_t *param_ptr;
const void *ptr;
glibtop *server G_GNUC_UNUSED = glibtop_global_server;
int64_t *param_ptr G_GNUC_UNUSED;
const void *ptr G_GNUC_UNUSED;
unsigned short max_len;
pid_t pid;
unsigned short max_len G_GNUC_UNUSED;
pid_t pid G_GNUC_UNUSED;
glibtop_response _resp, *resp = &_resp;
glibtop_command _cmnd, *cmnd = &_cmnd;
@@ -119,8 +119,8 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
const void *parameter)
{
glibtop *server = glibtop_global_server;
unsigned device;
pid_t pid;
unsigned device G_GNUC_UNUSED;
pid_t pid G_GNUC_UNUSED;
switch (cmnd->command) {
case GLIBTOP_CMND_SYSDEPS: