diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:44:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:44:14 +0100 |
| commit | 18d80bdf1fc5a281358aef29324230698eb434d4 (patch) | |
| tree | e2515f11577052f42a227bc04541d572d7f2e1ff /source4/auth/kerberos | |
| parent | ac604330871504e88e4bcd37433bbf3717d97a88 (diff) | |
| parent | e15b35e3897e63b9e815a04101436439d4aebdef (diff) | |
| download | samba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.gz samba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.bz2 samba-18d80bdf1fc5a281358aef29324230698eb434d4.zip | |
Merge v4.0-test
(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)
Diffstat (limited to 'source4/auth/kerberos')
| -rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 70e2961d55..e905e3e704 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -101,10 +101,10 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx, * the library routines. The returned princ is placed in the talloc * system by means of a destructor (do *not* free). */ -krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, - struct cli_credentials *credentials, - struct smb_krb5_context *smb_krb5_context, - krb5_principal *princ) + krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, + struct cli_credentials *credentials, + struct smb_krb5_context *smb_krb5_context, + krb5_principal *princ) { krb5_error_code ret; const char *princ_string; |