edit_sudoers: Return false on failure instead of using sudo_fatal()

Callers of edit_sudoers() now check the return value.

Author: millert

plugins/sudoers/visudo.c

@@ -304,7 +304,8 @@ main(int argc, char *argv[])
 	    while ((ch = getchar()) != EOF && ch != '\r' && ch != '\n')
 		    continue;
 	}
-	edit_sudoers(sp, editor, editor_argc, editor_argv, -1);
+	if (!edit_sudoers(sp, editor, editor_argc, editor_argv, -1))
+	    exitcode = 1;
     }
 
     /*
@@ -323,6 +324,9 @@ main(int argc, char *argv[])
 		exitcode = 1;
 	    }
 	}
+    } else {
+	/* Remove temporary files. */
+	visudo_cleanup();
     }
     free(editor);
 
@@ -485,18 +489,24 @@ edit_sudoers(struct sudoersfile *sp, char *editor, int editor_argc,
     bool ret = false;			/* return value */
     debug_decl(edit_sudoers, SUDOERS_DEBUG_UTIL);
 
-    if (fstat(sp->fd, &sb) == -1)
-	sudo_fatal(U_("unable to stat %s"), sp->opath);
+    if (fstat(sp->fd, &sb) == -1) {
+	sudo_warn(U_("unable to stat %s"), sp->opath);
+	goto done;
+    }
     orig_size = sb.st_size;
     mtim_get(&sb, orig_mtim);
 
     /* Create the temp file if needed and set timestamp. */
     if (sp->tpath == NULL) {
-	if (asprintf(&sp->tpath, "%s.tmp", sp->dpath) == -1)
-	    sudo_fatalx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
+	if (asprintf(&sp->tpath, "%s.tmp", sp->dpath) == -1) {
+	    sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
+	    goto done;
+	}
 	tfd = open(sp->tpath, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
-	if (tfd < 0)
-	    sudo_fatal("%s", sp->tpath);
+	if (tfd < 0) {
+	    sudo_warn("%s", sp->tpath);
+	    goto done;
+	}
 
 	/* Copy sp->opath -> sp->tpath and reset the mtime. */
 	if (orig_size != 0) {
@@ -505,16 +515,20 @@ edit_sudoers(struct sudoersfile *sp, char *editor, int editor_argc,
 
 	    (void) lseek(sp->fd, (off_t)0, SEEK_SET);
 	    while ((nread = read(sp->fd, buf, sizeof(buf))) > 0) {
-		if (write(tfd, buf, (size_t)nread) != nread)
-		    sudo_fatal("%s", U_("write error"));
+		if (write(tfd, buf, (size_t)nread) != nread) {
+		    sudo_warn("%s", U_("write error"));
+		    goto done;
+		}
 		lastch = buf[nread - 1];
 	    }
 
 	    /* Add missing newline at EOF if needed. */
 	    if (lastch != '\n') {
 		lastch = '\n';
-		if (write(tfd, &lastch, 1) != 1)
-		    sudo_fatal("%s", U_("write error"));
+		if (write(tfd, &lastch, 1) != 1) {
+		    sudo_warn("%s", U_("write error"));
+		    goto done;
+		}
 	    }
 	}
 	(void) close(tfd);
@@ -642,6 +656,7 @@ reparse_sudoers(struct sudoers_context *ctx, char *editor, int editor_argc,
 {
     struct sudoersfile *sp, *last;
     FILE *fp;
+    bool ret = false;
     int ch, oldlocale;
     debug_decl(reparse_sudoers, SUDOERS_DEBUG_UTIL);
 
@@ -652,13 +667,17 @@ reparse_sudoers(struct sudoers_context *ctx, char *editor, int editor_argc,
     while ((sp = TAILQ_FIRST(&sudoerslist)) != NULL) {
 	last = TAILQ_LAST(&sudoerslist, sudoersfile_list);
 	fp = fopen(sp->tpath, "r+");
-	if (fp == NULL)
-	    sudo_fatalx(U_("unable to re-open temporary file (%s), %s unchanged."),
+	if (fp == NULL) {
+	    sudo_warnx(U_("unable to re-open temporary file (%s), %s unchanged."),
 		sp->tpath, sp->opath);
+	    goto done;
+	}
 
 	/* Clean slate for each parse */
-	if (!init_defaults())
-	    sudo_fatalx("%s", U_("unable to initialize sudoers default values"));
+	if (!init_defaults()) {
+	    sudo_warnx("%s", U_("unable to initialize sudoers default values"));
+	    goto done;
+	}
 	init_parser(ctx, sp->opath);
 	sp->errorline = -1;
 
@@ -687,15 +706,16 @@ reparse_sudoers(struct sudoers_context *ctx, char *editor, int editor_argc,
 		parse_error = false;	/* ignore parse error */
 		break;
 	    case 'x':
-		visudo_cleanup();	/* discard changes */
-		debug_return_bool(false);
+		goto done;		/* discard changes */
 	    case 'e':
 	    default:
 		/* Edit file with the parse error */
 		TAILQ_FOREACH(sp, &sudoerslist, entries) {
 		    if (errors == 0 || sp->errorline > 0) {
-			edit_sudoers(sp, editor, editor_argc, editor_argv,
-			    sp->errorline);
+			if (!edit_sudoers(sp, editor, editor_argc, editor_argv,
+				sp->errorline)) {
+			    goto done;
+			}
 		    }
 		}
 		break;
@@ -708,8 +728,9 @@ reparse_sudoers(struct sudoers_context *ctx, char *editor, int editor_argc,
 	    do {
 		printf(_("press return to edit %s: "), sp->opath);
 		while ((ch = getchar()) != EOF && ch != '\r' && ch != '\n')
-			continue;
-		edit_sudoers(sp, editor, editor_argc, editor_argv, -1);
+		    continue;
+		if (!edit_sudoers(sp, editor, editor_argc, editor_argv, -1))
+		    goto done;
 		if (sp->modified)
 		    modified = true;
 	    } while ((sp = TAILQ_NEXT(sp, entries)) != NULL);
@@ -723,8 +744,10 @@ reparse_sudoers(struct sudoers_context *ctx, char *editor, int editor_argc,
 	if (!parse_error)
 	    break;
     }
+    ret = true;
 
-    debug_return_bool(true);
+done:
+    debug_return_bool(ret);
 }
 
 /*