Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jun 2007 00:56:20 GMT
From:      "Christian S.J. Peron" <csjp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 122000 for review
Message-ID:  <200706200056.l5K0uKZ3033379@repoman.freebsd.org>

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

Change 122000 by csjp@push on 2007/06/20 00:55:23

	- Fix bug in in_addr_ex tokens where the incorrect amount of data
	  was being copied for ip6 addresses.
	- Fix printing bug which resulted in the strings associated with
	  arg32 tokens were not being processed.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 (text+ko) ====

@@ -32,7 +32,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_io.c#48 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 $
  */
 
 #include <sys/types.h>
@@ -1306,6 +1306,7 @@
 		print_delim(fp, del);
 		print_4_bytes(fp, tok->tt.arg32.val, "0x%x");
 		print_delim(fp, del);
+		print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len);
 	}
 }
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 (text+ko) ====

@@ -30,7 +30,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_token.c#62 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $
  */
 
 #include <sys/types.h>
@@ -411,7 +411,7 @@
 
 	ADD_U_CHAR(dptr, AUT_IN_ADDR_EX);
 	ADD_U_INT32(dptr, type);
-	ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t));
+	ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t));
 
 	return (t);
 }



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