systat -> sysconf

diff --git a/client/dhclient.c b/client/dhclient.c
index 7941b6b1acbb65321610da69fb2aacf69eb61498..3e71acfaccba9a1d5068d6472631bcabb661ccc4 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhclient.c,v 1.41 1997/10/20 21:35:34 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.42 1997/10/20 22:00:17 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -231,8 +231,8 @@ int main (argc, argv, envp)
        /* Set up the bootp packet handler... */
        bootp_packet_handler = do_packet;
 
-       /* Start listening on the systat socket... */
-       systat_startup (status_message);
+       /* Start listening on the sysconf socket... */
+       sysconf_startup (status_message);
 
        /* Start dispatching packets and timeouts... */
        dispatch ();
@@ -2015,7 +2015,7 @@ void write_client_pid_file ()
 }
 
 void status_message (header, data)
-       struct systat_header *header;
+       struct sysconf_header *header;
        void *data;
 {
        switch (header -> type) {

diff --git a/includes/sysconf.h b/includes/sysconf.h
index bd4c37fdf1aef5b597ea30be82be8b2c835fea57..5feb4c75c70664a14f1230a48dccc46fe1880b9d 100644 (file)
--- a/includes/sysconf.h
+++ b/includes/sysconf.h
@@ -42,7 +42,7 @@
 
 #define SYSCONF_SOCKET "/var/run/sysconf"
 
-struct systat_header {
+struct sysconf_header {
        u_int32_t type;         /* Type of status message... */
        u_int32_t length;       /* Length of message. */
 };

diff --git a/statmsg/main.c b/statmsg/main.c
index a447ad01dc1d2639f5d0c66ce0999dc8db32dc28..1cd0e5d89f0a9f72ede7b7999ed66ba15d5e4fc9 100644 (file)
--- a/statmsg/main.c
+++ b/statmsg/main.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: main.c,v 1.1 1997/09/16 18:20:53 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: main.c,v 1.2 1997/10/20 22:04:23 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -58,8 +58,8 @@ int main (argc, argv, envp)
        char **envp;
 {
        struct sockaddr_un name;
-       int systat_fd;
-       struct systat_header hdr;
+       int sysconf_fd;
+       struct sysconf_header hdr;
        int status;
        char *buf;
 
@@ -83,31 +83,31 @@ int main (argc, argv, envp)
        else
                error ("unknown status message type %s", argv [1]);
 
-       systat_fd = socket (AF_UNIX, SOCK_STREAM, 0);
-       if (systat_fd < 0)
-               error ("unable to create systat socket: %m");
+       sysconf_fd = socket (AF_UNIX, SOCK_STREAM, 0);
+       if (sysconf_fd < 0)
+               error ("unable to create sysconf socket: %m");
 
        /* XXX for now... */
        name.sun_family = PF_UNIX;
-       strcpy (name.sun_path, "/var/run/systat");
+       strcpy (name.sun_path, "/var/run/sysconf");
        name.sun_len = ((sizeof name) - (sizeof name.sun_path) +
                        strlen (name.sun_path));
 
-       if (connect (systat_fd, (struct sockaddr *)&name, name.sun_len) < 0)
-               error ("can't connect to systat socket: %m");
+       if (connect (sysconf_fd, (struct sockaddr *)&name, name.sun_len) < 0)
+               error ("can't connect to sysconf socket: %m");
 
-       status = write (systat_fd, &hdr, sizeof hdr);
+       status = write (sysconf_fd, &hdr, sizeof hdr);
        if (status < 0)
-               error ("systat: %m");
+               error ("sysconf: %m");
        if (status < sizeof (hdr))
-               error ("systat: short write");
+               error ("sysconf: short write");
 
        if (hdr.length) {
-               status = write (systat_fd, buf, hdr.length);
+               status = write (sysconf_fd, buf, hdr.length);
                if (status < 0)
-                       error ("systat payload write: %m");
+                       error ("sysconf payload write: %m");
                if (status != hdr.length)
-                       error ("systat payload: short write");
+                       error ("sysconf payload: short write");
        }
 
        exit (0);