diff options
| author | Jeremy Allison <jra@samba.org> | 2007-06-22 19:33:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:33 -0500 |
| commit | d1d2157153d7a4b3e7918bcc91c50445bf9a6771 (patch) | |
| tree | da96ed4886fe1d3698cf40b0f6293a9ee41092f9 /source3 | |
| parent | ed961d66b242c9f3a32c0b8cbb765771f8c30c00 (diff) | |
| download | samba-d1d2157153d7a4b3e7918bcc91c50445bf9a6771.tar.gz samba-d1d2157153d7a4b3e7918bcc91c50445bf9a6771.tar.bz2 samba-d1d2157153d7a4b3e7918bcc91c50445bf9a6771.zip | |
r23591: Fix bug #4725. Don't crash when no eventlogs specified. Needs
merging for 3.0.25b.
Jeremy.
(This used to be commit ae239fec6faa79018c818506b391b829ccd685f8)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/registry/reg_eventlog.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_eventlog_nt.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c index d0da12637a..b70b79f1e3 100644 --- a/source3/registry/reg_eventlog.c +++ b/source3/registry/reg_eventlog.c @@ -194,6 +194,10 @@ BOOL eventlog_add_source( const char *eventlog, const char *sourcename, int i; int numsources; + if (!elogs) { + return False; + } + for ( i = 0; elogs[i]; i++ ) { if ( strequal( elogs[i], eventlog ) ) break; diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index 85990055dd..c8be6a9b34 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/source3/rpc_server/srv_eventlog_nt.c @@ -123,6 +123,10 @@ static BOOL elog_validate_logname( const char *name ) int i; const char **elogs = lp_eventlog_list(); + if (!elogs) { + return False; + } + for ( i=0; elogs[i]; i++ ) { if ( strequal( name, elogs[i] ) ) return True; |