r6795: Make some functions static and remove some unused ones.

(This used to be commit 46509eb89980bfe6dabd71264d570ea356ee5a22)

3 files changed, 6 insertions, 25 deletions

diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 7114aa2576..c0daefa99d 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -25,7 +25,7 @@
 #include "libcli/ldap/ldap.h"
 #include "lib/cmdline/popt_common.h"
 
-BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
+static BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
 {
 	NTSTATUS status;
 	BOOL ret = True;
@@ -38,7 +38,7 @@ BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const ch
 	return ret;
 }
 
-BOOL test_bind_sasl(struct ldap_connection *conn, struct cli_credentials *creds)
+static BOOL test_bind_sasl(struct ldap_connection *conn, struct cli_credentials *creds)
 {
 	NTSTATUS status;
 	BOOL ret = True;
@@ -53,7 +53,7 @@ BOOL test_bind_sasl(struct ldap_connection *conn, struct cli_credentials *creds)
 	return ret;
 }
 
-BOOL test_multibind(struct ldap_connection *conn, const char *userdn, const char *password)
+static BOOL test_multibind(struct ldap_connection *conn, const char *userdn, const char *password)
 {
 	BOOL ret = True;
 
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index de0649d17b..14353ff590 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -74,7 +74,7 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	
 }
 
-BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			   const char *machine_name,
 			   const char *plain_pass,
 			   struct creds_CredentialState **creds_out)
@@ -136,7 +136,7 @@ BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	return True;
 }
 
-BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			    uint32_t negotiate_flags,
 			    const char *machine_name,
 			    const char *plain_pass,
@@ -205,7 +205,7 @@ BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			    uint32_t negotiate_flags,
 			    const char *machine_name,
 			    const char *plain_pass,
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index c1e35cf3ef..e474c06c6b 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -291,25 +291,6 @@ BOOL split_unc_name(const char *unc, char **server, char **share)
 }
 
 /*
-  split a USER%PASS pair into username and password
-*/
-BOOL split_username(const char *pair, char **user, char **pass)
-{
-	char *p = strdup(pair);
-	if (!p) return False;
-
-	(*user) = p;
-
-	p = strchr(*user, '%');
-	if (!p) return False;
-
-	*p = 0;
-	(*pass) = p+1;
-	
-	return True;
-}
-
-/*
   set a attribute on a file
 */
 BOOL torture_set_file_attribute(struct smbcli_tree *tree, const char *fname, uint16_t attrib)