]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix nitpicky bugs in t_inq_cred
authorGreg Hudson <ghudson@mit.edu>
Sat, 11 Aug 2012 21:57:40 +0000 (17:57 -0400)
committerGreg Hudson <ghudson@mit.edu>
Sat, 11 Aug 2012 22:20:48 +0000 (18:20 -0400)
src/tests/gssapi/t_inq_cred.c

index 5070a2355506de26bdb8fc9b436786521307b6af..ed93a6eaf05fb5c68dd3dbe133fc7944d4648438 100644 (file)
@@ -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) {