If there is an existing sudoers file, only install if it passes a

syntax check.

Makefile.in

@@ -57,10 +57,13 @@ all: config.status
 check: config.status
 	for d in $(SUBDIRS) $(SAMPLES); do (cd $$d && $(MAKE) $@) || break; done
 
-install-dirs install-binaries install-includes install-plugin uninstall: config.status
+pre-install:
 	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
 
-install install-doc: config.status ChangeLog
+install-dirs install-binaries install-includes install-plugin uninstall: config.status pre-install
+	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
+
+install install-doc: config.status ChangeLog pre-install
 	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
 
 autoconf:

common/Makefile.in

@@ -78,6 +78,8 @@ term.lo: $(srcdir)/term.c $(incdir)/missing.h $(top_builddir)/config.h
 zero_bytes.lo: $(srcdir)/zero_bytes.c $(incdir)/missing.h $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/zero_bytes.c
 
+pre-install:
+
 install:
 
 install-dirs:

compat/Makefile.in

@@ -114,6 +114,8 @@ strsignal.lo: $(srcdir)/strsignal.c $(incdir)/missing.h $(top_builddir)/config.h
 utimes.lo: $(srcdir)/utimes.c $(incdir)/missing.h $(srcdir)/utime.h $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/utimes.c
 
+pre-install:
+
 install:
 
 install-dirs:

doc/Makefile.in

@@ -142,6 +142,8 @@ HISTORY: $(srcdir)/history.pod
 LICENSE: $(srcdir)/license.pod
 	pod2text -l -i0 $(srcdir)/license.pod | sed '1,2d' > $@
 
+pre-install:
+
 install: install-dirs install-doc
 
 install-dirs:

include/Makefile.in

@@ -47,6 +47,8 @@ Makefile: $(srcdir)/Makefile.in
 
 .SUFFIXES: .h
 
+pre-install:
+
 install: install-dirs install-includes
 
 install-dirs:

plugins/sample/Makefile.in

@@ -85,6 +85,8 @@ sample_plugin.lo: $(srcdir)/sample_plugin.c
 sample_plugin.la: $(OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -export-symbols $(srcdir)/sample_plugin.sym -avoid-version -rpath $(plugindir)
 
+pre-install:
+
 install: install-dirs install-plugin
 
 install-dirs:

plugins/sample_group/Makefile.in

@@ -88,6 +88,8 @@ sample_group.lo: $(srcdir)/sample_group.c
 sample_group.la: $(OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -module -export-symbols $(srcdir)/sample_group.sym -avoid-version -rpath $(plugindir)
 
+pre-install:
+
 install: install-dirs install-plugin
 
 install-dirs:

plugins/sudoers/Makefile.in

@@ -328,6 +328,12 @@ tsgetgrpw.o: $(srcdir)/tsgetgrpw.c $(SUDODEP)
 visudo.o: $(srcdir)/visudo.c $(SUDODEP) $(devdir)/gram.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/visudo.c
 
+pre-install:
+	@if test -r $(DESTDIR)$(sudoersdir)/sudoers; then \
+	    echo "Checking existing sudoers file for syntax errors."; \
+	    ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
+	fi
+
 install: install-dirs install-plugin install-binaries install-sudoers install-doc
 
 install-dirs:
@@ -351,7 +357,7 @@ install-plugin: sudoers.la install-dirs
 install-sudoers: install-dirs
 	$(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \
 	    $(DESTDIR)$(sudoersdir)/sudoers.d
-	test -f $(DESTDIR)$(sudoersdir)/sudoers || \
+	test -r $(DESTDIR)$(sudoersdir)/sudoers || \
 	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
 		sudoers $(DESTDIR)$(sudoersdir)/sudoers
 

src/Makefile.in

@@ -141,6 +141,8 @@ ttysize.o: $(srcdir)/ttysize.c $(incdir)/missing.h $(top_builddir)/config.h
 utmp.o: $(srcdir)/utmp.c $(SUDODEP)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/utmp.c
 
+pre-install:
+
 install: install-dirs install-binaries @INSTALL_NOEXEC@
 
 install-dirs:

zlib/Makefile.in

@@ -89,6 +89,8 @@ uncompr.lo: $(srcdir)/zlib.h ./zconf.h
 zutil.lo: $(srcdir)/zutil.h $(srcdir)/zlib.h ./zconf.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/zutil.c
 
+pre-install:
+
 install:
 
 install-dirs: