diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 11:04:42 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 11:04:42 +1100 |
| commit | aaf62085dd425755d091c5f5270f36e4f7c9e3c0 (patch) | |
| tree | 1b07473bc0eca2d9e50e01ddc866689885381364 /source4/heimdal | |
| parent | b1b37e3776c6e6e20f42140a907e296b65cc0c62 (diff) | |
| parent | 131111f16615177d4e7f999d740a94ca6b07e01e (diff) | |
| download | samba-aaf62085dd425755d091c5f5270f36e4f7c9e3c0.tar.gz samba-aaf62085dd425755d091c5f5270f36e4f7c9e3c0.tar.bz2 samba-aaf62085dd425755d091c5f5270f36e4f7c9e3c0.zip | |
Merge branch 'v4-0-logon' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 8252b51850f108aa8f43ec25c752a411c32f9764)
Diffstat (limited to 'source4/heimdal')
| -rw-r--r-- | source4/heimdal/kdc/kdc-private.h | 3 | ||||
| -rw-r--r-- | source4/heimdal/kdc/kerberos5.c | 2 | ||||
| -rw-r--r-- | source4/heimdal/kdc/windc.c | 5 | ||||
| -rw-r--r-- | source4/heimdal/kdc/windc_plugin.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/source4/heimdal/kdc/kdc-private.h b/source4/heimdal/kdc/kdc-private.h index 030be9ae58..4052e9b509 100644 --- a/source4/heimdal/kdc/kdc-private.h +++ b/source4/heimdal/kdc/kdc-private.h @@ -281,6 +281,7 @@ krb5_error_code _kdc_windc_client_access ( krb5_context /*context*/, struct hdb_entry_ex */*client*/, - KDC_REQ */*req*/); + KDC_REQ */*req*/, + krb5_data */*e_data*/); #endif /* __kdc_private_h__ */ diff --git a/source4/heimdal/kdc/kerberos5.c b/source4/heimdal/kdc/kerberos5.c index bc600a5319..f1dea6499d 100644 --- a/source4/heimdal/kdc/kerberos5.c +++ b/source4/heimdal/kdc/kerberos5.c @@ -1050,7 +1050,7 @@ _kdc_as_rep(krb5_context context, goto out; } - ret = _kdc_windc_client_access(context, client, req); + ret = _kdc_windc_client_access(context, client, req, &e_data); if(ret) goto out; diff --git a/source4/heimdal/kdc/windc.c b/source4/heimdal/kdc/windc.c index 395ab73432..85e4d7f725 100644 --- a/source4/heimdal/kdc/windc.c +++ b/source4/heimdal/kdc/windc.c @@ -101,9 +101,10 @@ _kdc_pac_verify(krb5_context context, krb5_error_code _kdc_windc_client_access(krb5_context context, struct hdb_entry_ex *client, - KDC_REQ *req) + KDC_REQ *req, + krb5_data *e_data) { if (windcft == NULL) return 0; - return (windcft->client_access)(windcctx, context, client, req); + return (windcft->client_access)(windcctx, context, client, req, e_data); } diff --git a/source4/heimdal/kdc/windc_plugin.h b/source4/heimdal/kdc/windc_plugin.h index ec480cf950..3ae0c94681 100644 --- a/source4/heimdal/kdc/windc_plugin.h +++ b/source4/heimdal/kdc/windc_plugin.h @@ -64,7 +64,7 @@ typedef krb5_error_code typedef krb5_error_code (*krb5plugin_windc_client_access)( - void *, krb5_context, struct hdb_entry_ex *, KDC_REQ *); + void *, krb5_context, struct hdb_entry_ex *, KDC_REQ *, krb5_data *); #define KRB5_WINDC_PLUGING_MINOR 2 |