mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-22 18:08:23 +00:00
Remove offensive insults that were disabled by default anyway.
Bug #1058
This commit is contained in:
Todd C. Miller
parent
b6175b78ad
commit
f0823c70c6
@ -476,10 +476,6 @@ Defaults are listed in brackets after the description.
|
||||
Specify the path to the SSSD shared library, which is loaded
|
||||
at run-time.
|
||||
|
||||
--enable-offensive-insults
|
||||
Enable potentially offensive sudo insults from the classic
|
||||
version of sudo.
|
||||
|
||||
--enable-pvs-studio
|
||||
Generate a sample PVS-Studio.cfg file based on the compiler and
|
||||
platform type. The "pvs-studio" Makefile target can then be
|
||||
|
||||
@ -1203,10 +1203,6 @@
|
||||
/* Define if your C preprocessor does not support variadic macros. */
|
||||
#undef NO_VARIADIC_MACROS
|
||||
|
||||
/* Define to 1 to include offensive insults from the classic version of sudo.
|
||||
*/
|
||||
#undef OFFENSIVE_INSULTS
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
|
||||
41
configure
vendored
41
configure
vendored
@ -924,7 +924,6 @@ ac_user_opts='
|
||||
enable_option_checking
|
||||
with_otp_only
|
||||
with_alertmail
|
||||
with_pc_insults
|
||||
with_devel
|
||||
with_CC
|
||||
with_rpath
|
||||
@ -1043,7 +1042,6 @@ with_selinux
|
||||
with_apparmor
|
||||
enable_sasl
|
||||
enable_timestamp_type
|
||||
enable_offensive_insults
|
||||
enable_package_build
|
||||
enable_gss_krb5_ccache_name
|
||||
enable_pvs_studio
|
||||
@ -1760,8 +1758,6 @@ Optional Features:
|
||||
--enable-sasl Enable/disable LDAP SASL support
|
||||
--timestamp-type=TYPE Set the default time stamp record type to global,
|
||||
ppid or tty.
|
||||
--enable-offensive-insults
|
||||
Enable potentially offensive sudo insults.
|
||||
--enable-package-build Enable options for package building.
|
||||
--enable-gss-krb5-ccache-name
|
||||
Use GSS-API to set the Kerberos V cred cache name
|
||||
@ -1797,7 +1793,6 @@ Optional Packages:
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-otp-only deprecated
|
||||
--with-alertmail deprecated
|
||||
--with-pc-insults deprecated
|
||||
--with-devel add development options
|
||||
--with-CC C compiler to use
|
||||
--with-rpath deprecated, use --disable-rpath
|
||||
@ -5002,23 +4997,6 @@ fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-pc-insults was given.
|
||||
if test ${with_pc_insults+y}
|
||||
then :
|
||||
withval=$with_pc_insults; case $with_pc_insults in
|
||||
yes) enable_offensive_insults=no
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: --with-pc-insults option deprecated, it is now the default" >&5
|
||||
printf "%s\n" "$as_me: --with-pc-insults option deprecated, it is now the default" >&6;}
|
||||
;;
|
||||
no) enable_offensive_insults=yes
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: --without-pc-insults option deprecated, use --enable-offensive-insults" >&5
|
||||
printf "%s\n" "$as_me: --without-pc-insults option deprecated, use --enable-offensive-insults" >&6;}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-devel was given.
|
||||
if test ${with_devel+y}
|
||||
@ -7066,21 +7044,6 @@ fi
|
||||
printf "%s\n" "#define TIMESTAMP_TYPE $timestamp_type" >>confdefs.h
|
||||
|
||||
|
||||
# Check whether --enable-offensive_insults was given.
|
||||
if test ${enable_offensive_insults+y}
|
||||
then :
|
||||
enableval=$enable_offensive_insults;
|
||||
else case e in #(
|
||||
e) enable_offensive_insults=no ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$enable_offensive_insults" = "yes"
|
||||
then :
|
||||
printf "%s\n" "#define OFFENSIVE_INSULTS 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-package_build was given.
|
||||
if test ${enable_package_build+y}
|
||||
then :
|
||||
@ -26352,7 +26315,7 @@ esac
|
||||
fi
|
||||
|
||||
done
|
||||
if test "$CPPFLAGS" = "$O_CPPFLAGS"; then
|
||||
if test "$cross_compiling" != "yes" -a "$CPPFLAGS" = "$O_CPPFLAGS"; then
|
||||
# So we find the openssl compat headers under wolfssl (XXX)
|
||||
|
||||
if test ${CPPFLAGS+y}
|
||||
@ -38445,7 +38408,6 @@ echo " password tries : ${passwd_tries}" >&6
|
||||
echo " bad password message : ${badpass_message}" >&6
|
||||
if test "$insults" = "on"; then
|
||||
i=""
|
||||
test "$enable_offensive_insults" = "yes" && i="offensive ${i}"
|
||||
test "$with_python_insults" = "yes" && i="python ${i}"
|
||||
test "$with_goons_insults" = "yes" && i="goons ${i}"
|
||||
test "$with_hal_insults" = "yes" && i="hal ${i}"
|
||||
@ -38711,6 +38673,5 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
17
configure.ac
17
configure.ac
@ -299,16 +299,6 @@ AC_ARG_WITH(alertmail, [AS_HELP_STRING([--with-alertmail], [deprecated])],
|
||||
;;
|
||||
esac])
|
||||
|
||||
AC_ARG_WITH(pc-insults, [AS_HELP_STRING([--with-pc-insults], [deprecated])],
|
||||
[case $with_pc_insults in
|
||||
yes) enable_offensive_insults=no
|
||||
AC_MSG_NOTICE([--with-pc-insults option deprecated, it is now the default])
|
||||
;;
|
||||
no) enable_offensive_insults=yes
|
||||
AC_MSG_NOTICE([--without-pc-insults option deprecated, use --enable-offensive-insults])
|
||||
;;
|
||||
esac])
|
||||
|
||||
dnl
|
||||
dnl Options for --with
|
||||
dnl
|
||||
@ -1483,11 +1473,6 @@ AC_ARG_ENABLE(timestamp-type,
|
||||
])
|
||||
AC_DEFINE_UNQUOTED(TIMESTAMP_TYPE, $timestamp_type)
|
||||
|
||||
AC_ARG_ENABLE(offensive_insults,
|
||||
[AS_HELP_STRING([--enable-offensive-insults], [Enable potentially offensive sudo insults.])],
|
||||
[], [enable_offensive_insults=no])
|
||||
AS_IF([test "$enable_offensive_insults" = "yes"], [AC_DEFINE(OFFENSIVE_INSULTS)])
|
||||
|
||||
AC_ARG_ENABLE(package_build,
|
||||
[AS_HELP_STRING([--enable-package-build], [Enable options for package building.])],
|
||||
[], [enable_package_build=no])
|
||||
@ -4526,7 +4511,6 @@ echo " password tries : ${passwd_tries}" >&AS_MESSAGE_FD
|
||||
echo " bad password message : ${badpass_message}" >&AS_MESSAGE_FD
|
||||
if test "$insults" = "on"; then
|
||||
i=""
|
||||
test "$enable_offensive_insults" = "yes" && i="offensive ${i}"
|
||||
test "$with_python_insults" = "yes" && i="python ${i}"
|
||||
test "$with_goons_insults" = "yes" && i="goons ${i}"
|
||||
test "$with_hal_insults" = "yes" && i="hal ${i}"
|
||||
@ -4735,7 +4719,6 @@ AH_TEMPLATE(NO_PAM_SESSION, [Define to 1 if you don't want to use sudo's PAM ses
|
||||
AH_TEMPLATE(NO_ROOT_MAILER, [Define to avoid running the mailer as root.])
|
||||
AH_TEMPLATE(NO_ROOT_SUDO, [Define to 1 if root should not be allowed to use sudo.])
|
||||
AH_TEMPLATE(TIMESTAMP_TYPE, [Define to global, ppid or tty to set the default timestamp record type.])
|
||||
AH_TEMPLATE(OFFENSIVE_INSULTS, [Define to 1 to include offensive insults from the classic version of sudo.])
|
||||
AH_TEMPLATE(SECURE_PATH, [A colon-separated list of directories to override the user's PATH with.])
|
||||
AH_TEMPLATE(SEND_MAIL_WHEN_NOT_OK, [Define to 1 to send mail when the user is not allowed to run a command.])
|
||||
AH_TEMPLATE(SEND_MAIL_WHEN_NO_HOST, [Define to 1 to send mail when the user is not allowed to run sudo on this host.])
|
||||
|
||||
@ -24,11 +24,7 @@
|
||||
*/
|
||||
|
||||
"Wrong! You cheating scum!",
|
||||
#ifndef OFFENSIVE_INSULTS
|
||||
"And you call yourself a Rocket Scientist!",
|
||||
#else
|
||||
"No soap, honkie-lips.",
|
||||
#endif
|
||||
"Where did you learn to type?",
|
||||
"Are you on drugs?",
|
||||
"My pet ferret can type better than you!",
|
||||
|
||||
@ -29,11 +29,7 @@
|
||||
"stty: unknown mode: doofus",
|
||||
"I can't hear you -- I'm using the scrambler.",
|
||||
"The more you drive -- the dumber you get.",
|
||||
#ifdef PC_INSULTS
|
||||
"Listen, broccoli brains, I don't have time to listen to this trash.",
|
||||
#else
|
||||
"Listen, burrito brains, I don't have time to listen to this trash.",
|
||||
#endif
|
||||
"I've seen penguins that can type better than that.",
|
||||
"Have you considered trying to match wits with a rutabaga?",
|
||||
"You speak an infinite deal of nothing",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user