git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd77560
)
Revert " auth/credentials/credentials_krb5.c change"
author
Stefan Metzmacher
<metze@samba.org>
Wed, 1 Apr 2020 18:35:55 +0000
(20:35 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Fri, 7 Aug 2020 11:08:43 +0000
(13:08 +0200)
This reverts commit
147d2e352cc34e97e9ac6e22a2e0941b194ff15e
.
auth/credentials/credentials_krb5.c
patch
|
blob
|
history
diff --git
a/auth/credentials/credentials_krb5.c
b/auth/credentials/credentials_krb5.c
index e42bbc1100e020e344f8daad67bdd5b2346378e9..266a17aaa0cb80bc0facd38d991da8dfaee10601 100644
(file)
--- a/
auth/credentials/credentials_krb5.c
+++ b/
auth/credentials/credentials_krb5.c
@@
-71,7
+71,7
@@
static uint32_t smb_gss_krb5_copy_ccache(uint32_t *min_stat,
gss_cred_id_t cred,
struct ccache_container *ccc)
{
-#if
0 //
ndef SAMBA4_USES_HEIMDAL /* MIT 1.10 */
+#ifndef SAMBA4_USES_HEIMDAL /* MIT 1.10 */
krb5_context context = ccc->smb_krb5_context->krb5_context;
krb5_ccache dummy_ccache = NULL;
krb5_creds creds = {0};
@@
-214,7
+214,6
@@
static uint32_t smb_gss_krb5_copy_ccache(uint32_t *min_stat,
krb5_free_cred_contents(context, &creds);
DBG_ERR("%s: \n", __location__);
- return code;
#endif /* SAMBA4_USES_HEIMDAL */
DBG_ERR("%s: \n", __location__);