diff options
| author | Jeremy Allison <jra@samba.org> | 2010-07-20 11:14:49 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-07-20 11:14:49 -0700 |
| commit | 7d17bfcf51880c84a2f2173c941f2955d045f5c5 (patch) | |
| tree | 07d5cdec615b63be424a821d809f7f8db1e2036f | |
| parent | 8a882b645c7913a12776065d239cd97d0628108c (diff) | |
| download | samba-7d17bfcf51880c84a2f2173c941f2955d045f5c5.tar.gz samba-7d17bfcf51880c84a2f2173c941f2955d045f5c5.tar.bz2 samba-7d17bfcf51880c84a2f2173c941f2955d045f5c5.zip | |
Rename spnego_gen_negTokenTarg() -> spnego_gen_krb5_negTokenInit()
as this correctly describes what this function does.
Jeremy.
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/libads/sasl.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/cliconnect.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/clispnego.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4d877fb358..d154d34679 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2806,7 +2806,7 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob, DATA_BLOB gen_negTokenTarg(const char *OIDs[], DATA_BLOB blob); DATA_BLOB spnego_gen_krb5_wrap(const DATA_BLOB ticket, const uint8 tok_id[2]); bool spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8 tok_id[2]); -int spnego_gen_negTokenTarg(const char *principal, int time_offset, +int spnego_gen_krb5_negTokenInit(const char *principal, int time_offset, DATA_BLOB *targ, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, time_t *expire_time); diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 277231b65c..5cd523155a 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -705,7 +705,7 @@ static ADS_STATUS ads_sasl_spnego_rawkrb5_bind(ADS_STRUCT *ads, const char *prin return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); } - rc = spnego_gen_negTokenTarg(principal, ads->auth.time_offset, &blob, &session_key, 0, + rc = spnego_gen_krb5_negTokenInit(principal, ads->auth.time_offset, &blob, &session_key, 0, &ads->auth.tgs_expire); if (rc) { diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index a8e359dab1..dc3f236609 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -854,14 +854,14 @@ static struct tevent_req *cli_session_setup_kerberos_send( cli_temp_set_signing(cli); /* - * Ok, this is cheated: spnego_gen_negTokenTarg can block if + * Ok, this is cheating: spnego_gen_krb5_negTokenInit can block if * we have to acquire a ticket. To be fixed later :-) */ - rc = spnego_gen_negTokenTarg(principal, 0, &state->negTokenTarg, + rc = spnego_gen_krb5_negTokenInit(principal, 0, &state->negTokenTarg, &state->session_key_krb5, 0, NULL); if (rc) { DEBUG(1, ("cli_session_setup_kerberos: " - "spnego_gen_negTokenTarg failed: %s\n", + "spnego_gen_krb5_negTokenInit failed: %s\n", error_message(rc))); state->ads_status = ADS_ERROR_KRB5(rc); tevent_req_nterror(req, NT_STATUS_UNSUCCESSFUL); diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c index 99d5b88512..cd09a3836f 100644 --- a/source3/libsmb/clispnego.c +++ b/source3/libsmb/clispnego.c @@ -287,10 +287,10 @@ bool spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8 tok_id[2]) /* - generate a SPNEGO negTokenTarg packet, ready for a EXTENDED_SECURITY - kerberos session setup + generate a SPNEGO krb5 negTokenInit packet, ready for a EXTENDED_SECURITY + kerberos session setup */ -int spnego_gen_negTokenTarg(const char *principal, int time_offset, +int spnego_gen_krb5_negTokenInit(const char *principal, int time_offset, DATA_BLOB *targ, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, time_t *expire_time) |