Marius Tomaschewski
d059c507b7
and enabled Restart=on-abort (fate#315133).
- Update to ISC dhcp-4.2.6 release. See RELNOTES file for the
complete list of changes -- digest of fixes not in dhcp-4.2.5:
- Tidy up receive packet processing.
Thanks to Brad Plank of GTA for reporting the issue and
suggesting a possible patch. [ISC-Bugs #34447]
- Fix the socket handling for DHCPv6 clients to allow multiple
instances of a client on a single machine to work properly.
Previously only one client would receive the packets.
Thanks to Jiri Popelka at Red Hat for the bug report and a
potential patch. [ISC-Bugs #34784]
- Added support for gentle shutdown after signal is received.
[ISC-Bugs #32692] [ISC-Bugs 34945]
- Enhance the DHCPv6 server logging to include the addresses
that are assigned to the clients. This can be enabled by
defining LOG_V6_ADDRESSES in site.h. [ISC-Bugs #26377]
- Fix an operation in the DDNS code to be a bitwise instead
of logical or. [ISC-Bugs #35138]
- Merged patches for dhcp-4.2.6 version to apply without fuzzy,
prepended patch number prefixes to match spec file patch nr,
added patch markup tags / bug numbers to the spec file.
- Applied contrib-lease-path pach to contrib.tar.gz
[- contrib-lease-path.diff]
- Changed to require automake and use its config.sub and guess
files instead of maintaining a patch.
[- config-guess-sub-update.patch]
- Enabled to log DHCPv6 addresses assigned by server to clients
[+ 0016-server-log-DHCPv6-addresses-assigned-to-clients.patch]
- Cleaned up documentation, rpmlint adjustments.
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=121
58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From 48c1bbb9cbd6d6e71178e82fd45a7409efbb9d72 Mon Sep 17 00:00:00 2001
|
|
From: Marius Tomaschewski <mt@suse.de>
|
|
Date: Wed, 27 Apr 2011 13:56:47 +0200
|
|
Subject: [PATCH] dhcp-4.2.2-dhclient-option-checks
|
|
|
|
---
|
|
client/dhclient.c | 6 +++---
|
|
common/options.c | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/client/dhclient.c b/client/dhclient.c
|
|
index b7a14fe..19a527b 100644
|
|
--- a/client/dhclient.c
|
|
+++ b/client/dhclient.c
|
|
@@ -3301,7 +3301,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->filename);
|
|
+ "filename");
|
|
}
|
|
}
|
|
|
|
@@ -3314,7 +3314,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->server_name);
|
|
+ "server-name");
|
|
}
|
|
}
|
|
|
|
@@ -4283,7 +4283,7 @@ static int check_domain_name(const char *ptr, size_t len, int dots)
|
|
const char *p;
|
|
|
|
/* not empty or complete length not over 255 characters */
|
|
- if ((len == 0) || (len > 256))
|
|
+ if ((len == 0) || (len >= 256))
|
|
return(-1);
|
|
|
|
/* consists of [[:alnum:]-]+ labels separated by [.] */
|
|
diff --git a/common/options.c b/common/options.c
|
|
index 56bb151..be44a70 100644
|
|
--- a/common/options.c
|
|
+++ b/common/options.c
|
|
@@ -3979,7 +3979,7 @@ pretty_escape(char **dst, char *dend, const unsigned char **src,
|
|
}
|
|
} else if (**src == '"' || **src == '\'' || **src == '$' ||
|
|
**src == '`' || **src == '\\' || **src == '|' ||
|
|
- **src == '&') {
|
|
+ **src == '&' || **src == ';') {
|
|
if (*dst + 2 > dend)
|
|
return -1;
|
|
|
|
--
|
|
1.8.4
|
|
|