aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Howard <lukeh@padl.com>2009-08-21 16:02:31 +0000
committerLuke Howard <lukeh@padl.com>2009-08-21 16:02:31 +0000
commitbc9a537f7627967b54f25f5837d118a25d8a1145 (patch)
tree70de4c53d4e0a31d4d4a08adad89817e241a46a1
parent34c8186571fd67690bdb5d4c38a89cbab5077172 (diff)
downloadkrb5-bc9a537f7627967b54f25f5837d118a25d8a1145.zip
krb5-bc9a537f7627967b54f25f5837d118a25d8a1145.tar.gz
krb5-bc9a537f7627967b54f25f5837d118a25d8a1145.tar.bz2
Invert order of input_cred_handle and impersonator_cred_handle
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/s4u@22560 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/gssapi/mechglue/g_acquire_cred_with_cred.c10
-rw-r--r--src/lib/gssapi/mechglue/g_acquire_cred_with_name.c8
-rw-r--r--src/lib/gssapi/mechglue/mglueP.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_cred.c
index 36c6549..673b24f 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred_with_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_cred.c
@@ -183,8 +183,8 @@ gss_acquire_cred_with_cred(OM_uint32 *minor_status,
/* for each requested mech attempt to obtain a credential */
for (i = 0; i < mechs->count; i++) {
major = gss_add_cred_with_cred(minor_status,
- impersonator_cred_handle,
(gss_cred_id_t)creds,
+ impersonator_cred_handle,
subject_cred_handle,
&mechs->elements[i],
cred_usage, time_req, time_req, NULL,
@@ -248,9 +248,9 @@ gss_acquire_cred_with_cred(OM_uint32 *minor_status,
static OM_uint32
val_add_cred_with_cred_args(
OM_uint32 *minor_status,
- gss_cred_id_t impersonator_cred_handle,
gss_cred_id_t input_cred_handle,
- gss_cred_id_t subject_cred_handle,
+ const gss_cred_id_t impersonator_cred_handle,
+ const gss_cred_id_t subject_cred_handle,
gss_OID desired_mech,
gss_cred_usage_t cred_usage,
OM_uint32 initiator_time_req,
@@ -310,8 +310,8 @@ val_add_cred_with_cred_args(
/* V2 KRB5_CALLCONV */
OM_uint32 KRB5_CALLCONV
gss_add_cred_with_cred(OM_uint32 *minor_status,
- const gss_cred_id_t impersonator_cred_handle,
gss_cred_id_t input_cred_handle,
+ const gss_cred_id_t impersonator_cred_handle,
const gss_cred_id_t subject_cred_handle,
const gss_OID desired_mech,
gss_cred_usage_t cred_usage,
@@ -333,8 +333,8 @@ gss_add_cred_with_cred(OM_uint32 *minor_status,
gss_cred_id_t * new_cred_array = NULL;
status = val_add_cred_with_cred_args(minor_status,
- impersonator_cred_handle,
input_cred_handle,
+ impersonator_cred_handle,
subject_cred_handle,
desired_mech,
cred_usage,
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_name.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_name.c
index 80e3243..cdffad1 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred_with_name.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_name.c
@@ -183,8 +183,8 @@ gss_acquire_cred_with_name(OM_uint32 *minor_status,
/* for each requested mech attempt to obtain a credential */
for (i = 0; i < mechs->count; i++) {
major = gss_add_cred_with_name(minor_status,
- impersonator_cred_handle,
(gss_cred_id_t)creds,
+ impersonator_cred_handle,
desired_name,
&mechs->elements[i],
cred_usage, time_req, time_req, NULL,
@@ -248,8 +248,8 @@ gss_acquire_cred_with_name(OM_uint32 *minor_status,
static OM_uint32
val_add_cred_with_name_args(
OM_uint32 *minor_status,
- gss_cred_id_t impersonator_cred_handle,
gss_cred_id_t input_cred_handle,
+ const gss_cred_id_t impersonator_cred_handle,
gss_name_t desired_name,
gss_OID desired_mech,
gss_cred_usage_t cred_usage,
@@ -310,8 +310,8 @@ val_add_cred_with_name_args(
/* V2 KRB5_CALLCONV */
OM_uint32 KRB5_CALLCONV
gss_add_cred_with_name(OM_uint32 *minor_status,
+ gss_cred_id_t input_cred_handle,
const gss_cred_id_t impersonator_cred_handle,
- const gss_cred_id_t input_cred_handle,
const gss_name_t desired_name,
const gss_OID desired_mech,
gss_cred_usage_t cred_usage,
@@ -335,8 +335,8 @@ gss_add_cred_with_name(OM_uint32 *minor_status,
gss_cred_id_t * new_cred_array = NULL;
status = val_add_cred_with_name_args(minor_status,
- impersonator_cred_handle,
input_cred_handle,
+ impersonator_cred_handle,
desired_name,
desired_mech,
cred_usage,
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 90b58c4..f22c605 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -491,8 +491,8 @@ typedef struct gss_config {
OM_uint32 (*gss_add_cred_with_name)
(
OM_uint32 *, /* minor_status */
- const gss_cred_id_t, /* impersonator_cred_handle */
gss_cred_id_t, /* input_cred_handle */
+ const gss_cred_id_t, /* impersonator_cred_handle */
const gss_name_t, /* desired_name */
const gss_OID, /* desired_mech */
gss_cred_usage_t, /* cred_usage */
@@ -520,8 +520,8 @@ typedef struct gss_config {
OM_uint32 (*gss_add_cred_with_cred)
(
OM_uint32 *, /* minor_status */
- const gss_cred_id_t, /* impersonator_cred_handle */
gss_cred_id_t, /* input_cred_handle */
+ const gss_cred_id_t, /* impersonator_cred_handle */
const gss_cred_id_t, /* subject_cred_handle */
const gss_OID, /* desired_mech */
gss_cred_usage_t, /* cred_usage */