Merge from HEAD to define variable port_to_use. Needed to compile.

(This used to be commit b522892215b12d3f919cb4d1fb99721981710f2a)

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 953db6056c37d8f33f8023dd5f519325acfbe11e..a4dfac849003043bdbdf9ad6b3c22d798e7a537e 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -26,6 +26,7 @@ static fstring host, workgroup, share, password, username, myname;
 static int max_protocol = PROTOCOL_NT1;
 static const char *sockops="TCP_NODELAY";
 static int nprocs=1;
+static int port_to_use=0;
 int torture_numops=100;
 static int procnum; /* records process count number when forking */
 static struct cli_state current_cli;