diff options
author | 2006-05-05 23:47:40 +0000 | |
---|---|---|
committer | 2006-05-05 23:47:40 +0000 | |
commit | 7e077333149750cba29efa74328fed9991b8cce0 (patch) | |
tree | 80a3b9d011c0978b500de25fd7d02c94d999a1d2 /net-misc/dhcp/files | |
parent | Add ~x86-fbsd keyword. (diff) | |
download | gentoo-2-7e077333149750cba29efa74328fed9991b8cce0.tar.gz gentoo-2-7e077333149750cba29efa74328fed9991b8cce0.tar.bz2 gentoo-2-7e077333149750cba29efa74328fed9991b8cce0.zip |
Punt old version
(Portage version: 2.1_pre10-r2)
Diffstat (limited to 'net-misc/dhcp/files')
-rw-r--r-- | net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch | 83 | ||||
-rw-r--r-- | net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 | 3 |
2 files changed, 0 insertions, 86 deletions
diff --git a/net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch deleted file mode 100644 index 3fedc7c0e80b..000000000000 --- a/net-misc/dhcp/files/dhcp-3.0.4_beta2-dhclient-stdin-conf.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- common/conflex.c.orig 2006-02-21 16:21:45.000000000 +0000 -+++ common/conflex.c 2006-02-21 16:23:06.000000000 +0000 -@@ -90,7 +90,7 @@ - struct parse **cfile; - { - /* "Memory" config files have no file. */ -- if ((*cfile)->file != -1) -+ if ((*cfile)->file != -1 && (*cfile)->file != fileno(stdin)) - close((*cfile)->file); - - if ((*cfile)->bufsiz) ---- client/clparse.c.orig 2006-02-22 09:37:12.000000000 +0000 -+++ client/clparse.c 2006-02-22 09:38:26.000000000 +0000 -@@ -97,6 +97,11 @@ - status = read_client_conf_file (path_dhclient_conf, - (struct interface_info *)0, - &top_level_config); -+ -+ /* Read any extra configuration from stdin */ -+ read_client_conf_stdin ((struct interface_info *)0, -+ &top_level_config); -+ - if (status != ISC_R_SUCCESS) { - ; - #ifdef LATER -@@ -148,20 +153,17 @@ - return status; - } - --int read_client_conf_file (const char *name, struct interface_info *ip, -- struct client_config *client) -+int read_client_conf_actual (int file, const char *name, -+ struct interface_info *ip, -+ struct client_config *client) - { -- int file; - struct parse *cfile; - const char *val; - int token; - isc_result_t status; - -- if ((file = open (name, O_RDONLY)) < 0) -- return uerr2isc (errno); -- - cfile = (struct parse *)0; -- new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0); -+ new_parse (&cfile, file, (char *)0, 0, name , 0); - - do { - token = peek_token (&val, (unsigned *)0, cfile); -@@ -177,6 +179,32 @@ - return status; - } - -+int read_client_conf_file (const char *name, struct interface_info *ip, -+ struct client_config *client) -+{ -+ int file; -+ isc_result_t status; -+ -+ if ((file = open (name, O_RDONLY)) < 0) -+ return uerr2isc (errno); -+ -+ status = read_client_conf_actual(file, name, ip, client); -+ -+ return status; -+} -+ -+ -+int read_client_conf_stdin (struct interface_info *ip, -+ struct client_config *client) -+{ -+ int file = fileno(stdin); -+ isc_result_t status; -+ -+ if (isatty(file)) return ISC_R_NOTFOUND; -+ status = read_client_conf_actual(file, "stdin", ip, client); -+ -+ return status; -+} - - /* lease-file :== client-lease-statements END_OF_FILE - client-lease-statements :== <nil> diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 b/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 deleted file mode 100644 index adfc694531b1..000000000000 --- a/net-misc/dhcp/files/digest-dhcp-3.0.4_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c9fc24218f3d16d59c4e1bc5f42ea3b7 dhcp-3.0.4rc1.tar.gz 882072 -RMD160 1d8c4ee31aa74c84201e009aab2bfe2851c8f785 dhcp-3.0.4rc1.tar.gz 882072 -SHA256 e2fbdefa2dc15e398cc33e96ffaae4eafebd6596d2cda36fea6fcaed190df070 dhcp-3.0.4rc1.tar.gz 882072 |