From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 17 Aug 2009 14:39:44 +0000 (+0000)
Subject: Remove unused variables resulting from r22521, and also remove the
X-Git-Tag: krb5-1.8-alpha1~386
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f75549596ed93c658805f3df40ca4d9853b28213;p=krb5.git

Remove unused variables resulting from r22521, and also remove the
unused file svr_misc_free.c.

ticket: 6544

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

diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c
index ebef752ae..dc949ff18 100644
--- a/src/kadmin/server/server_stubs.c
+++ b/src/kadmin/server/server_stubs.c
@@ -1398,7 +1398,6 @@ get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp)
     gss_buffer_desc		client_name,
 				service_name;
     OM_uint32			minor_stat;    
-    kadm5_policy_ent_t	e;
     kadm5_principal_ent_rec	caller_ent;
     kadm5_server_handle_t	handle;
     const char			*errmsg = NULL;
diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
index 066bc7398..b0e3d24ee 100644
--- a/src/lib/kadm5/misc_free.c
+++ b/src/lib/kadm5/misc_free.c
@@ -14,8 +14,6 @@ static char *rcsid = "$Header$";
 kadm5_ret_t
 kadm5_free_policy_ent(void *server_handle, kadm5_policy_ent_t val)
 {
-    kadm5_server_handle_t	handle = server_handle;
-
     _KADM5_CHECK_HANDLE(server_handle);
 
     if (val)
diff --git a/src/lib/kadm5/srv/svr_misc_free.c b/src/lib/kadm5/srv/svr_misc_free.c
deleted file mode 100644
index 1c87f0689..000000000
--- a/src/lib/kadm5/srv/svr_misc_free.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
- *
- * $Header$
- * 
- */
-
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-#include	<kadm5/admin.h>
-#include	<stdlib.h>
-#include	"server_internal.h"
-
-kadm5_ret_t
-kadm5_free_principal_ent(void *server_handle,
-			      kadm5_principal_ent_t val)
-{
-    kadm5_server_handle_t	handle = server_handle;
-
-    CHECK_HANDLE(server_handle);
-
-    if(val) {
-	if(val->principal) 
-	    krb5_free_principal(handle->context, val->principal);
-	if(val->mod_name)
-	    krb5_free_principal(handle->context, val->mod_name);
-	if(val->policy)
-	    free(val->policy);
-
-	/* XXX free key_data and tl_data */
-    }
-    return KADM5_OK;
-}
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 63f6aeabb..5c5cdc8cc 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1476,7 +1476,6 @@ kadm5_randkey_principal_3(void *server_handle,
     osa_princ_ent_rec		adb;
     krb5_int32			now;
     kadm5_policy_ent_rec	pol;
-    krb5_key_data		*key_data;
     int				ret, last_pwd, have_pol = 0;
     kadm5_server_handle_t	handle = server_handle;
     krb5_keyblock               *act_mkey;
@@ -2004,7 +2003,6 @@ kadm5_get_principal_keys(void *server_handle /* IN */,
 {
     krb5_db_entry               kdb;
     osa_princ_ent_rec           adb;
-    krb5_key_data               *key_data;
     kadm5_ret_t                 ret;
     kadm5_server_handle_t       handle = server_handle;
     krb5_keyblock               *mkey_ptr;