diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-06 12:45:14 +1000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-11 22:52:37 +0200 |
| commit | 454b0b3f20ee8bdf56a12930261391e06567169c (patch) | |
| tree | 164d017f86a2d8d4150a7bc69c6ece0ba7d3c145 /source3/include | |
| parent | d0a87f0098073b2b7c8b637eccbb9bd91aaa8a80 (diff) | |
| download | samba-454b0b3f20ee8bdf56a12930261391e06567169c.tar.gz samba-454b0b3f20ee8bdf56a12930261391e06567169c.tar.bz2 samba-454b0b3f20ee8bdf56a12930261391e06567169c.zip | |
s3:kerberos Return PAC_LOGON_INFO rather than the full PAC_DATA
All the callers just want the PAC_LOGON_INFO, so search for that in
ads_verify_ticket(), and don't bother the callers with the rest of the
PAC.
This change makes sense on it's own (removing boilerplate wrappers
that just confuse the code), but it also makes it much easier to
implement a matching ads_verify_ticket() function in Samba4 for the
s3compat proposal.
Andrew Bartlett
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index f883cd2b8c..0d0864e8f6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1732,7 +1732,6 @@ const char *ads_get_ldap_server_name(ADS_STRUCT *ads); /* The following definitions come from libads/authdata.c */ -struct PAC_LOGON_INFO *get_logon_info_from_pac(struct PAC_DATA *pac_data); NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx, const char *name, const char *pass, @@ -1744,19 +1743,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx, bool add_netbios_addr, time_t renewable_time, const char *impersonate_princ_s, - struct PAC_DATA **pac_ret); -NTSTATUS kerberos_return_info3_from_pac(TALLOC_CTX *mem_ctx, - const char *name, - const char *pass, - time_t time_offset, - time_t *expire_time, - time_t *renew_till_time, - const char *cache_name, - bool request_pac, - bool add_netbios_addr, - time_t renewable_time, - const char *impersonate_princ_s, - struct netr_SamInfo3 **info3); + struct PAC_LOGON_INFO **logon_info); /* The following definitions come from libads/cldap.c */ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx, @@ -1850,7 +1837,7 @@ NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx, time_t time_offset, const DATA_BLOB *ticket, char **principal, - struct PAC_DATA **pac_data, + struct PAC_LOGON_INFO **logon_info, DATA_BLOB *ap_rep, DATA_BLOB *session_key, bool use_replay_cache); |