svn commit: samba r16543 - in trunk/source/rpc_server: .

[jra]

Author: jra
Date: 2006-06-27 00:42:33 +0000 (Tue, 27 Jun 2006)
New Revision: 16543

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16543

Log:
Fix #3863, reported by [EMAIL PROTECTED]
Jeremy.

Modified:
   trunk/source/rpc_server/srv_eventlog_lib.c
   trunk/source/rpc_server/srv_eventlog_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_eventlog_lib.c
===================================================================
--- trunk/source/rpc_server/srv_eventlog_lib.c  2006-06-27 00:42:24 UTC (rev 
16542)
+++ trunk/source/rpc_server/srv_eventlog_lib.c  2006-06-27 00:42:33 UTC (rev 
16543)
@@ -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: trunk/source/rpc_server/srv_eventlog_nt.c
===================================================================
--- trunk/source/rpc_server/srv_eventlog_nt.c   2006-06-27 00:42:24 UTC (rev 
16542)
+++ trunk/source/rpc_server/srv_eventlog_nt.c   2006-06-27 00:42:33 UTC (rev 
16543)
@@ -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;