diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-23 16:25:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:57 -0500 |
| commit | f0c650a38286c07b9f3e83139c15bfbadc70ad5f (patch) | |
| tree | 2c63cd42bf12e46c94628a82a40b19db47fd0aae /source3/registry/reg_eventlog.c | |
| parent | e2404c81295fe3468c9b635b549f1b16f5c5f323 (diff) | |
| download | samba-f0c650a38286c07b9f3e83139c15bfbadc70ad5f.tar.gz samba-f0c650a38286c07b9f3e83139c15bfbadc70ad5f.tar.bz2 samba-f0c650a38286c07b9f3e83139c15bfbadc70ad5f.zip | |
r6942: * merging the registry changes back to the 3.0 tree
* removing the testprns tool
(This used to be commit 81ffb0dbbbd244623507880c323a3c37e2b8dc4d)
Diffstat (limited to 'source3/registry/reg_eventlog.c')
| -rw-r--r-- | source3/registry/reg_eventlog.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c index ccac7a190e..50e4995b9e 100644 --- a/source3/registry/reg_eventlog.c +++ b/source3/registry/reg_eventlog.c @@ -1,6 +1,6 @@ /* * Unix SMB/CIFS implementation. - * RPC Pipe client / server routines + * Virtual Windows Registry Layer * Copyright (C) Marcin Krzysztof Porwit 2005. * * This program is free software; you can redistribute it and/or modify @@ -186,7 +186,7 @@ static char* trim_eventlog_reg_path( char *path ) Enumerate registry subkey names given a registry path. Caller is responsible for freeing memory to **subkeys *********************************************************************/ -int eventlog_subkey_info( char *key, REGSUBKEY_CTR *subkey_ctr ) +static int eventlog_subkey_info( char *key, REGSUBKEY_CTR *subkey_ctr ) { char *path; BOOL top_level = False; @@ -202,10 +202,14 @@ int eventlog_subkey_info( char *key, REGSUBKEY_CTR *subkey_ctr ) if ( !path ) top_level = True; - evtlog_list = lp_eventlog_list(); num_subkeys = 0; + if ( !(evtlog_list = lp_eventlog_list()) ) { + SAFE_FREE(path); + return num_subkeys; + } + - if ( top_level ) + if ( top_level ) { /* todo - get the eventlog subkey values from the smb.conf file for ( num_subkeys=0; num_subkeys<MAX_TOP_LEVEL_KEYS; num_subkeys++ ) @@ -247,7 +251,7 @@ int eventlog_subkey_info( char *key, REGSUBKEY_CTR *subkey_ctr ) Caller is responsible for freeing memory *********************************************************************/ -int eventlog_value_info( char *key, REGVAL_CTR *val ) +static int eventlog_value_info( char *key, REGVAL_CTR *val ) { char *path; BOOL top_level = False; @@ -276,7 +280,7 @@ int eventlog_value_info( char *key, REGVAL_CTR *val ) people storing eventlog information directly via registry calls (for now at least) *********************************************************************/ -BOOL eventlog_store_subkey( char *key, REGSUBKEY_CTR *subkeys ) +static BOOL eventlog_store_subkey( char *key, REGSUBKEY_CTR *subkeys ) { return False; } @@ -286,7 +290,7 @@ BOOL eventlog_store_subkey( char *key, REGSUBKEY_CTR *subkeys ) people storing eventlog information directly via registry calls (for now at least) *********************************************************************/ -BOOL eventlog_store_value( char *key, REGVAL_CTR *val ) +static BOOL eventlog_store_value( char *key, REGVAL_CTR *val ) { return False; } |