~ubuntu-branches/ubuntu/dapper/dhcp3/dapper

#! /bin/sh /usr/share/dpatch/dpatch-run

## deroot-client.dpatch by Martin Pitt <martin.pitt@ubuntu.com>

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: No description.

@DPATCH@

diff -urNad dhcp3-3.0.3~/client/Makefile.dist dhcp3-3.0.3/client/Makefile.dist

--- dhcp3-3.0.3~/client/Makefile.dist	2006-05-05 00:58:40.000000000 +0200

+++ dhcp3-3.0.3/client/Makefile.dist	2006-05-05 00:58:42.000000000 +0200

@@ -25,8 +25,9 @@

 	      dhclient.leases.cat5

 SEDMANPAGES = dhclient.man8 dhclient.conf.man5 dhclient-script.man8 \

 	      dhclient.leases.man5

-SRCS   = dhclient.c clparse.c

+SRCS   = dhclient.c clparse.c call-dhclient-script.c

 OBJS   = dhclient.o clparse.o

+LIBS   = -lcap

 PROG   = dhclient

 MAN    = dhclient.8 dhclient.conf.5 dhclient-script.8 dhclient.leases.5

@@ -35,7 +36,7 @@

 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \

 		-DCLIENT_PATH=${CLIENT_PATH}

-all:	$(PROG) $(CATMANPAGES)

+all:	$(PROG) $(CATMANPAGES) call-dhclient-script

 install: all

 	for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \

@@ -51,6 +52,8 @@

 	done

 	$(INSTALL) dhclient $(DESTDIR)$(CLIENTBINDIR)

 	$(CHMOD) 755 $(DESTDIR)$(CLIENTBINDIR)/dhclient

+	$(INSTALL) -D call-dhclient-script $(DESTDIR)/lib/dhcp3-client/call-dhclient-script

+	$(CHMOD) 755 $(DESTDIR)/lib/dhcp3-client/call-dhclient-script

 	if [ x$(SCRIPT) = xnone ]; then \

 	  echo "No client script available."; \

 	else \

@@ -126,4 +129,7 @@

 dhclient:	$(OBJS) $(DHCPLIB)

 	$(CC) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS)

+call-dhclient-script: call-dhclient-script.c

+	$(CC) $(COPTS) $(LFLAGS) -o call-dhclient-script call-dhclient-script.c

+

 # Dependencies (semi-automatically-generated)

diff -urNad dhcp3-3.0.3~/client/call-dhclient-script.c dhcp3-3.0.3/client/call-dhclient-script.c

--- dhcp3-3.0.3~/client/call-dhclient-script.c	1970-01-01 01:00:00.000000000 +0100

+++ dhcp3-3.0.3/client/call-dhclient-script.c	2006-05-05 00:58:42.000000000 +0200

@@ -0,0 +1,11 @@

+#include <unistd.h>

+#include <stdio.h>

+

+int

+main()

+{

+    setreuid(0, 0);

+    execl("/etc/dhcp3/dhclient-script", "/etc/dhcp3/dhclient-script", NULL);

+    perror("could not execute /etc/dhcp3/dhclient-script");

+    return -1;

+}

diff -urNad dhcp3-3.0.3~/client/dhclient.c dhcp3-3.0.3/client/dhclient.c

--- dhcp3-3.0.3~/client/dhclient.c	2006-05-05 00:58:41.000000000 +0200

+++ dhcp3-3.0.3/client/dhclient.c	2006-05-05 00:58:56.000000000 +0200

@@ -37,6 +37,10 @@

 #include "dhcpd.h"

 #include "version.h"

+#include "droppriv.h"

+#include <unistd.h> /* for ftruncate() */

+#include <pwd.h>

+void open_client_pid_file(void);

 TIME default_lease_time = 43200; /* 12 hours... */

 TIME max_lease_time = 86400; /* 24 hours... */

@@ -346,6 +350,14 @@

 	/* Rewrite the lease database... */

 	rewrite_client_leases ();

+        /* Open the client pidfile since we cannot do that after dropping

+         * privileges */

+        open_client_pid_file ();

+

+        /* drop privileges */

+        cap_value_t capsneeded[] = { CAP_NET_RAW, CAP_NET_BIND_SERVICE };

+        drop_privileges( "dhcp", "dhcp", 2, capsneeded, -1 );

+

 	/* XXX */

 /* 	config_counter(&snd_counter, &rcv_counter); */

@@ -2149,7 +2161,7 @@

 	free_client_lease (lease, MDL);

 }

-FILE *leaseFile;

+FILE *leaseFile = NULL;

 void rewrite_client_leases ()

 {

@@ -2157,9 +2169,18 @@

 	struct client_state *client;

 	struct client_lease *lp;

-	if (leaseFile)

-		fclose (leaseFile);

-	leaseFile = fopen (path_dhclient_db, "w");

+	if (leaseFile) {

+                rewind (leaseFile);

+		ftruncate (fileno (leaseFile), 0);

+        } else {

+		/* create lease file and chown it to dhcp, so that forked

+		 * instances can open it for writing, too */

+		struct passwd *pwd = getpwnam ("dhcp");

+                leaseFile = fopen (path_dhclient_db, "w");

+		if (pwd && leaseFile) {

+		    chown (path_dhclient_db, pwd->pw_uid, -1);

+		}

+	}

 	if (!leaseFile) {

 		log_error ("can't create %s: %m", path_dhclient_db);

 		return;

@@ -2745,9 +2766,10 @@

 	write_client_pid_file ();

 }

-void write_client_pid_file ()

+FILE *pf;

+

+void open_client_pid_file ()

 {

-	FILE *pf;

 	int pfdesc;

 	pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);

@@ -2760,9 +2782,14 @@

 	pf = fdopen (pfdesc, "w");

 	if (!pf)

 		log_error ("Can't fdopen %s: %m", path_dhclient_pid);

-	else {

+}

+

+void write_client_pid_file ()

+{

+	if (pf) {

 		fprintf (pf, "%ld\n", (long)getpid ());

 		fclose (pf);

+               pf = NULL;

 	}

 }