don't loop forever even if we are root

diff --git a/clients/userreg/display.c b/clients/userreg/display.c
index 740859325868329fcdd955f21380396175b587be..1c2eac48e1a1ddaf0c738032baec5367bef801cd 100644 (file)
--- a/clients/userreg/display.c
+++ b/clients/userreg/display.c
@@ -203,13 +203,9 @@ retry:
        }
        break;
       case '\003':             /* Ctrl-C */
        }
        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 */
        break;
       default: 
        if (c >= ' ') {         /* Ignore all other control chars */


@@ -314,11 +310,9 @@ askyn(prompt)
        exit(1);
        break;
       case '\003':             /* Ctrl-C */
        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;
        break;
       default:                 /* Ignore everything else. */
        break;

diff --git a/clients/userreg/userreg.c b/clients/userreg/userreg.c
index ccb45d43fb05b058ed6d5e4c354973e62fbc8b62..4781ba13ba5e98f6b1e4f30c779cb3bc44dbde7d 100644 (file)
--- 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);
 
        signal(SIGQUIT, fix_display);
        signal(SIGHUP, fix_display);
 

-       do {
-               
+       while (1) {

                setjmp(redo);
                reset();
                ntimes = 0;
                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();
                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);
 }
        restore_display();
        exit(0);
 }