Removed all references to DECLARG and OLDDECLARG.

Added krb5_context to all krb5_routines throughout the tree.

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

2 files changed, 13 insertions, 8 deletions

diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index c444a81f7..03424276b 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
+
+    * Added krb5_context to all krb5_routines
+
 Thu Oct  6 23:43:38 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* kdb5_destroy.c (main): Add option to force destruction of a
diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index 412a0e2d0..d10b2ffab 100644
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.c
@@ -42,8 +42,8 @@ char *yes = "yes\n";			/* \n to compare against result of
 
 static void
 usage(who, status)
-char *who;
-int status;
+    char *who;
+    int status;
 {
     fprintf(stderr, "usage: %s [-d dbpathname]\n", who);
     exit(status);
@@ -51,8 +51,8 @@ int status;
 
 void
 main(argc, argv)
-int argc;
-char *argv[];
+    int argc;
+    char *argv[];
 {
     extern char *optarg;	
     int optchar;
@@ -60,9 +60,11 @@ char *argv[];
     char buf[5];
     char dbfilename[MAXPATHLEN];
     krb5_error_code retval;
+    krb5_context context;
     int force = 0;
 
-    krb5_init_ets();
+    krb5_init_context(&context);
+    krb5_init_ets(context);
 
     if (strrchr(argv[0], '/'))
 	argv[0] = strrchr(argv[0], '/')+1;
@@ -82,8 +84,7 @@ char *argv[];
 	}
     }
     if (!force) {
-	printf("Deleting KDC database stored in '%s', are you sure?\n",
-	       dbname);
+	printf("Deleting KDC database stored in '%s', are you sure?\n", dbname);
 	printf("(type 'yes' to confirm)? ");
 	if (fgets(buf, sizeof(buf), stdin) == NULL)
 	    exit(1);
@@ -101,7 +102,7 @@ char *argv[];
 		    "Database appears to not exist--inspect files manually!\n");
 	else
 	    fprintf(stderr,
-		    "Database may be partially deleted--inspect files manually!\n");
+	        "Database may be partially deleted--inspect files manually!\n");
 	exit(1);
     }
     (void) strcpy(dbfilename, dbname);