From 166ef55aa7397b36ff4bd477db5b7641c8fa3f05 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sun, 10 Sep 2023 10:23:04 -0600 Subject: [PATCH] Remove unnecessary sudo_gettext.h include and add missing const. --- lib/util/Makefile.in | 8 ++++---- lib/util/getusershell.c | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 112509378..05455f701 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -916,13 +916,13 @@ gettime.plog: gettime.i rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/gettime.c --i-file $< --output-file $@ getusershell.lo: $(srcdir)/getusershell.c $(incdir)/compat/stdbool.h \ $(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_gettext.h $(incdir)/sudo_queue.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h + $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(HARDENING_CFLAGS) $(srcdir)/getusershell.c getusershell.i: $(srcdir)/getusershell.c $(incdir)/compat/stdbool.h \ $(incdir)/sudo_compat.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_gettext.h $(incdir)/sudo_queue.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h + $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h $(CC) -E -o $@ $(CPPFLAGS) $< getusershell.plog: getusershell.i rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/getusershell.c --i-file $< --output-file $@ diff --git a/lib/util/getusershell.c b/lib/util/getusershell.c index 791281628..e38b091d3 100644 --- a/lib/util/getusershell.c +++ b/lib/util/getusershell.c @@ -29,11 +29,10 @@ #include "sudo_compat.h" #include "sudo_debug.h" -#include "sudo_gettext.h" #include "sudo_util.h" -static char **allowed_shells, **current_shell; -static char *default_shells[] = { +static char **allowed_shells, * const *current_shell; +static const char *default_shells[] = { "/bin/sh", "/bin/ksh", "/bin/ksh93",