From: kouril <kouril>
Date: Thu, 7 Aug 2003 14:57:37 +0000 (+0000)
Subject: Removed useless code
X-Git-Tag: v5.0-rc1~16
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_kerb.git;a=commitdiff_plain;h=38412da10d6d184cc0257cb86ffba500c097aa3a

Removed useless code
---

diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
index 0119e1b..81d7d74 100644
--- a/src/mod_auth_kerb.c
+++ b/src/mod_auth_kerb.c
@@ -31,7 +31,6 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module;
 #define MK_TABLE_SET ap_table_set
 #define MK_TABLE_TYPE table
 #define MK_PSTRDUP ap_pstrdup
-#define MK_PROXY STD_PROXY
 #define MK_USER r->connection->user
 #define MK_AUTH_TYPE r->connection->ap_auth_type
 #define MK_ARRAY_HEADER array_header
@@ -41,7 +40,6 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module;
 #define MK_TABLE_SET apr_table_set
 #define MK_TABLE_TYPE apr_table_t
 #define MK_PSTRDUP apr_pstrdup
-#define MK_PROXY PROXYREQ_PROXY
 #define MK_USER r->user
 #define MK_AUTH_TYPE r->ap_auth_type
 #define MK_ARRAY_HEADER apr_array_header_t
@@ -512,7 +510,8 @@ int authenticate_user_krb5pwd(request_rec *r,
    }
 
    if (conf->krb_5_keytab)
-      setenv("KRB5_KTNAME", conf->krb_5_keytab, 1);
+      /* setenv("KRB5_KTNAME", conf->krb_5_keytab, 1); */
+      kcontext->default_keytab = conf->krb_5_keytab;
 
    realms = conf->krb_auth_realms;
    do {
@@ -949,42 +948,6 @@ int kerb_authenticate_user(request_rec *r)
 }
 
 
-#if 0
-int kerb_check_user_access(request_rec *r)
-{
-	register int x;
-	const char *t, *w;
-	const MK_ARRAY_HEADER *reqs_arr = ap_requires(r);
-	require_line *reqs;
-	kerb_auth_config *conf =
-		(kerb_auth_config *)ap_get_module_config(r->per_dir_config,
-						&kerb_auth_module);
-
-	if (reqs_arr == NULL) {
-		return OK;
-	}
-	reqs = (require_line *)reqs_arr->elts;
-
-	for (x = 0; x < reqs_arr->nelts; x++) {
-		t = reqs[x].requirement;
-		w = ap_getword_white(r->pool, &t);
-		if (strcmp(w, "realm") == 0) {
-			while (t[0] != '\0') {
-				w = ap_getword_conf(r->pool, &t);
-				if (strcmp(MK_USER, w) == 0) {
-					return OK;
-				}
-			}
-		}
-	}
-
-	return DECLINED;
-}
-#endif
-
-
-
-
 /*************************************************************************** 
  Module Setup/Configuration
  ***************************************************************************/