r23591: Fix bug #4725. Don't crash when no eventlogs specified. Needs

merging for 3.0.25b.
Jeremy.

diff --git a/source/registry/reg_eventlog.c b/source/registry/reg_eventlog.c
index d0da12637a3e719b74064aa223ce1c01b4b9dc6a..b70b79f1e39a20adbc84fe1b965fc07f07f597d6 100644 (file)
--- a/source/registry/reg_eventlog.c
+++ b/source/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/source/rpc_server/srv_eventlog_nt.c b/source/rpc_server/srv_eventlog_nt.c
index 85990055dd795dd814335b132d1d33e6ce851ce0..c8be6a9b346786c73494a1c91e06afe4a4d38bcd 100644 (file)
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/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;