Marius Tomaschewski
479a80499b
features and obsoletes several patches we were using before. For complete list of the changes, please read the RELNOTES file shipped along with the package or online: https://kb.isc.org/article/AA-01297/82/DHCP-4.3.3-Release-Notes.html - Removed obsolete patches included upstream now: [- 0007-dhcp-4.2.6-ldap-mt01.patch, - 0009-dhcp-4.2.6-xen-checksum.patch, - 0013-dhcp-4.2.3-P1-dhclient-log-pid.patch, - 0015-Ignore-SIGPIPE-to-not-die-in-socket-code.patch, - 0016-server-log-DHCPv6-addresses-assigned-to-clients.patch, - 0019-dhcp-4.2.x-ldap-debug-write.bnc835818.patch, - 0021-dhcp-4.2.4-P2-bnc878846-conf-to-ldap.patch, - 0022-dhcp-4.2.x-contrib-conf-to-ldap-reorder.886094.patch, - 0023-dhcp-4.2.x-ddns-tsig-hmac-sha-support.890731.patch, - 0025-dhcp-4.2.x-dhcpv6-retransmission-until-MRD.872609.patch, - 0026-dhcp-4.2.x-disable-unused-ddns-port-in-server.891655.patch] - Replaced hostname patch with a dhcpv6 and fqdn aware variant: [- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch, + 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch] - Replaced infiniband support patch with fixed variant: [- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch - 0018-dhcp-4.2.6-improved-xid.patch - 0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch, + 0030-infiniband-support.patch] - Merged/Adopted patches for the dhcp-4.3.3 sources: [* 0004-dhcp-4.1.1-tmpfile.patch, * 0011-dhcp-4.2.6-close-on-exec.patch, * 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch] OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=151
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
From 34e6100717f3de5a32ccb3234a949d017f789fdb Mon Sep 17 00:00:00 2001
|
|
From: Marius Tomaschewski <mt@suse.de>
|
|
Date: Tue, 10 Jun 2014 02:42:32 +0000
|
|
Subject: [PATCH] dhcp-4.2.x-chown-server-leases.bnc868253
|
|
|
|
Fixed dhcp server to chown leases to run user at start
|
|
|
|
References: bnc#868253
|
|
Signed-off-by: Marius Tomaschewski <mt@suse.de>
|
|
|
|
diff --git a/server/dhcpd.c b/server/dhcpd.c
|
|
index afef390..0f5c640 100644
|
|
--- a/server/dhcpd.c
|
|
+++ b/server/dhcpd.c
|
|
@@ -770,8 +770,19 @@ main(int argc, char **argv) {
|
|
}
|
|
|
|
#if defined (PARANOIA)
|
|
- /* change uid to the specified one */
|
|
+ /* ensure, the leases db is owned by the run user/group */
|
|
+ if (set_gid || set_uid) {
|
|
+ char backfname[512];
|
|
+
|
|
+ chown(path_dhcpd_db, set_uid ? set_uid : -1,
|
|
+ set_gid ? set_gid : -1);
|
|
|
|
+ snprintf (backfname, sizeof backfname, "%s~", path_dhcpd_db);
|
|
+ chown(backfname, set_uid ? set_uid : -1,
|
|
+ set_gid ? set_gid : -1);
|
|
+ }
|
|
+
|
|
+ /* change uid to the specified one */
|
|
if (set_gid) {
|
|
/* setgroups is done, OK */
|
|
if (setgroups (0, (void *)0))
|
|
--
|
|
2.1.4
|
|
|