diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in index dd780a907..0007d1d31 100644 --- a/logsrvd/Makefile.in +++ b/logsrvd/Makefile.in @@ -105,7 +105,7 @@ DEVEL = @DEVEL@ SHELL = @SHELL@ -PROGS = logsrvd sendlog +PROGS = sudo_logsrvd sudo_sendlog LOGSRVD_OBJS = iolog_writer.o logsrvd.o \ logsrvd_conf.o log_server.pb-c.o protobuf-c.o @@ -139,10 +139,10 @@ Makefile: $(srcdir)/Makefile.in .i.plog: ifile=$<; rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $${ifile%i}c --i-file $< --output-file $@ -logsrvd: $(LOGSRVD_OBJS) $(LT_LIBS) +sudo_logsrvd: $(LOGSRVD_OBJS) $(LT_LIBS) $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(LOGSRVD_OBJS) $(LDFLAGS) $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS) -sendlog: $(SENDLOG_OBJS) $(LT_LIBS) +sudo_sendlog: $(SENDLOG_OBJS) $(LT_LIBS) $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(SENDLOG_OBJS) $(LDFLAGS) $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS) GENERATED = log_server.pb-c.h log_server.pb-c.c @@ -161,8 +161,8 @@ install-dirs: $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) install-binaries: install-dirs $(PROGS) - INSTALL_BACKUP='$(INSTALL_BACKUP)' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 logsrvd $(DESTDIR)$(sbindir)/logsrvd - INSTALL_BACKUP='$(INSTALL_BACKUP)' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sendlog $(DESTDIR)$(sbindir)/sendlog + INSTALL_BACKUP='$(INSTALL_BACKUP)' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sudo_logsrvd $(DESTDIR)$(sbindir)/sudo_logsrvd + INSTALL_BACKUP='$(INSTALL_BACKUP)' $(LIBTOOL) $(LTFLAGS) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sudo_sendlog $(DESTDIR)$(sbindir)/sudo_sendlog install-doc: @@ -171,11 +171,11 @@ install-includes: install-plugin: uninstall: - -rm -f $(DESTDIR)$(sbindir)/logsrvd \ - $(DESTDIR)$(sbindir)/sendlog + -rm -f $(DESTDIR)$(sbindir)/sudo_logsrvd \ + $(DESTDIR)$(sbindir)/sudo_sendlog -test -z "$(INSTALL_BACKUP)" || \ - rm -f $(DESTDIR)$(sbindir)/logsrvd$(INSTALL_BACKUP) \ - $(DESTDIR)$(sbindir)/sendlog + rm -f $(DESTDIR)$(sbindir)/sudo_logsrvd$(INSTALL_BACKUP) \ + $(DESTDIR)$(sbindir)/sudo_sendlog$(INSTALL_BACKUP) splint: splint $(SPLINT_OPTS) -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) -I$(top_srcdir) $(srcdir)/*.c diff --git a/sudo.pp b/sudo.pp index 4d2924c5b..82097268c 100644 --- a/sudo.pp +++ b/sudo.pp @@ -284,8 +284,8 @@ still allow people to get their work done." ln -s -f ${bindir}/sudo ${pp_destdir}/usr/bin ln -s -f ${bindir}/sudoedit ${pp_destdir}/usr/bin ln -s -f ${bindir}/sudoreplay ${pp_destdir}/usr/bin - ln -s -f ${sbindir}/logsrvd ${pp_destdir}/usr/sbin - ln -s -f ${sbindir}/sendlog ${pp_destdir}/usr/sbin + ln -s -f ${sbindir}/sudo_logsrvd ${pp_destdir}/usr/sbin + ln -s -f ${sbindir}/sudo_sendlog ${pp_destdir}/usr/sbin ln -s -f ${sbindir}/visudo ${pp_destdir}/usr/sbin %endif @@ -333,8 +333,8 @@ still allow people to get their work done." $bindir/sudo 4755 root: $bindir/sudoedit 0755 root: symlink sudo $bindir/sudoreplay 0755 - $sbindir/logsrvd 0755 - $sbindir/sendlog 0755 + $sbindir/sudo_logsrvd 0755 + $sbindir/sudo_sendlog 0755 $sbindir/visudo 0755 $includedir/sudo_plugin.h 0644 $libexecdir/sudo/ 0755 @@ -367,8 +367,8 @@ still allow people to get their work done." /usr/bin/sudo 0755 root: symlink $bindir/sudo /usr/bin/sudoedit 0755 root: symlink $bindir/sudoedit /usr/bin/sudoreplay 0755 root: symlink $bindir/sudoreplay - /usr/sbin/logsrvd 0755 root: symlink $sbindir/logsrvd - /usr/sbin/sendlog 0755 root: symlink $sbindir/sendlog + /usr/sbin/sudo_logsrvd 0755 root: symlink $sbindir/logsrvd + /usr/sbin/sudo_sendlog 0755 root: symlink $sbindir/sendlog /usr/sbin/visudo 0755 root: symlink $sbindir/visudo %endif %if [rpm]