diff --git a/NEWS b/NEWS
index 859fe0e18..6f9814a26 100644
--- a/NEWS
+++ b/NEWS
@@ -11,14 +11,14 @@ What's new in Sudo 1.9.3
easier to detect omissions in the symbol exports file, regardless
of the platform.
- * Fixed the libssl dependency in Debian packages on older releases
+ * Fixed the libssl dependency in Debian packages for older releases
that use libssl1.0.0.
- * Sudo (and visudo) now provide more detailed messages when a
- syntax error is detected in sudoers. The offending line and
- token are now displayed. If the parser was generated by GNU
- bison, additional information about what token was expected is
- also displayed.
+ * Sudo and visudo now provide more detailed messages when a syntax
+ error is detected in sudoers. The offending line and token are
+ now displayed. If the parser was generated by GNU bison,
+ additional information about what token was expected is also
+ displayed. Bug #841.
* Sudoers rules must now end in either a newline or the end-of-file.
Previously, it was possible to have multiple rules on a single
@@ -31,7 +31,7 @@ What's new in Sudo 1.9.3
recovery from a syntax error less painful on systems where sudo
is the primary method of superuser access. The historic behavior
can be restored by add "error_recovery=false" to the sudoers
- plugin's optional arguments in sudo.conf.
+ plugin's optional arguments in sudo.conf. Bug #618.
* Fixed the sample_approval plugin's symbol exports file for systems
where the compiler doesn't support symbol hiding.
diff --git a/configure b/configure
index d0b64a792..19967900b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sudo 1.9.3.
+# Generated by GNU Autoconf 2.69 for sudo 1.9.3b1.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sudo'
PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.9.3'
-PACKAGE_STRING='sudo 1.9.3'
+PACKAGE_VERSION='1.9.3b1'
+PACKAGE_STRING='sudo 1.9.3b1'
PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/'
PACKAGE_URL=''
@@ -1584,7 +1584,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sudo 1.9.3 to adapt to many kinds of systems.
+\`configure' configures sudo 1.9.3b1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1650,7 +1650,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sudo 1.9.3:";;
+ short | recursive ) echo "Configuration of sudo 1.9.3b1:";;
esac
cat <<\_ACEOF
@@ -1924,7 +1924,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sudo configure 1.9.3
+sudo configure 1.9.3b1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2633,7 +2633,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sudo $as_me 1.9.3, which was
+It was created by sudo $as_me 1.9.3b1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -28623,7 +28623,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sudo $as_me 1.9.3, which was
+This file was extended by sudo $as_me 1.9.3b1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28689,7 +28689,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sudo config.status 1.9.3
+sudo config.status 1.9.3b1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8732a96f2..b7ddcfd0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
dnl
AC_PREREQ([2.59])
-AC_INIT([sudo], [1.9.3], [https://bugzilla.sudo.ws/], [sudo])
+AC_INIT([sudo], [1.9.3b1], [https://bugzilla.sudo.ws/], [sudo])
AC_CONFIG_HEADERS([config.h pathnames.h])
AC_CONFIG_SRCDIR([src/sudo.c])
dnl
diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index ba6228d47..fb5b7d095 100644
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -1022,11 +1022,11 @@ valid_path(struct sudo_defs_types *def, const char *val,
if (!quiet) {
if (lineno > 0) {
sudo_warnx(
- U_("%s:%d: values for \"%s\" must start with a '/', '*', or '*'"),
+ U_("%s:%d: values for \"%s\" must start with a '/', '~', or '*'"),
file, lineno, def->name);
} else {
sudo_warnx(
- U_("%s: values for \"%s\" must start with a '/', '*', or '*'"),
+ U_("%s: values for \"%s\" must start with a '/', '~', or '*'"),
file, def->name);
}
}
diff --git a/plugins/sudoers/po/sudoers.pot b/plugins/sudoers/po/sudoers.pot
index 2c7a72702..e14eac379 100644
--- a/plugins/sudoers/po/sudoers.pot
+++ b/plugins/sudoers/po/sudoers.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: sudo 1.9.3\n"
+"Project-Id-Version: sudo 1.9.3b1\n"
"Report-Msgid-Bugs-To: https://bugzilla.sudo.ws\n"
-"POT-Creation-Date: 2020-09-12 08:28-0600\n"
+"POT-Creation-Date: 2020-09-14 06:53-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -1868,12 +1868,12 @@ msgstr ""
#: plugins/sudoers/defaults.c:1025
#, c-format
-msgid "%s:%d: values for \"%s\" must start with a '/', '*', or '*'"
+msgid "%s:%d: values for \"%s\" must start with a '/', '~', or '*'"
msgstr ""
#: plugins/sudoers/defaults.c:1029
#, c-format
-msgid "%s: values for \"%s\" must start with a '/', '*', or '*'"
+msgid "%s: values for \"%s\" must start with a '/', '~', or '*'"
msgstr ""
#: plugins/sudoers/defaults.c:1040