svn commit: samba r16650 - in branches/SAMBA_3_0/source/registry: .
jra at samba.org
jra at samba.org
Wed Jun 28 21:38:48 GMT 2006
Author: jra
Date: 2006-06-28 21:38:43 +0000 (Wed, 28 Jun 2006)
New Revision: 16650
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16650
Log:
Fix bug #3890 reported by jason at ncac.gwu.edu.
Jeremy.
Modified:
branches/SAMBA_3_0/source/registry/reg_perfcount.c
Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_perfcount.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_perfcount.c 2006-06-28 21:38:39 UTC (rev 16649)
+++ branches/SAMBA_3_0/source/registry/reg_perfcount.c 2006-06-28 21:38:43 UTC (rev 16650)
@@ -1031,10 +1031,10 @@
PERF_DATA_BLOCK *block,
char *object_ids)
{
- uint32 buffer_size = 0, last_counter;
+ uint32 buffer_size = 0;
const char *fname = counters_directory( NAMES_DB );
TDB_CONTEXT *names;
- int retval;
+ int retval = 0;
names = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDONLY, 0444);
@@ -1050,7 +1050,7 @@
return 0;
}
- last_counter = reg_perfcount_get_last_counter(base_index);
+ reg_perfcount_get_last_counter(base_index);
if(object_ids == NULL)
{
@@ -1066,6 +1066,10 @@
tdb_close(names);
+ if (retval == -1) {
+ return 0;
+ }
+
return buffer_size + block->HeaderLength;
}
More information about the samba-cvs
mailing list