[PATCH 3/8] make newrole suid (take 3)

[Michael C Thompson <thompsmc@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

Michael C Thompson wrote:
> The 8 patches are as follows:
> 1) Modifications to Makefile to support future patch needs
>    Add newrole-lspp.pamd
> 2) New extract_pw_data function and use in main()
> 3) Add signal handler function

This is the 3rd of 8 patches.
This patch applies against policycoreutils-1.30.30-1.

This patch moves the signal handler setup from main() into a new
function.

Changes:
  * Adds set_signal_handles() and uses it in main()

Signed-off-by: Michael Thompson <thompsmc@us.ibm.com>


[-- Attachment #2: 03-signal_func.patch --]
[-- Type: text/x-diff, Size: 1367 bytes --]

diff -Naur policycoreutils-1.30.30/newrole/newrole.c policycoreutils-1.30.30.suid/newrole/newrole.c
--- policycoreutils-1.30.30/newrole/newrole.c	2006-11-02 12:20:18.000000000 -0600
+++ policycoreutils-1.30.30.suid/newrole/newrole.c	2006-11-02 12:22:27.000000000 -0600
@@ -498,6 +498,30 @@
 }
 #endif
 
+/**
+ * Take care of any signal setup
+ */
+static int set_signal_handles()
+{
+	sigset_t empty;
+
+	/* Empty the signal mask in case someone is blocking a signal */
+	if (sigemptyset(&empty)) {
+		fprintf(stderr, _("Unable to obtain empty signal set\n"));
+		return -1;
+	}
+
+	(void)sigprocmask(SIG_SETMASK, &empty, NULL);
+
+	/* Terminate on SIGHUP. */
+	if (signal(SIGHUP, SIG_DFL) == SIG_ERR) {
+		fprintf(stderr, _("Unable to set SIGHUP handler\n"));
+		return -1;
+	}
+
+	return 0;
+}
+
 /************************************************************************
  *
  * All code used for both PAM and shadow passwd goes in this section.
@@ -534,18 +558,13 @@
 	uid_t uid;
 	int fd;
 	int enforcing;
-	sigset_t empty;
 
 #ifdef LOG_AUDIT_PRIV
 	drop_capabilities();
 #endif
 
-	/* Empty the signal mask in case someone is blocking a signal */
-	sigemptyset(&empty);
-	(void)sigprocmask(SIG_SETMASK, &empty, NULL);
-
-	/* Terminate on SIGHUP. */
-	signal(SIGHUP, SIG_DFL);
+	if (set_signal_handles())
+		return -1;
 
 #ifdef USE_NLS
 	setlocale(LC_ALL, "");