From: Ezra Peisach <epeisach@mit.edu>
Date: Sat, 24 Feb 1996 17:07:25 +0000 (+0000)
Subject: 	* import_sec_context.c (krb5_gss_import_sec_context): Do not
X-Git-Tag: krb5-1.0-beta6~474
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30ee515b70608324f0e7840f77e1f12fb0244386;p=krb5.git

	* import_sec_context.c (krb5_gss_import_sec_context): Do not
		shadow parameter ctx.

	* inq_context.c (krb5_gss_inquire_context): Do not shadow
		parameter ctx.

The variable ctx was used both as an argument to the function (and put
into the variabel context) and declared as a local variable.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7521 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index be1bf9129..b26f6bc1b 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,5 +1,11 @@
 Sat Feb 24 11:45:05 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
+	* import_sec_context.c (krb5_gss_import_sec_context): Do not
+		shadow parameter ctx.
+
+	* inq_context.c (krb5_gss_inquire_context): Do not shadow
+		parameter ctx.
+
 	* rel_oid.c (krb5_gss_internal_release_oid): Change to match prototype.
 
 	* process_context_token.c (krb5_gss_process_context_token): Change
diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
index 8727fda7e..3f61f4624 100644
--- a/src/lib/gssapi/krb5/import_sec_context.c
+++ b/src/lib/gssapi/krb5/import_sec_context.c
@@ -28,14 +28,14 @@
 #include "gssapiP_krb5.h"
 
 OM_uint32
-krb5_gss_import_sec_context(ctx,
+krb5_gss_import_sec_context(ct,
 			    minor_status, interprocess_token, context_handle)
-    void		*ctx;
+    void		*ct;
     OM_uint32		*minor_status;
     gss_buffer_t	interprocess_token;
     gss_ctx_id_t	*context_handle;
 {
-    krb5_context	context = ctx;
+    krb5_context	context = ct;
     krb5_error_code	kret;
     OM_uint32		retval;
     krb5_context	ser_ctx;
diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c
index bd1ef7ee2..8ccd8fbb9 100644
--- a/src/lib/gssapi/krb5/inq_context.c
+++ b/src/lib/gssapi/krb5/inq_context.c
@@ -23,10 +23,10 @@
 #include "gssapiP_krb5.h"
 
 OM_uint32
-krb5_gss_inquire_context(ctx, minor_status, context_handle, initiator_name, 
+krb5_gss_inquire_context(ct, minor_status, context_handle, initiator_name, 
 			 acceptor_name, lifetime_rec, mech_type, ret_flags,
 			 locally_initiated, open)
-     void *ctx;
+     void *ct;
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      gss_name_t *initiator_name;
@@ -37,7 +37,7 @@ krb5_gss_inquire_context(ctx, minor_status, context_handle, initiator_name,
      int *locally_initiated;
      int *open;
 {
-   krb5_context context = ctx;
+   krb5_context context = ct;
    krb5_error_code code;
    krb5_gss_ctx_id_rec *ctx;
    krb5_principal init, accept;