[patch] add --dont-closefd option to openrc

0004-pppd-passwdfd.patch (text/plain), 6.25 KB, created by Attila Fazekas on 2008-06-15 21:15:45 UTC

diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 00ef29f..a043702 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -109,6 +109,9 @@ option along with
 to create a working pidfile.
 .It Fl d , -chdir Ar path
 chdir to this directory before starting the daemon.
+.It Fl D , -dont-closefd Ar fd,fd,..
+start-stop-daemon closes all file descriptors except standard input/output before exec.
+Sometime it is necessary to keep open some file descriptors. You can give more file descriptors as argument separated by commas.We expecting increasing order.
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.
diff --git a/net/pppd.sh b/net/pppd.sh
index abee058..a2bfe27 100644
--- a/net/pppd.sh
+++ b/net/pppd.sh
@@ -90,7 +90,7 @@ pppd_pre_start()
 	eval passwordset=\$\{password_${IFVAR}-x\}
 	if [ -n "${username}" ] \
 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
-		opts="${opts} plugin passwordfd.so passwordfd 0"
+		opts="${opts} plugin passwordfd.so passwordfd 3"
 	fi
 	
 	if ! ${hasdefaultmetric}; then
@@ -201,7 +201,7 @@ pppd_pre_start()
 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
 		printf "%s" "${password}" | \
 		eval start-stop-daemon --start --exec /usr/sbin/pppd \
-			--pidfile "/var/run/ppp-${IFACE}.pid" -- "${opts}" >/dev/null
+			--dont-closefd 3 --pidfile "/var/run/ppp-${IFACE}.pid" -- "${opts}" >/dev/null 3<&0
 	else
 		eval start-stop-daemon --start --exec /usr/sbin/pppd \
 			--pidfile "/var/run/ppp-${IFACE}.pid" -- "${opts}" >/dev/null
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index ce018fc..aab0c01 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -82,6 +82,22 @@ static struct pam_conv conv = { NULL, NULL};
 	     (var) = (tvar))
 #endif
 
+#ifndef unlikely
+#if ((! defined(__GNUC__)) || ( __GNUC__ < 3)) 
+#define unlikely(x) x
+#else
+#define unlikely(x)     __builtin_expect((size_t)(x),0)
+#endif
+#endif
+
+#ifndef likely
+#if ((! defined(__GNUC__)) || ( __GNUC__ < 3)) 
+#define likely(x) x
+#else
+#define likely(x)     __builtin_expect((size_t)(x),1)
+#endif
+#endif
+
 
 typedef struct scheduleitem
 {
@@ -102,6 +118,72 @@ extern const char *applet;
 static char *changeuser;
 
 extern char **environ;
+/* Singel linked ,ordered, descending list, NULL if empty */
+struct rc_fdlist_item
+{
+        struct rc_fdlist_item *next;
+        int fd;
+};
+
+typedef struct rc_fdlist_item* RC_FDLIST;
+
+RC_FDLIST fdlist=NULL;
+
+static inline RC_FDLIST rc_fdlist_newitem()
+{
+	RC_FDLIST fdl;
+	fdl=(RC_FDLIST)malloc(sizeof(struct rc_fdlist_item));
+	if (unlikely(!fdl))
+	{
+		eerrorx("RC_FDLIST: Out of Memory!");
+	}
+	return fdl;
+}
+static inline void rc_fdlist_add(RC_FDLIST * list,int fd)
+{
+	RC_FDLIST iter,prev;
+	if (*list)
+	{
+		prev=NULL;
+		iter=*list;
+		while (unlikely(iter->fd>fd)&&iter->next) 
+		{
+			prev=iter;
+			iter=iter->next;
+		}
+		if (unlikely(iter->fd==fd))		
+			return;
+		
+		if (unlikely(prev))
+		{
+			iter=prev->next;
+			prev->next=rc_fdlist_newitem();
+			prev->next->next=iter;
+			prev->next->fd=fd;
+		} else
+		{			
+			*list=rc_fdlist_newitem();
+			(*list)->fd=fd;
+			(*list)->next=iter;
+		}
+	} else
+	{
+		*list=rc_fdlist_newitem();
+		(*list)->fd=fd;
+		(*list)->next=NULL;
+	}
+
+}
+static inline void rc_fdlist_delete(RC_FDLIST * list)
+{
+	RC_FDLIST next;
+	while (*list)
+	{
+		next=(*list)->next;
+		free(*list);
+		*list=next;
+	}
+}
 
 static void free_schedulelist(void)
 {
@@ -499,7 +581,7 @@ static void handle_signal(int sig)
 
 
 #include "_usage.h"
-#define getoptstring "KN:R:Sbc:d:g:mn:op:s:tu:r:x:1:2:" getoptstring_COMMON
+#define getoptstring "KN:R:Sbc:d:D:g:mn:op:s:tu:r:x:1:2:" getoptstring_COMMON
 static const struct option longopts[] = {
 	{ "stop",         0, NULL, 'K'},
 	{ "nicelevel",    1, NULL, 'N'},
@@ -509,6 +591,7 @@ static const struct option longopts[] = {
 	{ "background",   0, NULL, 'b'},
 	{ "chuid",        1, NULL, 'c'},
 	{ "chdir",        1, NULL, 'd'},
+	{ "dont-closefd", 1, NULL, 'D'},
 	{ "env",          1, NULL, 'e'},
 	{ "group",        1, NULL, 'g'},
 	{ "make-pidfile", 0, NULL, 'm'},
@@ -533,6 +616,7 @@ static const char * const longopts_help[] = {
 	"Force daemon to background",
 	"deprecated, use --user",
 	"Change the PWD",
+	"Don't close file descriptor fd,fd,..",
 	"Set an environment string",
 	"Change the process group",
 	"Create a pidfile",
@@ -673,7 +757,40 @@ int start_stop_daemon(int argc, char **argv)
 		case 'd':  /* --chdir /new/dir */
 			ch_dir = optarg;
 			break;
-
+		case 'D':
+			{
+				char * oa=optarg; // Do we really need a copy ?
+				int val=0;
+				int nval=0;
+				int maxfd=getdtablesize()-1;
+				while (*oa)
+				{
+					if (isdigit(*oa))
+					{
+						do
+						{
+							nval=val*10+*oa-'0';
+							// Warn very high maxfd, overflow
+							if (unlikely(nval>maxfd))
+								eerrorx("fd must be less than"
+									",current maximum number"
+									"of descriptors(%d)",
+									maxfd);
+						 	val=nval;
+						 	oa++;
+						} while (isdigit(*oa));
+						rc_fdlist_add(&fdlist,val);
+						val=0;
+					}
+					if ((*oa)==',') 
+						oa++;
+					else 
+						if (*oa) 
+							eerrorx("Inavalid character in argument,"
+								"only digits and comma allowed");	
+				}
+			}
+			break;
 		case 'e': /* --env */
 			if (putenv(optarg) == 0) {
 				if (strncmp("HOME=", optarg, 5) == 0)
@@ -901,6 +1018,7 @@ int start_stop_daemon(int argc, char **argv)
 
 	/* Child process - lets go! */
 	if (pid == 0) {
+		RC_FDLIST fdl_iter;
 		pid_t mypid = getpid();
 
 #ifdef TIOCNOTTY
@@ -1043,8 +1161,25 @@ int start_stop_daemon(int argc, char **argv)
 		if (background || quiet || redirect_stderr)
 			dup2(stderr_fd, STDERR_FILENO);
 
-		for (i = getdtablesize() - 1; i >= 3; --i)
-			close(i);
+		if (!fdlist)
+			for (i = getdtablesize() - 1; i >= 3; --i)
+			{				
+				close(i);
+			}
+		else
+		{
+			fdl_iter=fdlist;
+			for (i = getdtablesize() - 1; i >= 3; --i)
+			{	
+				/* It is a descending list, if it contains the fd, we don't close it */
+				if (likely(fdl_iter) && unlikely(fdl_iter->fd==i))
+					fdl_iter=fdl_iter->next;
+				else
+					close(i);
+			}
+			rc_fdlist_delete(&fdlist); //unnecessary
+		}
+
 
 		setsid();
 		execv(exec, argv);