From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 26 Feb 2015 20:02:37 +0000 (-0500)
Subject: Fix kadmin script mode command-not-found error
X-Git-Tag: krb5-1.14-alpha1~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c491320f72f1e07f87c1cf5b7671505f3526891;p=thirdparty%2Fkrb5.git

Fix kadmin script mode command-not-found error

In ss_wrapper.c, if ss_execute_command() returns an error, we should
call ss_perror() with *args as the third argument and not request
(which is NULL).  Expand out the conditional into three commented
branches for greater clarity, since the error-handling is no longer
identical for the ss_execute_command() and ss_execute_line() cases.

ticket: 7991
---

diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index d9a1d8f77e..776c383d71 100644
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -49,17 +49,25 @@ main(int argc, char *argv[])
         ss_perror(sci_idx, retval, _("creating invocation"));
         exit(1);
     }
-    if (request == NULL && *args == NULL) {
-        (void)ss_listen(sci_idx);
-    } else {
-        if (request != NULL)
-            code = ss_execute_line(sci_idx, request);
-        else
-            code = ss_execute_command(sci_idx, args);
+
+    if (*args != NULL) {
+        /* Execute post-option arguments as a single script-mode command. */
+        code = ss_execute_command(sci_idx, args);
+        if (code) {
+            ss_perror(sci_idx, code, *args);
+            exit_status = 1;
+        }
+    } else if (request != NULL) {
+        /* Execute the -q option as a single interactive command. */
+        code = ss_execute_line(sci_idx, request);
         if (code != 0) {
             ss_perror(sci_idx, code, request);
             exit_status = 1;
         }
+    } else {
+        /* Prompt for commands. */
+        (void)ss_listen(sci_idx);
     }
+
     return quit() ? 1 : exit_status;
 }