[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  b6100fa... s3-eventlog: make sure _eventlog_OpenEventLogW fails when we cannot open the registry key.
      from  c4d5cbb... s3: Fix some valgrind errors

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b6100fa72f2f7e42f49538117846c973e2154b00
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jun 28 12:51:28 2010 +0200

    s3-eventlog: make sure _eventlog_OpenEventLogW fails when we cannot open the registry key.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_eventlog_nt.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index 2d4c597..701dcf0 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -398,7 +398,10 @@ NTSTATUS _eventlog_OpenEventLogW(pipes_struct *p,
 
 	DEBUG(10,("_eventlog_OpenEventLogW: Size [%d]\n", elog_size( info )));
 
-	sync_eventlog_params( info );
+	if (!sync_eventlog_params(info)) {
+		elog_close(p, r->out.handle);
+		return NT_STATUS_EVENTLOG_FILE_CORRUPT;
+	}
 	prune_eventlog( ELOG_TDB_CTX(info->etdb) );
 
 	return NT_STATUS_OK;


-- 
Samba Shared Repository