summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Dill2003-12-16 02:30:53 +0000
committerRuss Dill2003-12-16 02:30:53 +0000
commit8b3845106a086ea78a24d7981ee41e76070e83fe (patch)
treea998a755c5f910484ce292ffe916f59027b89231
parent4b77acafa6f8b907903ea4a140b7c4a314ed71b2 (diff)
downloadbusybox-8b3845106a086ea78a24d7981ee41e76070e83fe.zip
busybox-8b3845106a086ea78a24d7981ee41e76070e83fe.tar.gz
why the complication of a static string rather than a define? gcc isn't dumb
-rw-r--r--networking/udhcp/dhcpd.h3
-rw-r--r--networking/udhcp/dumpleases.c2
-rw-r--r--networking/udhcp/files.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index e219143..d53a809 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -5,7 +5,9 @@
#include <netinet/ip.h>
#include <netinet/udp.h>
+#include "libbb_udhcp.h"
#include "leases.h"
+#include "version.h"
/************************************/
/* Defaults _you_ may want to tweak */
@@ -13,6 +15,7 @@
/* the period of time the client is allowed to use that address */
#define LEASE_TIME (60*60*24*10) /* 10 days of seconds */
+#define LEASES_FILE "/var/lib/misc/udhcpd.leases"
/* where to find the DHCP server configuration file */
#define DHCPD_CONF_FILE "/etc/udhcpd.conf"
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 5cb3a15..4c1ee13 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
FILE *fp;
int i, c, mode = REMAINING;
long expires;
- const char *file = leases_file;
+ const char *file = LEASES_FILE;
struct dhcpOfferedAddr lease;
struct in_addr addr;
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 0597dc3..23d8c00 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -167,7 +167,7 @@ static const struct config_keyword keywords[] = {
{"conflict_time",read_u32,&(server_config.conflict_time),"3600"},
{"offer_time", read_u32, &(server_config.offer_time), "60"},
{"min_lease", read_u32, &(server_config.min_lease), "60"},
- {"lease_file", read_str, &(server_config.lease_file), leases_file},
+ {"lease_file", read_str, &(server_config.lease_file), LEASES_FILE},
{"pidfile", read_str, &(server_config.pidfile), "/var/run/udhcpd.pid"},
{"notify_file", read_str, &(server_config.notify_file), ""},
{"siaddr", read_ip, &(server_config.siaddr), "0.0.0.0"},