diff options
| author | brueffer <brueffer@FreeBSD.org> | 2015-12-18 09:48:01 +0000 |
|---|---|---|
| committer | brueffer <brueffer@FreeBSD.org> | 2015-12-18 09:48:01 +0000 |
| commit | d0695185279685fedc5cd2ef6b615c4be9378c43 (patch) | |
| tree | aa8cfe0cdfd8d3707778fac1df526d01b514cb3d /contrib/openbsm/modules | |
| parent | c013da36dd6433af682a60f3f39d806ea5fcebd3 (diff) | |
| parent | ab2965f3f31f8900072b6d17188253d21c93474a (diff) | |
| download | FreeBSD-src-d0695185279685fedc5cd2ef6b615c4be9378c43.zip FreeBSD-src-d0695185279685fedc5cd2ef6b615c4be9378c43.tar.gz | |
Merge OpenBSM 1.2 alpha 4.
MFC after: 2 weeks
Relnotes: yes
Diffstat (limited to 'contrib/openbsm/modules')
| -rw-r--r-- | contrib/openbsm/modules/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/openbsm/modules/auditfilter_noop/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/contrib/openbsm/modules/Makefile.am b/contrib/openbsm/modules/Makefile.am index 7d59ec2..c4a3c20 100644 --- a/contrib/openbsm/modules/Makefile.am +++ b/contrib/openbsm/modules/Makefile.am @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.am#2 $ -## - SUBDIRS = \ auditfilter_noop diff --git a/contrib/openbsm/modules/auditfilter_noop/Makefile.am b/contrib/openbsm/modules/auditfilter_noop/Makefile.am index 5b43206..3500fd0 100644 --- a/contrib/openbsm/modules/auditfilter_noop/Makefile.am +++ b/contrib/openbsm/modules/auditfilter_noop/Makefile.am @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#4 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else diff --git a/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c b/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c index 79834d4..7e2e973 100644 --- a/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c +++ b/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 $ */ /* |
