krbconfig.c, Makefile.in: Removed krbconfig.c; it contained global

	variables which are no longer used.

recvauth.c: Removed the global extern of krb5_kdc_default_options,
	which wasn't being used anyway.

mk_req.c (krb5_mk_req): Replace use of krb5_kdc_default_options with
	context->kdc_default_options.

gc_frm_kdc.c: Remove the global extern of krb5_kdc_req_sumtype, which
	wasn't being used anymore anyway.

send_tgs.c (krb5_send_tgs_basic): Remove use of the global variable
	krb5_kdc_req_sumtype, and use the kdc_req_sumtype in the context
	structure instead.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b512c1c737be2eb64612d1d1e85729f83a978726..cb5bf1f6b692fb6fb528e00f22b018bc1faedd60 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,21 @@
 Wed Jan 10 21:01:36 1996  Theodore Y. Ts'o  <tytso@dcl>
 
+       * krbconfig.c, Makefile.in: Removed krbconfig.c; it contained
+               global variables which are no longer used.
+
+       * recvauth.c: Removed the global extern of
+               krb5_kdc_default_options, which wasn't being used anyway.
+
+       * mk_req.c (krb5_mk_req): Replace use of krb5_kdc_default_options
+               with context->kdc_default_options.
+
+       * gc_frm_kdc.c: Remove the global extern of krb5_kdc_req_sumtype,
+               which wasn't being used anymore anyway.
+
+       * send_tgs.c (krb5_send_tgs_basic): Remove use of the global
+               variable krb5_kdc_req_sumtype, and use the kdc_req_sumtype
+               in the context structure instead.
+
        * walk_rtree.c (krb5_walk_realm_tree): Applied patch submitted by
                Doug Engbert, so that the configurable authentication
                patch takes into account the null entry at the end of the

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index e511bbca4beb5be6f1bf06166a35c18130c10008..62e621a4bf51960e3d3c7c8c6eabf8ca04685a47 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -42,7 +42,6 @@ OBJS= addr_comp.$(OBJEXT)     \
        in_tkt_sky.$(OBJEXT)    \
        init_ctx.$(OBJEXT)      \
        kdc_rep_dc.$(OBJEXT)    \
-       krbconfig.$(OBJEXT)     \
        mk_cred.$(OBJEXT)       \
        mk_error.$(OBJEXT)      \
        mk_priv.$(OBJEXT)       \
@@ -115,7 +114,6 @@ SRCS=       $(srcdir)/addr_comp.c   \
        $(srcdir)/in_tkt_sky.c  \
        $(srcdir)/init_ctx.c    \
        $(srcdir)/kdc_rep_dc.c  \
-       $(srcdir)/krbconfig.c   \
        $(srcdir)/mk_cred.c     \
        $(srcdir)/mk_error.c    \
        $(srcdir)/mk_priv.c     \

diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c
index 597582334bd3cc4cc61ad12d745b58a8652f3132..2a157aa288f8ba986fd569161a28a3bbf2a4d4aa 100644 (file)
--- a/src/lib/krb5/krb/gc_frm_kdc.c
+++ b/src/lib/krb5/krb/gc_frm_kdc.c
@@ -55,8 +55,6 @@
  * returns errors, system errors.
  */
 
-extern krb5_cksumtype krb5_kdc_req_sumtype;
-
 /* helper macro: convert flags to necessary KDC options */
 
 #define FLAGS2OPTS(flags) (flags & KDC_TKT_COMMON_MASK)

diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index cb8a06fb43ef9f1424de9041e4e7a5dfb309e3d7..8a1e3849bfb1c3e7e221dabada2f4d24dfb662d7 100644 (file)
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -46,8 +46,6 @@
  returns system errors
 */
 
-extern krb5_flags krb5_kdc_default_options;
-
 krb5_error_code
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
              ccache, outbuf)
@@ -78,7 +76,7 @@ krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
     if ((retval = krb5_cc_get_principal(context, ccache, &creds.client)))
        goto cleanup_creds;
 
-    if ((retval = krb5_get_credentials(context, krb5_kdc_default_options,
+    if ((retval = krb5_get_credentials(context, context->kdc_default_options,
                                       ccache, &creds, &credsp)))
        goto cleanup_creds;
 

diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index d88c20cb59cd81eb586eaf5442326ccea40ee7ec..d6d6772deebd1f3241e6fa6c2e9ca3fabf9706da 100644 (file)
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -32,8 +32,6 @@
 #include <stdio.h>
 #include <string.h>
 
-extern krb5_flags      krb5_kdc_default_options;
-
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
 krb5_error_code

diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index 5a26092f7538796d19ea78adf3a4facd2110ca06..def5db1e26dc2b5df91caa69c012bcd2d2a2a488 100644 (file)
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -44,8 +44,6 @@
 
  returns system errors
  */
-extern krb5_cksumtype krb5_kdc_req_sumtype;
-
 static krb5_error_code 
 krb5_send_tgs_basic(context, in_data, in_cred, outbuf)
     krb5_context          context;
@@ -63,10 +61,11 @@ krb5_send_tgs_basic(context, in_data, in_cred, outbuf)
 
     /* Generate checksum */
     if ((checksum.contents = (krb5_octet *)
-        malloc(krb5_checksum_size(context, krb5_kdc_req_sumtype))) == NULL) 
+        malloc(krb5_checksum_size(context,
+                                  context->kdc_req_sumtype))) == NULL) 
         return(ENOMEM);
 
-    if ((retval = krb5_calculate_checksum(context, krb5_kdc_req_sumtype,
+    if ((retval = krb5_calculate_checksum(context, context->kdc_req_sumtype,
                                          in_data->data, in_data->length,
                                          (krb5_pointer) in_cred->keyblock.contents,
                                          in_cred->keyblock.length,

diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index d2260a8f54e29853214acef8828d1ed50ab15959..45393d4572ecd9cd18258f5a9251ecf8b3ba474c 100644 (file)
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -35,8 +35,6 @@
 
 #define WORKING_RCACHE
 
-extern krb5_flags      krb5_kdc_default_options;
-
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
 krb5_error_code
@@ -62,7 +60,6 @@ krb5_sendauth(context, auth_context,
        krb5_ap_rep_enc_part   ** rep_result;
        krb5_creds             ** out_creds;
 {
-       krb5_flags              kdc_options = krb5_kdc_default_options;
        krb5_octet              result;
        krb5_creds              creds;
        krb5_creds *            credsp = NULL;
@@ -143,7 +140,8 @@ krb5_sendauth(context, auth_context,
                in_creds = &creds;
        }
        if (!in_creds->ticket.length) {
-           if ((retval = krb5_get_credentials(context, kdc_options,
+           if ((retval = krb5_get_credentials(context,
+                                              context->kdc_default_options,
                                               use_ccache, in_creds, &credsp)))
                    goto error_return;
            credspout = credsp;