[sudo-users] Sudo -C FreeBSD no longer working

[Todd C. Miller]

On Wed, 06 Aug 2014 17:50:08 -0700, Matt Randell wrote:

> I'm having troubles getting sudo -C on FreeBSD working.
> Sudo version: 1.8.10p3
> Last known tested and working sudo version: 1.8.8

The following patch fixes the problem for me on FreeBSD.

 - todd

diff -r 4504146bc230 src/preserve_fds.c
--- a/src/preserve_fds.c	Tue May 06 19:33:33 2014 -0600
+++ b/src/preserve_fds.c	Thu Aug 07 09:35:18 2014 -0600
@@ -166,9 +166,11 @@
     free(fdsp);
 
     /* Let closefrom() do the rest for us. */
+    if (lastfd + 1 > startfd)
+	startfd = lastfd + 1;
     sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO,
-	"closefrom(%d)", lastfd + 1);
-    closefrom(lastfd + 1);
+	"closefrom(%d)", startfd);
+    closefrom(startfd);
 
     /* Restore preserved fds and set flags. */
     TAILQ_FOREACH_REVERSE(pfd, pfds, preserved_fd_list, entries) {