From 29a746efd7b980badb2553a9e5498c08b2c4dbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 22 Sep 2008 06:32:23 +0000
Subject: [PATCH] fix usage

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23860 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kadm5/ipropd_slave.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index eb9c12a0b..61c359686 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -452,6 +452,13 @@ static struct getargs args[] = {
 
 static int num_args = sizeof(args) / sizeof(args[0]);
 
+static void
+usage(int status)
+{
+    arg_printusage(args, num_args, NULL, "master");
+    exit(status);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -469,15 +476,22 @@ main(int argc, char **argv)
 
     const char *master;
 
-    optidx = krb5_program_setup(&context, argc, argv, args, num_args, "master");
+    setprogname(argv[0]);
+
+    if(getarg(args, num_args, argc, argv, &optidx))
+	usage(1);
 
     if(help_flag)
-	krb5_std_usage(0, args, num_args);
+	usage(0);
     if(version_flag) {
 	print_version(NULL);
 	exit(0);
     }
 
+    ret = krb5_init_context(&context);
+    if (ret)
+	errx (1, "krb5_init_context failed: %d", ret);
+
     setup_signal();
 
     if (config_file == NULL) {
@@ -499,7 +513,7 @@ main(int argc, char **argv)
     argv += optidx;
 
     if (argc != 1)
-	krb5_std_usage(1, args, num_args);
+	usage(1);
 
     master = argv[0];