Switch the default output format to LDIF

diff --git a/doc/cvtsudoers.cat b/doc/cvtsudoers.cat
index 2b64e0bfdfdfc27460f13fde7b73fbe7ac44314f..d18ebd3439bf4f9b35240354bf55c3750ea26bae 100644 (file)
--- a/doc/cvtsudoers.cat
+++ b/doc/cvtsudoers.cat
@@ -8,7 +8,7 @@ S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      c\bcv\bvt\bts\bsu\bud\bdo\boe\ber\brs\bs can be used to convert a policy file in _\bs_\bu_\bd_\bo_\be_\br_\bs format to
-     other formats.  The default output format is JSON.
+     other formats.  The default output format is LDIF.
 
      If no _\bs_\bu_\bd_\bo_\be_\br_\bs_\b__\bf_\bi_\bl_\be is specified, or if it is `-', the policy is read from
      the standard input.  By default, the result is written to the standard
@@ -69,4 +69,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.22                    January 27, 2018                    Sudo 1.8.22
+Sudo 1.8.22                    January 28, 2018                    Sudo 1.8.22

diff --git a/doc/cvtsudoers.man.in b/doc/cvtsudoers.man.in
index cbb2b7ae84ea0075fce4d3e62015f01af06cf72d..9a5723bce41514dcac05fc179039aa6026593c68 100644 (file)
--- a/doc/cvtsudoers.man.in
+++ b/doc/cvtsudoers.man.in
@@ -16,7 +16,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH "CVTSUDOERS" "8" "January 27, 2018" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "CVTSUDOERS" "8" "January 28, 2018" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -34,7 +34,7 @@
 can be used to convert a policy file in
 \fIsudoers\fR
 format to other formats.
-The default output format is JSON.
+The default output format is LDIF.
 .PP
 If no
 \fIsudoers_file\fR

diff --git a/doc/cvtsudoers.mdoc.in b/doc/cvtsudoers.mdoc.in
index ce1a9c4ef7a99d4816613d248b822448c6b39c6b..648510a82201ec97d086bb651b624dc3f5556c02 100644 (file)
--- a/doc/cvtsudoers.mdoc.in
+++ b/doc/cvtsudoers.mdoc.in
@@ -14,7 +14,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 27, 2018
+.Dd January 28, 2018
 .Dt CVTSUDOERS @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -31,7 +31,7 @@
 can be used to convert a policy file in
 .Em sudoers
 format to other formats.
-The default output format is JSON.
+The default output format is LDIF.
 .Pp
 If no
 .Ar sudoers_file

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 6932145331c79122b74999d622841acd9fa16fbd..882913d61aedaeef611f20ca8c54e0e555bcc49a 100644 (file)
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -15,8 +15,7 @@
  */
 
 /*
- * Convert from sudoers format to other formats.
- * Currently outputs to JSON
+ * Convert from the sudoers file format to LDIF or JSON format.
  */
 
 #include <config.h>
@@ -84,7 +83,7 @@ int
 main(int argc, char *argv[])
 {
     int ch, exitcode = EXIT_FAILURE;
-    enum output_formats output_format = output_json;
+    enum output_formats output_format = output_ldif;
     const char *input_file = "-";
     const char *output_file = "-";
     debug_decl(main, SUDOERS_DEBUG_MAIN)
@@ -245,9 +244,9 @@ help(void)
     (void) printf(_("%s - convert between sudoers file formats\n\n"), getprogname());
     usage(0);
     (void) puts(_("\nOptions:\n"
-       "  -f, --format=JSON        specify output format\n"
+       "  -f, --format=JSON|LDIF   specify output format (JSON or LDIF)\n"
        "  -h, --help               display help message and exit\n"
-       "  -o, --output=output_file write sudoers in JSON format to output_file\n"
+       "  -o, --output=output_file write converted sudoers to output_file\n"
        "  -V, --version            display version information and exit"));
     exit(0);
 }