diff options
| author | Günther Deschner <gd@samba.org> | 2009-09-25 00:36:43 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-09-30 00:30:25 +0200 |
| commit | 2d6e5e160b9fd1a21bbbe699f6786c570daa0467 (patch) | |
| tree | 2a825ecb8abb4688b37c13366508a6f396707478 /source3/registry | |
| parent | 1b0f3b7e3a3eadb1c9997b38dd41aa4c09c41a46 (diff) | |
| download | samba-2d6e5e160b9fd1a21bbbe699f6786c570daa0467.tar.gz samba-2d6e5e160b9fd1a21bbbe699f6786c570daa0467.tar.bz2 samba-2d6e5e160b9fd1a21bbbe699f6786c570daa0467.zip | |
s3: use push_reg_multi_sz().
Guenther
Diffstat (limited to 'source3/registry')
| -rw-r--r-- | source3/registry/reg_eventlog.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c index 4d395eddb1..dbeaa64bad 100644 --- a/source3/registry/reg_eventlog.c +++ b/source3/registry/reg_eventlog.c @@ -191,13 +191,12 @@ bool eventlog_add_source( const char *eventlog, const char *sourcename, need to add KEY of source to KEY_EVENTLOG/<eventlog>/<source> */ const char **elogs = lp_eventlog_list( ); - char **wrklist, **wp; + const char **wrklist, **wp; char *evtlogpath = NULL; struct regsubkey_ctr *subkeys; struct regval_ctr *values; struct regval_blob *rval; - uint16 *msz_wp; - int mbytes, ii; + int ii; bool already_in; int i; int numsources; @@ -287,8 +286,9 @@ bool eventlog_add_source( const char *eventlog, const char *sourcename, wp = wrklist; if ( !already_in ) { + DATA_BLOB blob; /* make a new list with an additional entry; copy values, add another */ - wp = TALLOC_ARRAY(ctx, char *, numsources + 2 ); + wp = TALLOC_ARRAY(ctx, const char *, numsources + 2 ); if ( !wp ) { DEBUG( 0, ( "talloc() failed \n" ) ); @@ -297,12 +297,14 @@ bool eventlog_add_source( const char *eventlog, const char *sourcename, memcpy( wp, wrklist, sizeof( char * ) * numsources ); *( wp + numsources ) = ( char * ) sourcename; *( wp + numsources + 1 ) = NULL; - mbytes = regval_build_multi_sz( wp, &msz_wp ); - dump_data( 1, ( uint8 * ) msz_wp, mbytes ); + if (!push_reg_multi_sz(ctx, &blob, wp)) { + return false; + } + dump_data( 1, blob.data, blob.length); regval_ctr_addvalue( values, "Sources", REG_MULTI_SZ, - ( char * ) msz_wp, mbytes ); + ( char * ) blob.data, blob.length); regdb_store_values( evtlogpath, values ); - TALLOC_FREE(msz_wp); + data_blob_free(&blob); } else { DEBUG( 3, ( "Source name [%s] found in existing list of sources\n", |