diff options
| author | brueffer <brueffer@FreeBSD.org> | 2016-01-04 16:32:21 +0000 |
|---|---|---|
| committer | brueffer <brueffer@FreeBSD.org> | 2016-01-04 16:32:21 +0000 |
| commit | 144eea387465dd3aebdc4046e8e6d172c51f17bc (patch) | |
| tree | 90d3e33a03955ab242ddb994d74b62328cef221e /contrib/openbsm/test | |
| parent | 969f3dbb098ab068cf750107a9958d2f7c42405d (diff) | |
| download | FreeBSD-src-144eea387465dd3aebdc4046e8e6d172c51f17bc.zip FreeBSD-src-144eea387465dd3aebdc4046e8e6d172c51f17bc.tar.gz | |
MFH: 292432,r292433,r292434
- Merge OpenBSM 1.2 alpha 4.
- Regenerate config.h for OpenBSM 1.2 alpha 4.
- Add au_notify.2 and MLINKs (added in OpenBSM 1.2 alpha 4).
Relnotes: yes
Diffstat (limited to 'contrib/openbsm/test')
| -rw-r--r-- | contrib/openbsm/test/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/openbsm/test/bsm/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/openbsm/test/bsm/generate.c | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/contrib/openbsm/test/Makefile.am b/contrib/openbsm/test/Makefile.am index 7b936ed..5868349 100644 --- a/contrib/openbsm/test/Makefile.am +++ b/contrib/openbsm/test/Makefile.am @@ -1,6 +1,2 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.am#3 $ -## - SUBDIRS = \ bsm diff --git a/contrib/openbsm/test/bsm/Makefile.am b/contrib/openbsm/test/bsm/Makefile.am index 577e7cb..c787f95 100644 --- a/contrib/openbsm/test/bsm/Makefile.am +++ b/contrib/openbsm/test/bsm/Makefile.am @@ -1,7 +1,3 @@ -## -## $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#4 $ -## - if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) else diff --git a/contrib/openbsm/test/bsm/generate.c b/contrib/openbsm/test/bsm/generate.c index bbc81bb..3416fa3 100644 --- a/contrib/openbsm/test/bsm/generate.c +++ b/contrib/openbsm/test/bsm/generate.c @@ -23,8 +23,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/test/bsm/generate.c#14 $ */ /* |
