From: Greg Hudson <ghudson@mit.edu>
Date: Sat, 11 Aug 2012 21:57:40 +0000 (-0400)
Subject: Fix nitpicky bugs in t_inq_cred
X-Git-Tag: krb5-1.11-alpha1~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bef36f694cb7745c60f1640dfa4d8a13ee08b883;p=thirdparty%2Fkrb5.git

Fix nitpicky bugs in t_inq_cred
---

diff --git a/src/tests/gssapi/t_inq_cred.c b/src/tests/gssapi/t_inq_cred.c
index 5070a23555..ed93a6eaf0 100644
--- a/src/tests/gssapi/t_inq_cred.c
+++ b/src/tests/gssapi/t_inq_cred.c
@@ -79,7 +79,7 @@ static void
 usage(const char *progname)
 {
     fprintf(stderr,
-            "Usage: %s [-k|-s] [-a|-b|-i] [princ|gss:service@host|-]\n",
+            "Usage: %s [-k|-s] [-a|-b|-i] [princ|gss:service@host]\n",
             progname);
     exit(1);
 }
@@ -95,7 +95,7 @@ main(int argc, char *argv[])
     gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
     gss_name_t name = GSS_C_NO_NAME;
     gss_buffer_desc buf;
-    const char *name_arg = NULL;
+    const char *name_arg = NULL, *progname = argv[0];
     char opt;
 
     while (argc > 1 && argv[1][0] == '-') {
@@ -112,10 +112,10 @@ main(int argc, char *argv[])
         else if (opt == 's')
             mech = &spnego_mech;
         else
-            usage(argv[0]);
+            usage(progname);
     }
     if (argc > 2)
-        usage(argv[0]);
+        usage(progname);
     if (argc > 1)
         name_arg = argv[1];
 
@@ -124,8 +124,8 @@ main(int argc, char *argv[])
         /* Import as host-based service. */
         buf.value = (char *)name_arg + 4;
         buf.length = strlen((char *)buf.value);
-        major = gss_import_name(&minor, &buf,
-                                (gss_OID)GSS_C_NT_HOSTBASED_SERVICE, &name);
+        major = gss_import_name(&minor, &buf, GSS_C_NT_HOSTBASED_SERVICE,
+                                &name);
         if (GSS_ERROR(major))
             gsserr("gss_import_name", major, minor);
     } else if (name_arg != NULL) {