r11136: patches from Brian Moran for eventlogadm utility

(This used to be commit 47b626a8f72629fd1bbabf35b68e24d202df2555)

2 files changed, 19 insertions, 24 deletions

diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index bf843e5518..69d8f2f9aa 100644
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -84,6 +84,7 @@ BOOL eventlog_init_keys( void )
 			 evtlogpath ) );
 		regdb_fetch_values( evtlogpath, values );
 
+
 		if ( !regval_ctr_key_exists( values, "MaxSize" ) ) {
 
 			/* assume we have none, add them all */
@@ -153,6 +154,7 @@ BOOL eventlog_init_keys( void )
 	}
 
 	return True;
+
 }
 
 /*********************************************************************
@@ -181,7 +183,7 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename,
 	int i;
 	int numsources;
 
-	for ( i=0; elogs[i]; i++ ) {
+	for ( i = 0; elogs[i]; i++ ) {
 		if ( strequal( elogs[i], eventlog ) )
 			break;
 	}
@@ -207,11 +209,11 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename,
 
 	regdb_fetch_values( evtlogpath, values );
 
+
 	if ( !( rval = regval_ctr_getvalue( values, "Sources" ) ) ) {
 		DEBUG( 0, ( "No Sources value for [%s]!\n", eventlog ) );
 		return False;
 	}
-
 	/* perhaps this adding a new string to a multi_sz should be a fn? */
 	/* check to see if it's there already */
 
@@ -220,11 +222,8 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename,
 		       ( "Wrong type for Sources, should be REG_MULTI_SZ\n" ) );
 		return False;
 	}
-
 	/* convert to a 'regulah' chars to do some comparisons */
 
-	DEBUG( 0, ( "Rval size is %d\n", rval->size ) );
-
 	already_in = False;
 	wrklist = NULL;
 	dump_data( 1, rval->data_p, rval->size );
@@ -232,18 +231,15 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename,
 	       regval_convert_multi_sz( ( uint16 * ) rval->data_p, rval->size,
 					&wrklist ) ) > 0 ) {
 
-		DEBUG( 10, ( "numsources is %d\n", numsources ) );
 		ii = numsources;
 		/* see if it's in there already */
 		wp = wrklist;
+
 		while ( ii && wp && *wp ) {
-			DEBUG( 5,
-			       ( "Comparing [%s] to [%s]\n", sourcename,
-				 *wp ) );
 			if ( strequal( *wp, sourcename ) ) {
 				DEBUG( 5,
-				       ( "Source name %s already exists, \n",
-					 sourcename ) );
+				       ( "Source name [%s] already in list for [%s] \n",
+					 sourcename, eventlog ) );
 				already_in = True;
 				break;
 			}
@@ -269,26 +265,23 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename,
 			DEBUG( 0, ( "talloc() failed \n" ) );
 			return False;
 		}
-		DEBUG( 0, ( "Number of sources [%d]\n", numsources ) );
 		memcpy( wp, wrklist, sizeof( char * ) * numsources );
 		*( wp + numsources ) = ( char * ) sourcename;
 		*( wp + numsources + 1 ) = NULL;
 		mbytes = regval_build_multi_sz( wp, &msz_wp );
-		DEBUG( 0, ( "Number of mbytes [%d]\n", mbytes ) );
-		dump_data( 1, (char*)msz_wp, mbytes );
+		dump_data( 1, ( char * ) msz_wp, mbytes );
 		regval_ctr_addvalue( values, "Sources", REG_MULTI_SZ,
 				     ( char * ) msz_wp, mbytes );
 		regdb_store_values( evtlogpath, values );
 		TALLOC_FREE( msz_wp );
 	} else {
-		DEBUG( 0,
+		DEBUG( 3,
 		       ( "Source name [%s] found in existing list of sources\n",
 			 sourcename ) );
 	}
 	TALLOC_FREE( values );
-
-	DEBUG( 5,
-	       ( "Added source to sources string, now adding subkeys\n" ) );
+	if ( wrklist )
+		TALLOC_FREE( wrklist );	/*  */
 
 	if ( !( subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR ) ) ) {
 		DEBUG( 0, ( "talloc() failure!\n" ) );
diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 9fd9dba27d..40b16d0073 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -128,26 +128,28 @@ char* reg_remaining_path( const char *key )
 /**********************************************************************
 *********************************************************************/
 
-int regval_convert_multi_sz( uint16 *multi_string, size_t multi_len, char ***values )
+int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***values )
 {
 	char **sz;
 	int i;
 	int num_strings = 0;
 	fstring buffer;
 	uint16 *wp;
+	size_t multi_len = byte_len / 2;
 	
-	*values = NULL;
-
 	if ( !multi_string || !values )
 		return 0;
 
+	*values = NULL;
+
 	/* just count the NULLs */
 	
-	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i+=2 ) {
-		if ( multi_string[i] == 0x0 )
+	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i++ ) {
+		/* peek ahead */
+		if ( multi_string[i+1] == 0x0 )
 			num_strings++;
 	}
-	
+
 	if ( num_strings == 0 )
 		return 0;