Execute cvtsudoers if the user runs "visudo -x" but also emit a

warning.

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 000e3d76f67438b80fcdfd7965b5fac5af958fae..bf87150d37560472829f904f8b101659b1771528 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -130,6 +130,7 @@ main(int argc, char *argv[])
 {
     struct sudoersfile *sp;
     char *editor, **editor_argv;
+    const char *export_path = NULL;
     int ch, oldlocale, editor_argc, exitcode = 0;
     bool quiet, strict, oldperms;
     debug_decl(main, SUDOERS_DEBUG_MAIN)
@@ -197,9 +198,8 @@ main(int argc, char *argv[])
                quiet = true;           /* quiet mode */
                break;
            case 'x':
-               /* XXX - make more concise */
-               sudo_warnx(U_("conversion of sudoers to JSON format has moved to the cvtsudoers utility"));
-               usage(1);
+               export_path = optarg;
+               break;
            default:
                usage(1);
        }
@@ -208,6 +208,15 @@ main(int argc, char *argv[])
     if (argc - optind != 0)
        usage(1);
 
+    if (export_path != NULL) {
+       /* Backwards compatibility for the time being. */
+       sudo_warnx(U_("the -x option will be removed in a future release"));
+       sudo_warnx(U_("please consider using the cvtsudoers utility instead"));
+       execlp("cvtsudoers", "cvtsudoers", "-f", "json", "-o", export_path,
+           sudoers_file, (char *)0);
+       sudo_fatal(U_("unable to execute %s"), "cvtsudoers");
+    }
+
     /* Mock up a fake sudo_user struct. */
     user_cmnd = user_base = "";
     if (geteuid() == 0) {