system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-10-01 13:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added syntax check for file passed to vidoas

Browse source 
script using -n flag.

Restored vidoas script to /usr/local/bin/ from /usr/local/sbin/
to insure it is in common user path.
This commit is contained in:
Jesse Smith 2020-11-09 11:30:49 -04:00
parent 8c19f6a4b3
commit f82b712c16
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -70,9 +70,8 @@ install: $(BIN) $(FINALS)
mkdir -p $(DESTDIR)$(PREFIX)/bin
cp $(BIN) $(DESTDIR)$(PREFIX)/bin/
chmod 4755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
mkdir -p $(DESTDIR)$(PREFIX)/sbin
cp vidoas.final $(DESTDIR)$(PREFIX)/sbin/vidoas
chmod 755 $(DESTDIR)$(PREFIX)/sbin/vidoas
cp vidoas.final $(DESTDIR)$(PREFIX)/bin/vidoas
chmod 755 $(DESTDIR)$(PREFIX)/bin/vidoas
mkdir -p $(MANDIR)/man1
cp doas.1.final $(MANDIR)/man1/doas.1
mkdir -p $(MANDIR)/man5
@ -82,7 +81,7 @@ install: $(BIN) $(FINALS)
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/doas
rm -f $(DESTDIR)$(PREFIX)/sbin/vidoas
rm -f $(DESTDIR)$(PREFIX)/bin/vidoas
rm -f $(MANDIR)/man1/doas.1
rm -f $(MANDIR)/man5/doas.conf.5
rm -f $(MANDIR)/man8/vidoas.8

4
vidoas
View file

@ -188,6 +188,10 @@ fi
if ${noop}
then
if ! doas -C "${DOAS_CONF}"
then
die "${DOAS_CONF} contains syntax errors."
fi
warn 'OK: Prerequisite checks passed'
exit 0
fi