Second part of fix for bug #5891 - smbd crashed when viewing the eventlog exported...

Jeremy.

diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index 612db1c4695a668129fd49df3905295b0412e222..4ff10390f74958cf4cf2ae70700945478a5d1d45 100644 (file)
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -433,7 +433,7 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
 
        if ( !info->etdb ) {
                DEBUG( 4, ( "No open tdb! (%s)\n", info->logname ) );
-               return False;
+               goto done;
        }
        /* set resonable defaults.  512Kb on size and 1 week on time */
 
@@ -447,7 +447,7 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
 
        path = talloc_asprintf(ctx, "%s/%s", KEY_EVENTLOG, elogname );
        if (!path) {
-               return false;
+               goto done;
        }
 
        wresult = reg_open_path(ctx, path, REG_KEY_READ, get_root_nt_token(),
@@ -457,14 +457,13 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
                DEBUG( 4,
                       ( "sync_eventlog_params: Failed to open key [%s] (%s)\n",
                         path, win_errstr( wresult ) ) );
-               return false;
+               goto done;
        }
 
        wresult = reg_queryvalue(key, key, "Retention", &value);
        if (!W_ERROR_IS_OK(wresult)) {
                DEBUG(4, ("Failed to query value \"Retention\": %s\n",
                          win_errstr(wresult)));
-               ret = false;
                goto done;
        }
        uiRetention = value->v.dword;
@@ -473,7 +472,6 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
        if (!W_ERROR_IS_OK(wresult)) {
                DEBUG(4, ("Failed to query value \"MaxSize\": %s\n",
                          win_errstr(wresult)));
-               ret = false;
                goto done;
        }
        uiMaxSize = value->v.dword;