Removed localhost from list of permitted host and added

`server_config.h' again - we need to have this file to make
a distribution.

4 files changed, 28 insertions, 12 deletions

diff --git a/src/daemon/.cvsignore b/src/daemon/.cvsignore
index d134b020..3993abba 100644
--- a/src/daemon/.cvsignore
+++ b/src/daemon/.cvsignore
@@ -1,7 +1,6 @@
 Makefile.in
 Makefile
 libgtop_daemon
-server_config.h
 server.conf
 .libs
 .deps
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 7f03c2e8..ae7d9bc5 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -15,7 +15,8 @@ bin_PROGRAMS			= libgtop_daemon @server_programs@
 
 EXTRA_PROGRAMS			= libgtop_server
 
-libgtop_daemon_SOURCES		= gnuserv.c slave.c main.c io.c version.c
+libgtop_daemon_SOURCES		= gnuserv.c slave.c main.c io.c version.c \
+				  daemon.h server_config.h
 libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
 				  $(top_builddir)/sysdeps/common/libgtop_common.la \
 				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
@@ -24,9 +25,10 @@ libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
 				  @INTLLIBS@ @LIBSUPPORT@ @X_LIBS@ -lXau
 libgtop_daemon_LDFLAGS		= -static
 
-libgtop_server_SOURCES		= server.c slave.c io.c version.c
+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@
 libgtop_server_LDFLAGS		= -static
 
+EXTRA_DIST			= server_config.h.in server_config.pl
diff --git a/src/daemon/server_config.h b/src/daemon/server_config.h
new file mode 100644
index 00000000..3f30020c
--- /dev/null
+++ b/src/daemon/server_config.h
@@ -0,0 +1,11 @@
+#define SERVER_PORT		42800
+
+#define SERVER_UID		99
+#define SERVER_GID		99
+
+#define HOST_TABLE_ENTRIES	0
+
+const char *permitted_host_names [HOST_TABLE_ENTRIES] = 
+{  };
+
+unsigned long permitted_hosts [HOST_TABLE_ENTRIES];
diff --git a/src/daemon/server_config.h.in b/src/daemon/server_config.h.in
index 06f2f308..fee61d39 100644
--- a/src/daemon/server_config.h.in
+++ b/src/daemon/server_config.h.in
@@ -1,10 +1,12 @@
+/* -*-c-*- */
+
 /* This is a sample config file.
  *
  * Copy this file to 'server_config.h' and edit it to fix your needs !
  *
  * You can also use the 'server_config.pl' script to create 'server_config.h'.
  *
-/
+ */
 
 #define SERVER_PORT		42800	/* Port the server should listen on. */
 
@@ -19,22 +21,24 @@
 #define SERVER_UID		99	/* User ID the server should run as. */
 #define SERVER_GID		99	/* Group ID the server should run as. */
 
-#define HOST_TABLE_ENTRIES	1	/* Number of entries in the host table. */
+#define HOST_TABLE_ENTRIES	0	/* Number of entries in the host table. */
 
 /* List of hosts that should be authorized to connect to the server.
  *
  * SECURITY WARNING:
- *   Enabling access for a particular hosts means the ALL USERS on this host will
- *   be allowed to connect to the server !
+ *   Enabling access for a particular hosts means the ALL USERS on this host
+ *   will be allowed to connect to the server !
+ *
+ *   If you want security, let this table empty and use the 'xauth' method
+ *   instead.
  *
- *   If you want security, let this table empty and use the 'xauth' method instead.
- *   Look at the manpage of gnuserv (1) as shipped with GNU Emacs for more details
- *   about security. The server uses the same security mechanisms like gnuserv from
- *   XEmacs 20.3.
+ *   Look at the manpage of gnuserv (1) as shipped with GNU Emacs for more 
+ *   details about security. The server uses the same security mechanisms
+ *   like gnuserv from XEmacs 20.3.
  */
 
 const char *permitted_host_names [HOST_TABLE_ENTRIES] =
-{ "localhost" };
+{ };
 
 unsigned long permitted_hosts [HOST_TABLE_ENTRIES];