From 8556c987e5793f8808cd8a263d78af030f5bf922 Mon Sep 17 00:00:00 2001
From: mar <mar>
Date: Tue, 21 Nov 1989 16:04:03 +0000
Subject: [PATCH] don't loop forever even if we are root

---
 clients/userreg/display.c | 18 ++++++------------
 clients/userreg/userreg.c |  6 +++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/clients/userreg/display.c b/clients/userreg/display.c
index 74085932..1c2eac48 100644
--- a/clients/userreg/display.c
+++ b/clients/userreg/display.c
@@ -203,13 +203,9 @@ retry:
 	}
 	break;
       case '\003':		/* Ctrl-C */
-	if (getuid() != 0) 
-	  { clear();		/* Exit if not root. */
-	    restore_display();
-	    exit(0);
-	  }
-	else
-	  restart();  
+	clear();
+	restore_display();
+	exit(0);
 	break;
       default: 
 	if (c >= ' ') {		/* Ignore all other control chars */
@@ -314,11 +310,9 @@ askyn(prompt)
 	exit(1);
 	break;
       case '\003':		/* Ctrl-C */
-/*	if (getuid() != 0) */
-	  { clear();		/* Exit if not root. */
-	    restore_display();
-	    exit(0);
-	  }
+	clear();
+	restore_display();
+	exit(0);
 	break;
       default:			/* Ignore everything else. */
 	break;
diff --git a/clients/userreg/userreg.c b/clients/userreg/userreg.c
index ccb45d43..4781ba13 100644
--- a/clients/userreg/userreg.c
+++ b/clients/userreg/userreg.c
@@ -82,8 +82,7 @@ main(argc, argv)
 	signal(SIGQUIT, fix_display);
 	signal(SIGHUP, fix_display);
 
-	do {
-		
+	while (1) {
 		setjmp(redo);
 		reset();
 		ntimes = 0;
@@ -189,7 +188,8 @@ main(argc, argv)
 		display_text_line("You are now finished. Thank you!");
 		wait_for_user();
 		qexit();
-	} while (getuid() == 0);/* Loop forever if we're root */
+		break;
+	}
 	restore_display();
 	exit(0);
 }
-- 
2.45.2