Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Aug 2008 13:58:34 GMT
From:      Stacey Son <sson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 147232 for review
Message-ID:  <200808121358.m7CDwYgd025150@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147232

Change 147232 by sson@sson_amd64 on 2008/08/12 13:58:30

	Changed strncpy()/strncat() to strlcpy()/strlcat()/asprintf().
	Added compat/strlcpy.h for Linux. Updated NEWS.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/Makefile.in#8 edit
.. //depot/projects/trustedbsd/openbsm/NEWS#6 edit
.. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#8 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#9 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#9 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#34 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#8 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#26 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#8 edit
.. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#8 edit
.. //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 edit
.. //depot/projects/trustedbsd/openbsm/compat/strlcpy.h#1 add
.. //depot/projects/trustedbsd/openbsm/config/config.h.in#14 edit
.. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#5 edit
.. //depot/projects/trustedbsd/openbsm/configure#40 edit
.. //depot/projects/trustedbsd/openbsm/configure.ac#42 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#9 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#14 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#21 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#16 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#16 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#18 edit
.. //depot/projects/trustedbsd/openbsm/man/Makefile.in#7 edit
.. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#5 edit
.. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/sys/Makefile.in#2 edit
.. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#2 edit
.. //depot/projects/trustedbsd/openbsm/test/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#9 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/Makefile.in#8 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#7 $
+# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#8 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/NEWS#6 (text+ko) ====

@@ -13,6 +13,8 @@
   OpenBSM build infrastructure with an unmodified OpenBSM distribution,
   allowing the customized system includes to be used with the OpenBSM build.
   Submitted by Stacey Son.
+- Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s
+  or asprintf().  Added compat/strlcpy.h for Linux.
 
 OpenBSM 1.1 alpha 1
 
@@ -337,4 +339,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#5 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#6 $

==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#8 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#7 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#8 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#9 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#9 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#9 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#9 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#34 (text+ko) ====

@@ -26,7 +26,7 @@
  * (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/bin/auditd/auditd.c#33 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#34 $
  */
 
 #include <sys/types.h>
@@ -72,6 +72,13 @@
 #include "audit_triggers_server.h"
 #endif /* USE_MACH_IPC */
 
+#ifndef HAVE_STRLCAT
+#include <compat/strlcat.h>
+#endif
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
 #define	NA_EVENT_STR_SIZE	25
 #define	POL_STR_SIZE		128
 static int	 ret, minval;
@@ -149,23 +156,14 @@
 static char *
 affixdir(char *name, struct dir_ent *dirent)
 {
-	char *fn;
-	char *curdir;
-	const char *sep = "/";
-	size_t len;
+	char *fn = NULL;
 
-	curdir = dirent->dirname;
 	syslog(LOG_DEBUG, "dir = %s", dirent->dirname);
-
-	len = strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1;
-	fn = malloc(len);
-	if (fn == NULL)
-		return (NULL);
-	strncpy(fn, curdir, len);
-	len -= strlen(curdir);
-	strncat(fn, sep, len);
-	len -= strlen(sep);
-	strncat(fn, name, len);
+	/* 
+	 * XXX may want to  assert(asprintf(...) <=
+	 *     (strlen(dirent->dirname) + 1 + (2 * POSTFIX_LEN) + 1))
+	 */
+	asprintf(&fn, "%s/%s", dirent->dirname, name);
 	return (fn);
 }
 
@@ -184,12 +182,12 @@
 		oldname = (char *)malloc(len);
 		if (oldname == NULL)
 			return (-1);
-		strncpy(oldname, lastfile, len);
+		strlcpy(oldname, lastfile, len);
 
 		/* Rename the last file -- append timestamp. */
 		if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) {
 			*ptr = '.';
-			strncpy(ptr+1, TS, POSTFIX_LEN);
+			strlcpy(ptr+1, TS, POSTFIX_LEN);
 			if (rename(oldname, lastfile) != 0)
 				syslog(LOG_ERR,
 				    "Could not rename %s to %s: %m", oldname,
@@ -255,8 +253,8 @@
 	if (getTSstr(TS, POSTFIX_LEN) != 0)
 		return (-1);
 
-	strncpy(timestr, TS, POSTFIX_LEN);
-	strncat(timestr, NOT_TERMINATED, POSTFIX_LEN);
+	strlcpy(timestr, TS, POSTFIX_LEN);
+	strlcat(timestr, NOT_TERMINATED, POSTFIX_LEN);
 
 #ifdef AUDIT_REVIEW_GROUP
 	/*
@@ -361,7 +359,7 @@
 			free(dirent);
 			return (-1);
 		}
-		strncpy(dirent->dirname, cur_dir, MAXNAMLEN);
+		strlcpy(dirent->dirname, cur_dir, MAXNAMLEN);
 		TAILQ_INSERT_TAIL(&dir_q, dirent, dirs);
 	}
 

==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#6 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#6 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#8 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#7 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#8 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#26 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#25 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#26 $
  */
 
 /* 
@@ -61,6 +61,10 @@
 #include <regex.h>
 #include <errno.h>
 
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
 #include "auditreduce.h"
 
 static TAILQ_HEAD(tailhead, re_entry) re_head =
@@ -111,7 +115,7 @@
 	for (nstrs = 0, i = 0; i < len; i++) {
 		if (copy[i] == ',' && i > 0) {
 			if (copy[i - 1] == '\\')
-				strncpy(&copy[i - 1], &copy[i], len);
+				strlcpy(&copy[i - 1], &copy[i], len);
 			else {
 				nstrs++;
 				copy[i] = '\0';

==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#8 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#7 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#8 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#8 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#7 $
+# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#8 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 (text+ko) ====

@@ -25,6 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * dollar OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp dollar
+ * $P4: //depot/projects/trustedbsd/openbsm/compat/strlcat.h#3 $
  */
 
 /*

==== //depot/projects/trustedbsd/openbsm/config/config.h.in#14 (text+ko) ====

@@ -95,6 +95,9 @@
 /* Define to 1 if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
 /* Define to 1 if you have the `strrchr' function. */
 #undef HAVE_STRRCHR
 

==== //depot/projects/trustedbsd/openbsm/config/ltmain.sh#5 (xtext) ====


==== //depot/projects/trustedbsd/openbsm/configure#40 (xtext) ====

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#40 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#41 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha2.
 #
@@ -22801,7 +22801,8 @@
 
 
 
-for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul
+
+for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

==== //depot/projects/trustedbsd/openbsm/configure.ac#42 (text+ko) ====

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.1alpha2], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#41 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#42 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config/config.h])
@@ -83,7 +83,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strrchr strstr strtol strtoul])
+AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul])
 
 # sys/queue.h exists on most systems, but its capabilities vary a great deal.
 # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in

==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#9 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#9 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#14 (text+ko) ====

@@ -27,9 +27,11 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#14 $
  */
 
+#include <config/config.h>
+
 #include <bsm/libbsm.h>
 
 #include <string.h>
@@ -37,6 +39,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
 /*
  * Parse the contents of the audit_class file to return struct au_class_ent
  * entries.
@@ -70,15 +76,14 @@
 	 */
 	if (strlen(classname) >= AU_CLASS_NAME_MAX)
 		return (NULL);
-
-	strncpy(c->ac_name, classname, AU_CLASS_NAME_MAX);
+	strlcpy(c->ac_name, classname, AU_CLASS_NAME_MAX);
 
 	/*
 	 * Check for very large class description.
 	 */
 	if (strlen(classdesc) >= AU_CLASS_DESC_MAX)
 		return (NULL);
-	strncpy(c->ac_desc, classdesc, AU_CLASS_DESC_MAX);
+	strlcpy(c->ac_desc, classdesc, AU_CLASS_DESC_MAX);
 	c->ac_class = strtoul(classflag, (char **) NULL, 0);
 
 	return (c);

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#21 (text+ko) ====

@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#21 $
  */
 
 #include <config/config.h>
@@ -43,6 +43,9 @@
 #ifndef HAVE_STRLCAT
 #include <compat/strlcat.h>
 #endif
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
 
 /*
  * Parse the contents of the audit_control file to return the audit control
@@ -368,7 +371,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strncpy(name, dir, len);
+	strlcpy(name, dir, len);
 	pthread_mutex_unlock(&mutex);
 	return (ret);
 }
@@ -458,7 +461,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strncpy(auditstr, str, len);
+	strlcpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }
@@ -485,7 +488,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strncpy(auditstr, str, len);
+	strlcpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }
@@ -512,7 +515,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strncpy(auditstr, str, len);
+	strlcpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#16 (text+ko) ====

@@ -27,9 +27,11 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#16 $
  */
 
+#include <config/config.h>
+
 #include <bsm/libbsm.h>
 
 #include <string.h>
@@ -37,6 +39,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
+
 /*
  * Parse the contents of the audit_event file to return
  * au_event_ent entries
@@ -68,13 +75,13 @@
 	if (strlen(evname) >= AU_EVENT_NAME_MAX)
 		return (NULL);
 
-	strncpy(e->ae_name, evname, AU_EVENT_NAME_MAX);
+	strlcpy(e->ae_name, evname, AU_EVENT_NAME_MAX);
 	if (evdesc != NULL) {
 		if (strlen(evdesc) >= AU_EVENT_DESC_MAX)
 			return (NULL);
-		strncpy(e->ae_desc, evdesc, AU_EVENT_DESC_MAX);
+		strlcpy(e->ae_desc, evdesc, AU_EVENT_DESC_MAX);
 	} else
-		strncpy(e->ae_desc, "", AU_EVENT_DESC_MAX);
+		strlcpy(e->ae_desc, "", AU_EVENT_DESC_MAX);
 
 	e->ae_number = atoi(evno);
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#16 (text+ko) ====

@@ -27,15 +27,21 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#16 $
  */
 
+#include <config/config.h>
+
 #include <bsm/libbsm.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
 static const char	*flagdelim = ",";
 
 /*
@@ -157,10 +163,10 @@
 
 		if (sel != 0) {
 			if (verbose) {
-				strncpy(strptr, c.ac_desc, AU_CLASS_DESC_MAX);
+				strlcpy(strptr, c.ac_desc, AU_CLASS_DESC_MAX);
 				strptr += strlen(c.ac_desc);
 			} else {
-				strncpy(strptr, c.ac_name, AU_CLASS_NAME_MAX);
+				strlcpy(strptr, c.ac_name, AU_CLASS_NAME_MAX);
 				strptr += strlen(c.ac_name);
 			}
 			*strptr = ','; /* delimiter */

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#18 (text+ko) ====

@@ -27,9 +27,11 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#18 $
  */
 
+#include <config/config.h>
+
 #include <bsm/libbsm.h>
 
 #include <string.h>
@@ -37,6 +39,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef HAVE_STRLCPY
+#include <compat/strlcpy.h>
+#endif
+
 /*
  * Parse the contents of the audit_user file into au_user_ent structures.
  */
@@ -66,7 +72,7 @@
 	if (strlen(username) >= AU_USER_NAME_MAX)
 		return (NULL);
 
-	strncpy(u->au_name, username, AU_USER_NAME_MAX);
+	strlcpy(u->au_name, username, AU_USER_NAME_MAX);
 	if (getauditflagsbin(always, &(u->au_always)) == -1)
 		return (NULL);
 

==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#7 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#6 $
+# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#7 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/modules/Makefile.in#5 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.in#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.in#5 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#6 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#6 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/sys/Makefile.in#2 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.in#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.in#2 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#2 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#2 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/test/Makefile.in#6 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.in#6 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@

==== //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#6 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#6 $
 #
 
 VPATH = @srcdir@

==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#9 (text+ko) ====

@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#9 $
 #
 
 VPATH = @srcdir@



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808121358.m7CDwYgd025150>