diff --git a/source3/include/proto.h b/source3/include/proto.h
index e0d70a873c0..6ec6f7e617e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -501,7 +501,6 @@ void E_old_pw_hash( unsigned char *p14, unsigned char *in, unsigned char *out);
 void cred_hash1(unsigned char *out,unsigned char *in,unsigned char *key);
 void cred_hash2(unsigned char *out,unsigned char *in,unsigned char *key);
 void cred_hash3(unsigned char *out,unsigned char *in,unsigned char *key, int forw);
-void NTLMSSPhash( unsigned char hash[258], unsigned char key[5]);
 void NTLMSSPcalc( unsigned char hash[258], unsigned char *data, int len);
 void SamOEMhash( unsigned char *data, unsigned char *key, int val);
 
diff --git a/source3/utils/rpctorture.c b/source3/utils/rpctorture.c
index 118be4d5983..50030bcadca 100644
--- a/source3/utils/rpctorture.c
+++ b/source3/utils/rpctorture.c
@@ -99,6 +99,7 @@ static void rpcclient_stop(void)
 ****************************************************************************/
 void run_enums_test(int num_ops, struct client_info *cli_info, struct cli_state *cli)
 {
+	pstring cmd;
 	int i;
 
 	/* establish connections.  nothing to stop these being re-established. */
@@ -114,9 +115,22 @@ void run_enums_test(int num_ops, struct client_info *cli_info, struct cli_state
 	
 	for (i = 0; i < num_ops; i++)
 	{
+		set_first_token("");
 		cmd_srv_enum_sess(cli_info);
+		set_first_token("");
 		cmd_srv_enum_shares(cli_info);
+		set_first_token("");
 		cmd_srv_enum_files(cli_info);
+
+		if (password[0] != 0)
+		{
+			slprintf(cmd, sizeof(cmd)-1, "1");
+			set_first_token(cmd);
+		}
+		else
+		{
+			set_first_token("");
+		}
 		cmd_srv_enum_conn(cli_info);
 	}