PERFORCE change 147173 for review

[Stacey Son]

http://perforce.freebsd.org/chv.cgi?CH=147173

Change 147173 by sson at sson_amd64 on 2008/08/11 19:44:59

	strcpy() -> strncpy() to appease static checkers.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 (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_class.c#12 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 $
  */
 
 #include <bsm/libbsm.h>
@@ -71,14 +71,14 @@
 	if (strlen(classname) >= AU_CLASS_NAME_MAX)
 		return (NULL);
 
-	strcpy(c->ac_name, classname);
+	strncpy(c->ac_name, classname, AU_CLASS_NAME_MAX);
 
 	/*
 	 * Check for very large class description.
 	 */
 	if (strlen(classdesc) >= AU_CLASS_DESC_MAX)
 		return (NULL);
-	strcpy(c->ac_desc, classdesc);
+	strncpy(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#20 (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#19 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 $
  */
 
 #include <config/config.h>
@@ -368,7 +368,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strcpy(name, dir);
+	strncpy(name, dir, len);
 	pthread_mutex_unlock(&mutex);
 	return (ret);
 }
@@ -458,7 +458,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strcpy(auditstr, str);
+	strncpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }
@@ -485,7 +485,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strcpy(auditstr, str);
+	strncpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }
@@ -512,7 +512,7 @@
 		pthread_mutex_unlock(&mutex);
 		return (-3);
 	}
-	strcpy(auditstr, str);
+	strncpy(auditstr, str, len);
 	pthread_mutex_unlock(&mutex);
 	return (0);
 }

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 (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_event.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 $
  */
 
 #include <bsm/libbsm.h>
@@ -68,13 +68,13 @@
 	if (strlen(evname) >= AU_EVENT_NAME_MAX)
 		return (NULL);
 
-	strcpy(e->ae_name, evname);
+	strncpy(e->ae_name, evname, AU_EVENT_NAME_MAX);
 	if (evdesc != NULL) {
 		if (strlen(evdesc) >= AU_EVENT_DESC_MAX)
 			return (NULL);
-		strcpy(e->ae_desc, evdesc);
+		strncpy(e->ae_desc, evdesc, AU_EVENT_DESC_MAX);
 	} else
-		strcpy(e->ae_desc, "");
+		strncpy(e->ae_desc, "", AU_EVENT_DESC_MAX);
 
 	e->ae_number = atoi(evno);
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 (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_flags.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 $
  */
 
 #include <bsm/libbsm.h>
@@ -157,10 +157,10 @@
 
 		if (sel != 0) {
 			if (verbose) {
-				strcpy(strptr, c.ac_desc);
+				strncpy(strptr, c.ac_desc, AU_CLASS_DESC_MAX);
 				strptr += strlen(c.ac_desc);
 			} else {
-				strcpy(strptr, c.ac_name);
+				strncpy(strptr, c.ac_name, AU_CLASS_NAME_MAX);
 				strptr += strlen(c.ac_name);
 			}
 			*strptr = ','; /* delimiter */

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 (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_user.c#16 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 $
  */
 
 #include <bsm/libbsm.h>
@@ -66,7 +66,7 @@
 	if (strlen(username) >= AU_USER_NAME_MAX)
 		return (NULL);
 
-	strcpy(u->au_name, username);
+	strncpy(u->au_name, username, AU_USER_NAME_MAX);
 	if (getauditflagsbin(always, &(u->au_always)) == -1)
 		return (NULL);