r9728: A *major* update to the credentials system, to incorporate the

Kerberos CCACHE into the system.

This again allows the use of the system ccache when no username is
specified, and brings more code in common between gensec_krb5 and
gensec_gssapi.

It also has a side-effect that may (or may not) be expected: If there
is a ccache, even if it is not used (perhaps the remote server didn't
want kerberos), it will change the default username.

Andrew Bartlett
(This used to be commit 6202267f6ec1446d6bd11d1d37d05a977bc8d315)

3 files changed, 8 insertions, 8 deletions

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 14353ff590..10ac1cbba3 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -38,7 +38,7 @@ static BOOL test_LogonUasLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct netr_LogonUasLogon r;
 
 	r.in.server_name = NULL;
-	r.in.account_name = cli_credentials_get_username(cmdline_credentials),
+	r.in.account_name = cli_credentials_get_username(cmdline_credentials, mem_ctx);
 	r.in.workstation = TEST_MACHINE_NAME;
 
 	printf("Testing LogonUasLogon\n");
@@ -59,7 +59,7 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct netr_LogonUasLogoff r;
 
 	r.in.server_name = NULL;
-	r.in.account_name = cli_credentials_get_username(cmdline_credentials),
+	r.in.account_name = cli_credentials_get_username(cmdline_credentials, mem_ctx);
 	r.in.workstation = TEST_MACHINE_NAME;
 
 	printf("Testing LogonUasLogoff\n");
@@ -487,7 +487,7 @@ static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct netr_LogonSamLogon r;
 	struct netr_Authenticator auth, auth2;
 	struct netr_NetworkInfo ninfo;
-	const char *username = cli_credentials_get_username(cmdline_credentials);
+	const char *username = cli_credentials_get_username(cmdline_credentials, mem_ctx);
 	const char *password = cli_credentials_get_password(cmdline_credentials);
 	struct creds_CredentialState *creds;
 
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 607dbaec8a..42051795c8 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1366,13 +1366,13 @@ BOOL torture_rpc_samlogon(void)
 	} usercreds[] = {
 		{
 			cli_credentials_get_domain(cmdline_credentials),
-			cli_credentials_get_username(cmdline_credentials),
+			cli_credentials_get_username(cmdline_credentials, mem_ctx),
 			cli_credentials_get_password(cmdline_credentials),
 			True
 		},
 		{
 			cli_credentials_get_realm(cmdline_credentials),
-			cli_credentials_get_username(cmdline_credentials),
+			cli_credentials_get_username(cmdline_credentials, mem_ctx),
 			cli_credentials_get_password(cmdline_credentials),
 			True
 		},
@@ -1380,7 +1380,7 @@ BOOL torture_rpc_samlogon(void)
 			NULL,
 			talloc_asprintf(mem_ctx, 
 					"%s@%s", 
-					cli_credentials_get_username(cmdline_credentials),
+					cli_credentials_get_username(cmdline_credentials, mem_ctx),
 					cli_credentials_get_domain(cmdline_credentials)
 				),
 			cli_credentials_get_password(cmdline_credentials),
@@ -1390,7 +1390,7 @@ BOOL torture_rpc_samlogon(void)
 			NULL,
 			talloc_asprintf(mem_ctx, 
 					"%s@%s", 
-					cli_credentials_get_username(cmdline_credentials),
+					cli_credentials_get_username(cmdline_credentials, mem_ctx),
 					cli_credentials_get_realm(cmdline_credentials)
 				),
 			cli_credentials_get_password(cmdline_credentials),
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 580c6f57eb..3f02622e1c 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -92,7 +92,7 @@ static BOOL test_netlogon_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct netr_LogonSamLogon r;
 	struct netr_Authenticator auth, auth2;
 	struct netr_NetworkInfo ninfo;
-	const char *username = cli_credentials_get_username(cmdline_credentials);
+	const char *username = cli_credentials_get_username(cmdline_credentials, mem_ctx);
 	const char *password = cli_credentials_get_password(cmdline_credentials);
 	int i;
 	BOOL ret = True;