Go back to using a Warning/Error prefix in the message printed to

stderr for alias problems.  Requested by Tomas Sykora.

diff --git a/doc/visudo.cat b/doc/visudo.cat
index db3aef2ea464780af28f13f39891cda41199d159..6a4233c266e1f2d845ee5491fef4864c5f8a6359 100644 (file)
--- a/doc/visudo.cat
+++ b/doc/visudo.cat
@@ -147,7 +147,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
      you do not exist in the passwd database
            Your user ID does not appear in the system passwd database.
 
-     {User,Runas,Host,Cmnd}_Alias referenced but not defined
+     Warning: {User,Runas,Host,Cmnd}_Alias referenced but not defined
            Either you are trying to use an undeclared
            {User,Runas,Host,Cmnd}_Alias or you have a user or host name listed
            that consists solely of uppercase letters, digits, and the
@@ -157,13 +157,13 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
            undefined alias was used.  In -\b-s\bs (strict) mode these are errors,
            not warnings.
 
-     unused {User,Runas,Host,Cmnd}_Alias
+     Warning: unused {User,Runas,Host,Cmnd}_Alias
            The specified {User,Runas,Host,Cmnd}_Alias was defined but never
            used.  The message is prefixed with the path name of the _\bs_\bu_\bd_\bo_\be_\br_\bs
            file and the line number where the unused alias was defined.  You
            may wish to comment out or remove the unused alias.
 
-     cycle in {User,Runas,Host,Cmnd}_Alias
+     Warning: cycle in {User,Runas,Host,Cmnd}_Alias
            The specified {User,Runas,Host,Cmnd}_Alias includes a reference to
            itself, either directly or through an alias it includes.  The
            message is prefixed with the path name of the _\bs_\bu_\bd_\bo_\be_\br_\bs file and the
@@ -172,7 +172,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
            when parsing the _\bs_\bu_\bd_\bo_\be_\br_\bs file.
 
      unknown defaults entry "name"
-           The _\bs_\bu_\bd_\bo_\be_\br_\bs file contains a Defaults variable not recognized by
+           The _\bs_\bu_\bd_\bo_\be_\br_\bs file contains a Defaults setting not recognized by
            v\bvi\bis\bsu\bud\bdo\bo.
 
      /etc/sudoers: input and output files must be different
@@ -212,4 +212,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.20                    November 12, 2016                   Sudo 1.8.20
+Sudo 1.8.20                    February 22, 2017                   Sudo 1.8.20

diff --git a/doc/visudo.man.in b/doc/visudo.man.in
index eb9a64e2e521612fd10c5281ce46dec5fe97eef6..68b381898f14d91bf8a1f77f49b8d17becad8735 100644 (file)
--- a/doc/visudo.man.in
+++ b/doc/visudo.man.in
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
 .\" IT IS GENERATED AUTOMATICALLY FROM visudo.mdoc.in
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2015
+.\" Copyright (c) 1996,1998-2005, 2007-2017
 .\"    Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "VISUDO" "8" "November 12, 2016" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "VISUDO" "8" "February 22, 2017" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -343,7 +343,7 @@ as root.
 \fRyou do not exist in the passwd database\fR
 Your user ID does not appear in the system passwd database.
 .TP 6n
-\fR{User,Runas,Host,Cmnd}_Alias referenced but not defined\fR
+\fRWarning: {User,Runas,Host,Cmnd}_Alias referenced but not defined\fR
 Either you are trying to use an undeclared {User,Runas,Host,Cmnd}_Alias
 or you have a user or host name listed that consists solely of
 uppercase letters, digits, and the underscore
@@ -360,7 +360,7 @@ In
 \fB\-s\fR
 (strict) mode these are errors, not warnings.
 .TP 6n
-\fRunused {User,Runas,Host,Cmnd}_Alias\fR
+\fRWarning: unused {User,Runas,Host,Cmnd}_Alias\fR
 The specified {User,Runas,Host,Cmnd}_Alias was defined but never
 used.
 The message is prefixed with the path name of the
@@ -368,7 +368,7 @@ The message is prefixed with the path name of the
 file and the line number where the unused alias was defined.
 You may wish to comment out or remove the unused alias.
 .TP 6n
-\fRcycle in {User,Runas,Host,Cmnd}_Alias\fR
+\fRWarning: cycle in {User,Runas,Host,Cmnd}_Alias\fR
 The specified {User,Runas,Host,Cmnd}_Alias includes a reference to
 itself, either directly or through an alias it includes.
 The message is prefixed with the path name of the
@@ -390,7 +390,7 @@ The
 \fIsudoers\fR
 file contains a
 \fRDefaults\fR
-variable not recognized by
+setting not recognized by
 \fBvisudo\fR.
 .TP 6n
 \fR@sysconfdir@/sudoers: input and output files must be different\fR

diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in
index 6f9bb28cfa367342c9e01bfa5e741e6491cad83f..f948b0e10c23982eb765b344ea054099b03a6b22 100644 (file)
--- a/doc/visudo.mdoc.in
+++ b/doc/visudo.mdoc.in
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2015
+.\" Copyright (c) 1996,1998-2005, 2007-2017
 .\"    Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd November 12, 2016
+.Dd February 22, 2017
 .Dt VISUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -326,7 +326,7 @@ You didn't run
 as root.
 .It Li you do not exist in the passwd database
 Your user ID does not appear in the system passwd database.
-.It Li {User,Runas,Host,Cmnd}_Alias referenced but not defined
+.It Li Warning: {User,Runas,Host,Cmnd}_Alias referenced but not defined
 Either you are trying to use an undeclared {User,Runas,Host,Cmnd}_Alias
 or you have a user or host name listed that consists solely of
 uppercase letters, digits, and the underscore
@@ -343,14 +343,14 @@ file and the line number where the undefined alias was used.
 In
 .Fl s
 (strict) mode these are errors, not warnings.
-.It Li unused {User,Runas,Host,Cmnd}_Alias
+.It Li Warning: unused {User,Runas,Host,Cmnd}_Alias
 The specified {User,Runas,Host,Cmnd}_Alias was defined but never
 used.
 The message is prefixed with the path name of the
 .Em sudoers
 file and the line number where the unused alias was defined.
 You may wish to comment out or remove the unused alias.
-.It Li cycle in {User,Runas,Host,Cmnd}_Alias
+.It Li Warning: cycle in {User,Runas,Host,Cmnd}_Alias
 The specified {User,Runas,Host,Cmnd}_Alias includes a reference to
 itself, either directly or through an alias it includes.
 The message is prefixed with the path name of the
@@ -371,7 +371,7 @@ The
 .Em sudoers
 file contains a
 .Li Defaults
-variable not recognized by
+setting not recognized by
 .Nm .
 .It Li @sysconfdir@/sudoers: input and output files must be different
 The

diff --git a/plugins/sudoers/regress/visudo/test2.err.ok b/plugins/sudoers/regress/visudo/test2.err.ok
index e2b191ced529e4dbfc6a749231d02035de29584b..38189df91b0ba099d3d2b094c9aede7bc6805bc1 100644 (file)
--- a/plugins/sudoers/regress/visudo/test2.err.ok
+++ b/plugins/sudoers/regress/visudo/test2.err.ok
@@ -1 +1 @@
-visudo: stdin:1 cycle in User_Alias "FOO"
+Error: stdin:1 cycle in User_Alias "FOO"

diff --git a/plugins/sudoers/regress/visudo/test3.err.ok b/plugins/sudoers/regress/visudo/test3.err.ok
index 0e5a24ad51f770376867a07657f4fbf37f85b60b..8390f8680fd98fc34fbc6b6528e29f7240caa865 100644 (file)
--- a/plugins/sudoers/regress/visudo/test3.err.ok
+++ b/plugins/sudoers/regress/visudo/test3.err.ok
@@ -1,2 +1,2 @@
-visudo: stdin:1 unused User_Alias "A"
-visudo: stdin:2 unused User_Alias "B"
+Warning: stdin:1 unused User_Alias "A"
+Warning: stdin:2 unused User_Alias "B"

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 4f192b2094fe9dab3a1dc976c67e56ea8e0e84ca..4793d5406328a78d8799e9125cb5e5e010a932d2 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1998-2005, 2007-2016
+ * Copyright (c) 1996, 1998-2005, 2007-2017
  *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1137,12 +1137,17 @@ check_alias(char *name, int type, char *file, int lineno, bool strict, bool quie
     } else {
        if (!quiet) {
            if (errno == ELOOP) {
-               sudo_warnx(U_("%s:%d cycle in %s \"%s\""),
+               fprintf(stderr, strict ?
+                   U_("Error: %s:%d cycle in %s \"%s\"") :
+                   U_("Warning: %s:%d cycle in %s \"%s\""),
                    file, lineno, alias_type_to_string(type), name);
            } else {
-               sudo_warnx(U_("%s:%d %s \"%s\" referenced but not defined"),
+               fprintf(stderr, strict ?
+                   U_("Error: %s:%d %s \"%s\" referenced but not defined") :
+                   U_("Warning: %s:%d %s \"%s\" referenced but not defined"),
                    file, lineno, alias_type_to_string(type), name);
            }
+           fputc('\n', stderr);
            if (strict && errorfile == NULL) {
                errorfile = rcstr_addref(file);
                errorlineno = lineno;
@@ -1292,8 +1297,9 @@ print_unused(void *v1, void *v2)
 {
     struct alias *a = (struct alias *)v1;
 
-    sudo_warnx_nodebug(U_("%s:%d unused %s \"%s\""),
+    fprintf(stderr, U_("Warning: %s:%d unused %s \"%s\""),
        a->file, a->lineno, alias_type_to_string(a->type), a->name);
+    fputc('\n', stderr);
     return 0;
 }