diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 00:12:03 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:58 +0100 |
| commit | fc2f06d31b6b52c5cbd83f34a34e5107649a5134 (patch) | |
| tree | 5ecd763c0af159cfab5f5e0654aed621857f4361 /source4/auth | |
| parent | 785928dcecf12c9cf2250ff4e9868232d4faa88c (diff) | |
| download | samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.tar.gz samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.tar.bz2 samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.zip | |
r26274: Some syntax fixes, remove more global_loadparm instances.
(This used to be commit 3809113d86dbd35b906356a05bb481a1e2bfe4b7)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/credentials/credentials.c | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 6 |
2 files changed, 5 insertions, 3 deletions
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; } |