svn commit: samba r16542 - in branches/SAMBA_3_0/source/rpc_server:
.
jra at samba.org
jra at samba.org
Tue Jun 27 00:42:26 GMT 2006
Author: jra
Date: 2006-06-27 00:42:24 +0000 (Tue, 27 Jun 2006)
New Revision: 16542
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16542
Log:
Fix #3863, reported by jason at ncac.gwu.edu
Jeremy.
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c
branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c 2006-06-27 00:15:00 UTC (rev 16541)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c 2006-06-27 00:42:24 UTC (rev 16542)
@@ -201,6 +201,12 @@
len = tdb_unpack( ret.dptr, ret.dsize, "ddddd", &reclen,
&tresv1, &trecnum, &timegen, &timewr );
+ if (len == -1) {
+ DEBUG( 10,("make_way_for_eventlogs: tdb_unpack failed.\n"));
+ tdb_unlock_bystring( the_tdb, EVT_NEXT_RECORD );
+ return False;
+ }
+
DEBUG( 8,
( "read record %d, record size is [%d], total so far [%d]\n",
i, reclen, nbytes ) );
Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c 2006-06-27 00:15:00 UTC (rev 16541)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c 2006-06-27 00:42:24 UTC (rev 16542)
@@ -289,12 +289,10 @@
int srecno;
int reclen;
int len;
- uint8 *rbuff;
pstring *wpsource, *wpcomputer, *wpsid, *wpstrs, *puserdata;
key.dsize = sizeof( int32 );
- rbuff = NULL;
srecno = recno;
key.dptr = ( char * ) &srecno;
More information about the samba-cvs
mailing list