summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2001-06-22 11:23:34 +0000
committerEzra Peisach <epeisach@mit.edu>2001-06-22 11:23:34 +0000
commit9311115a94e808ce9946e09bace07cbdbdb62910 (patch)
treea4ec27e3198ad2b05622b82b301caea06d2c250f /src/lib
parent2d444e4a8fa850ad45d99114148d6468b0bacb4a (diff)
downloadkrb5-9311115a94e808ce9946e09bace07cbdbdb62910.tar.gz
krb5-9311115a94e808ce9946e09bace07cbdbdb62910.tar.xz
krb5-9311115a94e808ce9946e09bace07cbdbdb62910.zip
* accept_sec_context.c (krb5_gss_accept_sec_context): Do not
shadow local variable ptr. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13484 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/krb5/ChangeLog5
-rw-r--r--src/lib/gssapi/krb5/accept_sec_context.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 8a9c96b73..b35c5ff56 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-21 Ezra Peisach <epeisach@mit.edu>
+
+ * accept_sec_context.c (krb5_gss_accept_sec_context): Do not
+ shadow local variable ptr.
+
2001-06-22 Danilo Almeida <dalmeida@mit.edu>
* util_crypt.c (kg_encrypt, kg_decrypt): Use free() instead of
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index d7325d5e2..55845b903 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -653,7 +653,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
/* generate an AP_REP if necessary */
if (ctx->gss_flags & GSS_C_MUTUAL_FLAG) {
- unsigned char * ptr;
+ unsigned char * ptr3;
if ((code = krb5_mk_rep(context, auth_context, &ap_rep))) {
major_status = GSS_S_FAILURE;
goto fail;
@@ -673,11 +673,11 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
code = ENOMEM;
goto fail;
}
- ptr = token.value;
+ ptr3 = token.value;
g_make_token_header((gss_OID) mech_used, ap_rep.length,
- &ptr, KG_TOK_CTX_AP_REP);
+ &ptr3, KG_TOK_CTX_AP_REP);
- TWRITE_STR(ptr, ap_rep.data, ap_rep.length);
+ TWRITE_STR(ptr3, ap_rep.data, ap_rep.length);
ctx->established = 1;