X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/c91c82761dce1e98624e90e136360c6edffe8a12..ea0caf4a83b273a8b146ffa0b87e07cb66c8ed3e:/update/exec_002.c

diff --git a/update/exec_002.c b/update/exec_002.c
index 03188efc..77e1c23f 100644
--- a/update/exec_002.c
+++ b/update/exec_002.c
@@ -1,135 +1,106 @@
-/*
- *	$Source$
- *	$Header$
+/* $Id$
+ *
+ * Copyright (C) 1988-1998 by the Massachusetts Institute of Technology.
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
-/*  (c) Copyright 1988 by the Massachusetts Institute of Technology. */
-/*  For copying and distribution information, please see the file */
-/*  <mit-copyright.h>. */
-
-#ifndef lint
-static char *rcsid_exec_002_c = "$Header$";
-#endif	lint
 
 #include <mit-copyright.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#ifdef _AIX
-#undef _BSD
-#endif
-#include <sys/wait.h>
-#ifdef _AIX
-#define _BSD 44
-#endif
-#include <signal.h>
-#include <gdb.h>
 #include <moira.h>
+#include "update_server.h"
 #include "update.h"
 
-extern CONNECTION conn;
-extern int code, errno, uid;
-extern char *whoami;
+#include <sys/wait.h>
 
-#if defined(vax) || defined(ibm032)
-#define WEXITSTATUS(waitb) ((waitb).w_retcode)
-#endif
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
 
+RCSID("$Header$");
 
-int
-exec_002(str)
-    char *str;
+void exec_002(int conn, char *str)
 {
-#ifdef POSIX
-    int waitb;
-    sigset_t mask,oldmask;
-#else
-    union wait waitb;
-    int mask;
-#endif
-    int n, pid;
+  int waitb, n;
+  sigset_t mask, oldmask;
+  pid_t pid;
+  long code;
 
-    if (config_lookup("noexec")) {
-	code = EPERM;
-	code = send_object(conn, (char *)&code, INTEGER_T);
-	com_err(whoami, code, "Not allowed to execute");
-	return(0);
+  if (!have_authorization)
+    {
+      send_int(conn, MR_PERM);
+      return;
     }
-    str += 8;
-    while (*str == ' ')
-	str++;
-#ifdef POSIX
-    sigemptyset(&mask);
-    sigaddset(&mask,SIGCHLD);
-    sigprocmask(SIG_BLOCK,&mask,&oldmask);
-#else
-    mask = sigblock(sigmask(SIGCHLD));
-#endif
-    pid = fork();
-    switch (pid) {
+  if (config_lookup("noexec"))
+    {
+      send_int(conn, EPERM);
+      com_err(whoami, EPERM, "Not allowed to execute");
+      return;
+    }
+
+  str += 8;
+  while (*str == ' ')
+    str++;
+  sigemptyset(&mask);
+  sigaddset(&mask, SIGCHLD);
+  sigprocmask(SIG_BLOCK, &mask, &oldmask);
+  pid = fork();
+  switch (pid)
+    {
     case -1:
-	n = errno;
-#ifdef POSIX
-	sigprocmask(SIG_UNBLOCK,&oldmask,&mask);
-#else
-	sigsetmask(mask);
-#endif
-	log_priority = log_ERROR;
-	com_err(whoami, errno, ": can't fork to run install script");
-	code = send_object(conn, (char *)&n, INTEGER_T);
-	if (code)
-	    exit(1);
-	return(0);
+      n = errno;
+      sigprocmask(SIG_UNBLOCK, &oldmask, &mask);
+      com_err(whoami, n, ": can't fork to run install script");
+      code = send_int(conn, n);
+      if (code)
+	exit(1);
+      return;
+
     case 0:
-	if (setuid(uid) < 0) {
-	    com_err(whoami, errno, "Unable to setuid to %d\n", uid);
-	    exit(1);
+      if (setuid(uid) < 0)
+	{
+	  com_err(whoami, errno, "Unable to setuid to %d\n", uid);
+	  exit(1);
 	}
-#ifdef POSIX
-	sigprocmask(SIG_UNBLOCK,&oldmask,&mask);
-#else
-	sigsetmask(mask);
-#endif
-	execlp(str, str, (char *)NULL);
-	n = errno;
-#ifdef POSIX
-	sigprocmask(SIG_UNBLOCK,&oldmask,&mask);
-#else
-	sigsetmask(mask);
-#endif
-	log_priority = log_ERROR;
-	com_err(whoami, n, ": %s", str);
-	(void) send_object(conn, (char *)&n, INTEGER_T);
-	exit(1);
+      sigprocmask(SIG_UNBLOCK, &oldmask, &mask);
+      execlp(str, str, NULL);
+      n = errno;
+      sigprocmask(SIG_UNBLOCK, &oldmask, &mask);
+      com_err(whoami, n, ": %s", str);
+      send_int(conn, n);
+      exit(1);
+
     default:
-	do {
-	    n = wait(&waitb);
-	} while (n != -1 && n != pid);
-#ifdef POSIX
-	sigprocmask(SIG_UNBLOCK,&oldmask,&mask);
-#else
-	sigsetmask(mask);
-#endif
-#ifdef POSIX
-	if (WIFEXITED(waitb)) {
-	    n = WEXITSTATUS(waitb) + ERROR_TABLE_BASE_sms;
-	    log_priority = log_ERROR;
-	    com_err(whoami, n, " child exited with status %d",
-		    WEXITSTATUS(waitb));
-#else
-	if (waitb.w_status) {
-	    n = waitb.w_retcode + ERROR_TABLE_BASE_sms;
-	    log_priority = log_ERROR;
-	    com_err(whoami, n, " child exited with status %d",
-		    waitb.w_retcode);
-#endif
-	    code = send_object(conn, (char *)&n, INTEGER_T);
-	    if (code) {
-		exit(1);
+      do
+	n = wait(&waitb);
+      while (n != -1 && n != pid);
+
+      sigprocmask(SIG_UNBLOCK, &oldmask, &mask);
+      if ((WIFEXITED(waitb) && (WEXITSTATUS(waitb) != 0)) ||
+	  WIFSIGNALED(waitb))
+	{
+	  if (WIFSIGNALED(waitb))
+	    {
+	      n = MR_COREDUMP;
+	      com_err(whoami, n, " child exited on signal %d",
+		      WTERMSIG(waitb));
+	    }
+	  else
+	    {
+	      n = WEXITSTATUS(waitb) + ERROR_TABLE_BASE_sms;
+	      com_err(whoami, n, " child exited with status %d",
+		      WEXITSTATUS(waitb));
 	    }
-	} else {
-	    code = send_ok();
-	    if (code)
-	      exit(1);
+	  code = send_int(conn, n);
+	  if (code)
+	    exit(1);
+	}
+      else
+	{
+	  code = send_ok(conn);
+	  if (code)
+	    exit(1);
 	}
     }
+  return;
 }