X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_save.c;h=0f7061a51e30b1a6ea88a5a95bb83a6cd58d1f2d;hp=7d99cc3770a51469b5ee0f5c4828e9d7dac8b5a6;hb=d4bcca1aa235370bc20bc2734c0cd6f700b17871;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 7d99cc3..0f7061a 100644
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -6,20 +6,20 @@
 ** complete copyright information.
 */
 
-#include <h/mh.h>
-#include <h/signals.h>
-
 /*
-** static prototypes
-*/
-static int m_chkids(void);
+ * This function used to support setuid/setgid programs by writing
+ * the file as the user.  But that code, m_chkids(), was removed
+ * because there no longer are setuid/setgid programs in nmh.
+ */
 
+#include <sysexits.h>
+#include <h/mh.h>
+#include <h/signals.h>
 
 void
-context_save (void)
+context_save(void)
 {
-	int action;
-	register struct node *np;
+	struct node *np;
 	FILE *out;
 	sigset_t set, oset;
 
@@ -31,65 +31,20 @@ context_save (void)
 		return;
 	ctxflags &= ~CTXMOD;
 
-	if ((action = m_chkids ()) > 0)
-		return;  /* child did it for us */
-
 	/* block a few signals */
-	sigemptyset (&set);
-	sigaddset (&set, SIGHUP);
-	sigaddset (&set, SIGINT);
-	sigaddset (&set, SIGQUIT);
-	sigaddset (&set, SIGTERM);
-	SIGPROCMASK (SIG_BLOCK, &set, &oset);
-
-	if (!(out = lkfopen (ctxpath, "w")))
-		adios (ctxpath, "unable to write");
+	sigemptyset(&set);
+	sigaddset(&set, SIGHUP);
+	sigaddset(&set, SIGINT);
+	sigaddset(&set, SIGQUIT);
+	sigaddset(&set, SIGTERM);
+	sigprocmask(SIG_BLOCK, &set, &oset);
+
+	if (!(out = lkfopen(ctxpath, "w")))
+		adios(EX_IOERR, ctxpath, "unable to write");
 	for (np = m_defs; np; np = np->n_next)
 		if (np->n_context)
-			fprintf (out, "%s: %s\n", np->n_name, np->n_field);
-	lkfclose (out, ctxpath);
-
-	SIGPROCMASK (SIG_SETMASK, &oset, &set); /* reset the signal mask */
-
-	if (action == 0)
-		_exit (0);    /* we are child, time to die */
-}
-
-/*
-** This hack brought to you so we can handle set[ug]id MH programs.
-** If we return -1, then no fork is made, we update .mh_profile
-** normally, and return to the caller normally.  If we return 0,
-** then the child is executing, .mh_profile is modified after
-** we set our [ug]ids to the norm.  If we return > 0, then the
-** parent is executed and .mh_profile has already be modified.
-** We can just return to the caller immediately.
-*/
-
-static int
-m_chkids (void)
-{
-	int i;
-	pid_t pid;
-
-	if (getuid () == geteuid ())
-		return (-1);
-
-	for (i = 0; (pid = fork ()) == -1 && i < 5; i++)
-		sleep (5);
-
-	switch (pid) {
-		case -1:
-			break;
-
-		case 0:
-			setgid (getgid ());
-			setuid (getuid ());
-			break;
-
-		default:
-			pidwait (pid, -1);
-			break;
-	}
+			fprintf(out, "%s: %s\n", np->n_name, np->n_field);
+	lkfclose(out, ctxpath);
 
-	return pid;
+	sigprocmask(SIG_SETMASK, &oset, &set); /* reset the signal mask */
 }