[src/netbsd-1-5]: src/usr.sbin/dhcp/includes Pull up differences between 1.14...

[mellon <mellon%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da71db311705
branches:  netbsd-1-5
changeset: 488634:da71db311705
user:      mellon <mellon%NetBSD.org@localhost>
date:      Sat Jul 22 04:59:27 2000 +0000

description:
Pull up differences between 1.14 and 1.15

diffstat:

 usr.sbin/dhcp/includes/dhcpd.h |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 14fffa70b4ed -r da71db311705 usr.sbin/dhcp/includes/dhcpd.h
--- a/usr.sbin/dhcp/includes/dhcpd.h    Sat Jul 22 04:58:46 2000 +0000
+++ b/usr.sbin/dhcp/includes/dhcpd.h    Sat Jul 22 04:59:27 2000 +0000
@@ -665,7 +665,7 @@
        u_int32_t requested_lease;      /* Requested lease time, if user
                                           doesn't configure one. */
        struct string_list *media;      /* Possible network media values. */
-       const char *script_name;        /* Name of config script. */
+       char *script_name;              /* Name of config script. */
        enum policy bootp_policy;
                                        /* Ignore, accept or prefer BOOTP
                                           responses. */
@@ -708,6 +708,8 @@
        struct iaddr requested_address;     /* Address we would like to get. */
 
        struct client_config *config;               /* Client configuration. */
+       struct string_list *env;               /* Client script environment. */
+       int envc;                       /* Number of entries in environment. */
 };
 
 /* Information about each network interface. */
@@ -1636,13 +1638,16 @@
 void rewrite_client_leases PROTO ((void));
 int write_client_lease PROTO ((struct client_state *,
                               struct client_lease *, int, int));
-char *dhcp_option_ev_name PROTO ((struct option *));
+int dhcp_option_ev_name (char *, size_t, struct option *);
 
 void script_init PROTO ((struct client_state *, const char *,
                         struct string_list *));
 void script_write_params PROTO ((struct client_state *,
                                 const char *, struct client_lease *));
 int script_go PROTO ((struct client_state *));
+void client_envadd (struct client_state *,
+                   const char *, const char *, const char *, ...)
+       __attribute__((__format__(__printf__,4,5)));
 
 struct client_lease *packet_to_lease PROTO ((struct packet *));
 void go_daemon PROTO ((void));