mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
handle incomplete load files
change default timelimit to 600 secs (This used to be commit c5c75a6adab10e35584dca760586fda333ca5308)
This commit is contained in:
parent
2d9a8bf0c9
commit
dda01cea55
@ -21,8 +21,8 @@
|
||||
#include "includes.h"
|
||||
|
||||
int nbench_line_count = 0;
|
||||
static int timelimit = 300;
|
||||
static const char *loadfile;
|
||||
static int timelimit = 600;
|
||||
static char *loadfile;
|
||||
|
||||
#define ival(s) strtol(s, NULL, 0)
|
||||
|
||||
@ -188,5 +188,3 @@ BOOL torture_nbench(int dummy)
|
||||
1.0e-6 * nbio_total() / t);
|
||||
return correct;
|
||||
}
|
||||
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#define MAX_FILES 1000
|
||||
#define MAX_FILES 100
|
||||
|
||||
extern int nbench_line_count;
|
||||
static int nbio_id;
|
||||
@ -557,6 +557,10 @@ void nb_deltree(const char *dname)
|
||||
{
|
||||
int total_deleted;
|
||||
|
||||
smb_raw_exit(c->session);
|
||||
|
||||
ZERO_STRUCT(ftable);
|
||||
|
||||
total_deleted = cli_deltree(c->tree, dname);
|
||||
|
||||
if (total_deleted == -1) {
|
||||
@ -570,7 +574,6 @@ void nb_deltree(const char *dname)
|
||||
void nb_cleanup(const char *cname)
|
||||
{
|
||||
char *dname = NULL;
|
||||
smb_raw_exit(c->session);
|
||||
asprintf(&dname, "\\clients\\%s", cname);
|
||||
nb_deltree(dname);
|
||||
free(dname);
|
||||
|
Loading…
x
Reference in New Issue
Block a user