From fc2f06d31b6b52c5cbd83f34a34e5107649a5134 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Dec 2007 00:12:03 +0100 Subject: r26274: Some syntax fixes, remove more global_loadparm instances. (This used to be commit 3809113d86dbd35b906356a05bb481a1e2bfe4b7) --- source4/auth/credentials/credentials.c | 2 +- source4/auth/credentials/credentials_krb5.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c index 1889731781..f4530f4b3c 100644 --- a/source4/auth/credentials/credentials.c +++ b/source4/auth/credentials/credentials.c @@ -641,7 +641,7 @@ void cli_credentials_guess(struct cli_credentials *cred, char *p; if (lp_ctx != NULL) { - cli_credentials_set_conf(cred, global_loadparm); + cli_credentials_set_conf(cred, lp_ctx); } if (getenv("LOGNAME")) { diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index b963b61f1f..fe71d98b43 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -199,7 +199,8 @@ int cli_credentials_set_ccache(struct cli_credentials *cred, } -static int cli_credentials_new_ccache(struct cli_credentials *cred, struct ccache_container **_ccc) +static int cli_credentials_new_ccache(struct cli_credentials *cred, + struct ccache_container **_ccc) { krb5_error_code ret; struct ccache_container *ccc = talloc(cred, struct ccache_container); @@ -466,7 +467,8 @@ int cli_credentials_get_keytab(struct cli_credentials *cred, return EINVAL; } - ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, + &smb_krb5_context); if (ret) { return ret; } -- cgit