Change "next" back to 2. In the context of "next Friday" we really

do want the friday of the upcoming (not current) week.  Unfortunately,
this means that things like "next week" and "next year" will match
one more than we really want.  Fixing this will require some fairly
major changes to the grammar.

diff --git a/NEWS b/NEWS
index 4325360e087fbf1f4e4bd2f71c2b1737f26a61ff..fabfe1c8c37f1bc4ff3be1ae025afc0c83ad211b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -66,11 +66,11 @@ What's new in Sudo 1.8.8?
    to the I/O log timing file are two greater than they should be.
    Sudoreplay now contains a work-around to parse those files.
 
- * In sudoreplay's list mode, the "this" and "next" qualifiers in
-   "fromdate" or "todate" expressions now behave more sensibly.
-   Previously, they would often match a date that was "one more"
-   than expected.  For example "this week" now matches the current
-   week and not the following week.
+ * In sudoreplay's list mode, the "this" qualifier in "fromdate"
+   or "todate" expressions now behaves more sensibly.  Previously,
+   it would often match a date that was "one more" than expected.
+   For example, "this week" now matches the current week instead
+   of the following week.
 
 What's new in Sudo 1.8.7?
 

diff --git a/plugins/sudoers/getdate.c b/plugins/sudoers/getdate.c
index daa1f708e0989f54fa6b89d7a4bdd2d0d6ce399a..c64dcf811a86888b813a0097183751f13afb3b17 100644 (file)
--- a/plugins/sudoers/getdate.c
+++ b/plugins/sudoers/getdate.c
@@ -444,7 +444,7 @@ static TABLE const OtherTable[] = {
     { "now",           tMINUTE_UNIT,   0 },
     { "last",          tUNUMBER,       -1 },
     { "this",          tUNUMBER,       0 },
-    { "next",          tUNUMBER,       1 },
+    { "next",          tUNUMBER,       2 },
     { "first",         tUNUMBER,       1 },
 /*  { "second",                tUNUMBER,       2 }, */
     { "third",         tUNUMBER,       3 },

diff --git a/plugins/sudoers/getdate.y b/plugins/sudoers/getdate.y
index 2639c971c770c1213ee3c0f95be995ea1bc0f849..63037e8c71bd9022ac1119a44d0e2a1ecf32ed67 100644 (file)
--- a/plugins/sudoers/getdate.y
+++ b/plugins/sudoers/getdate.y
@@ -376,7 +376,7 @@ static TABLE const OtherTable[] = {
     { "now",           tMINUTE_UNIT,   0 },
     { "last",          tUNUMBER,       -1 },
     { "this",          tUNUMBER,       0 },
-    { "next",          tUNUMBER,       1 },
+    { "next",          tUNUMBER,       2 },
     { "first",         tUNUMBER,       1 },
 /*  { "second",                tUNUMBER,       2 }, */
     { "third",         tUNUMBER,       3 },