[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1711-gcb65319

[Gerald W. Carter]

The branch, v3-2-test has been updated
       via  cb6531965b2baab320123d4301ab851c6e22aa58 (commit)
       via  252c3130697d1b7fd34a5225d83cef4f32e663b2 (commit)
       via  77085f1a58666ac4314924d18c87d4add0553dba (commit)
      from  c1cdf6085329d55cf29ccc8c980fc853a03a695e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cb6531965b2baab320123d4301ab851c6e22aa58
Author: Gerald W. Carter <jerry at samba.org>
Date:   Tue Jan 29 15:08:37 2008 -0600

    Make make_way_for_eventlogs() static

commit 252c3130697d1b7fd34a5225d83cef4f32e663b2
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jan 20 16:46:46 2008 +0100

    Fix a memleak

commit 77085f1a58666ac4314924d18c87d4add0553dba
Author: Gerald W. Carter <jerry at samba.org>
Date:   Tue Jan 29 15:06:59 2008 -0600

    Fix a return value from sync_eventlog_params() (patch from Volker)

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

Summary of changes:
 source/rpc_server/srv_eventlog_lib.c |    8 ++------
 source/rpc_server/srv_eventlog_nt.c  |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_eventlog_lib.c b/source/rpc_server/srv_eventlog_lib.c
index 4e996ee..269e2f3 100644
--- a/source/rpc_server/srv_eventlog_lib.c
+++ b/source/rpc_server/srv_eventlog_lib.c
@@ -140,15 +140,14 @@ int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention )
  return True if we made enough room to accommodate needed bytes
 ********************************************************************/
 
-bool make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed,
-			     bool whack_by_date )
+static bool make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed,
+				    bool whack_by_date )
 {
 	int start_record, i, new_start;
 	int end_record;
 	int nbytes, reclen, len, Retention, MaxSize;
 	int tresv1, trecnum, timegen, timewr;
 	TDB_DATA key, ret;
-	TALLOC_CTX *mem_ctx = NULL;
 	time_t current_time, exp_time;
 
 	/* discard some eventlogs */
@@ -156,10 +155,7 @@ bool make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed,
 	/* read eventlogs from oldest_entry -- there can't be any discontinuity in recnos,
 	   although records not necessarily guaranteed to have successive times */
 	/* */
-	mem_ctx = talloc_init( "make_way_for_eventlogs" );	/* Homage to BPG */
 
-	if ( mem_ctx == NULL )
-		return False;	/* can't allocate memory indicates bigger problems */
 	/* lock */
 	tdb_lock_bystring_with_timeout( the_tdb, EVT_NEXT_RECORD, 1 );
 	/* read */
diff --git a/source/rpc_server/srv_eventlog_nt.c b/source/rpc_server/srv_eventlog_nt.c
index 0ea34e5..7af8219 100644
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/rpc_server/srv_eventlog_nt.c
@@ -486,7 +486,7 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
 
 done:
 	TALLOC_FREE(ctx);
-	return true;
+	return ret;
 }
 
 /********************************************************************


-- 
Samba Shared Repository