From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 30 Apr 2010 19:38:33 +0000 (-0400)
Subject: Move audit sources into the sudoers plugin dir; the driver does not use them.
X-Git-Tag: SUDO_1_8_0~674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54750205616ce429072bc6d8de93214436318177;p=sudo

Move audit sources into the sudoers plugin dir; the driver does not use them.
---

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index c2759e062..e9db4101f 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -183,8 +183,9 @@ $(devdir)/getdate.c: $(srcdir)/getdate.y
 @DEV@	perl $(srcdir)/mkdefaults -o def_data $(srcdir)/def_data.in
 
 # Sudoers dependencies
-sudoers.lo: $(srcdir)/sudoers.c $(SUDODEP) $(srcdir)/interfaces.h
 alias.lo: $(srcdir)/alias.c $(SUDODEP) $(srcdir)/parse.h $(incdir)/list.h $(srcdir)/redblack.h
+audit.lo: audit.c $(SUDODEP)
+bsm_audit.lo: bsm_audit.c $(SUDODEP) $(srcdir)/bsm_audit.h
 boottime.lo: $(srcdir)/boottime.c $(top_builddir)/config.h
 check.lo: $(srcdir)/check.c $(SUDODEP)
 defaults.lo: $(srcdir)/defaults.c $(SUDODEP) $(srcdir)/def_data.c $(authdir)/sudo_auth.h $(devdir)/gram.h
@@ -204,6 +205,7 @@ pwutil.lo: $(srcdir)/pwutil.c $(SUDODEP)
 redblack.lo: $(srcdir)/redblack.c $(SUDODEP) $(srcdir)/redblack.h
 set_perms.lo: $(srcdir)/set_perms.c $(SUDODEP)
 sudo_nss.lo: $(srcdir)/sudo_nss.c $(SUDODEP)
+sudoers.lo: $(srcdir)/sudoers.c $(SUDODEP) $(srcdir)/interfaces.h
 timestr.lo: $(srcdir)/timestr.c $(incdir)/compat.h $(top_builddir)/config.h
 toke.lo: $(devdir)/toke.c $(SUDODEP) $(srcdir)/parse.h $(incdir)/list.h $(devdir)/gram.h
 tsgetgrpw.lo: $(srcdir)/tsgetgrpw.c $(SUDODEP)
@@ -234,14 +236,6 @@ zero_bytes.c: $(top_srcdir)/src/zero_bytes.c
 	@$(LN_S) -f $(top_srcdir)/src/$@ $@
 zero_bytes.lo: zero_bytes.c $(incdir)/compat.h $(top_builddir)/config.h
 
-# Upper level audit dependencies (XXX - move into sudoers plugin dir?)
-audit.c: $(top_srcdir)/src/audit.c
-	@$(LN_S) -f $(top_srcdir)/src/$@ $@
-audit.lo: audit.c $(SUDODEP)
-bsm_audit.c: $(top_srcdir)/src/bsm_audit.c
-	@$(LN_S) -f $(top_srcdir)/src/$@ $@
-bsm_audit.lo: bsm_audit.c $(SUDODEP) $(top_srcdir)/src/bsm_audit.h
-
 # Auth dependencies
 sudo_auth.lo: $(authdir)/sudo_auth.c $(AUTHDEP) $(INSDEP)
 afs.lo: $(authdir)/afs.c $(AUTHDEP)
diff --git a/src/audit.c b/plugins/sudoers/audit.c
similarity index 100%
rename from src/audit.c
rename to plugins/sudoers/audit.c
diff --git a/src/bsm_audit.c b/plugins/sudoers/bsm_audit.c
similarity index 100%
rename from src/bsm_audit.c
rename to plugins/sudoers/bsm_audit.c
diff --git a/src/bsm_audit.h b/plugins/sudoers/bsm_audit.h
similarity index 100%
rename from src/bsm_audit.h
rename to plugins/sudoers/bsm_audit.h