changed sms_query calls to do_sms_query, and made do_sms_query

deal with expired kerberos tickets.

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index dd7f2379c9d09b65de176e5f6784f2776ef6942c..5b2fc949dfd449af58e945e987f0de36e30346d5 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -804,7 +804,7 @@ char *tname;
     argv[1] = "TYPE";
     argv[2] = "*";
     elem = NULL;
-    if (stat = sms_query("get_alias", 3, argv, StoreInfo, (char *)&elem)) {
+    if (stat = do_sms_query("get_alias", 3, argv, StoreInfo, (char *)&elem)) {
        com_err(program_name, stat, " in GetTypeValues");
        return(NULL);
     }
@@ -882,7 +882,7 @@ char  **pointer;
        for (p = argv[2]; *p; p++)
            if (islower(*p))
                *p = toupper(*p);
-       if (stat = sms_query("add_alias", 3, argv, Scream, NULL)) {
+       if (stat = do_sms_query("add_alias", 3, argv, Scream, NULL)) {
            com_err(program_name, stat, " in add_alias");
        } else {
            elem = (struct qelem *) malloc(sizeof(struct qelem));
@@ -907,7 +907,7 @@ char *hint;
     extern char *whoami;
 
     status = sms_query(name, argc, argv, proc, hint);
-    if (status != SMS_ABORTED)
+    if (status != SMS_ABORTED && status != SMS_NOT_CONNECTED)
       return(status);
     status = sms_connect();
     if (status) {
@@ -917,6 +917,7 @@ char *hint;
     status = sms_auth(whoami);
     if (status) {
        com_err(whoami, status, " while re-authenticating to server");
+       sms_disconnect();
        return(SMS_ABORTED);
     }
     status = sms_query(name, argc, argv, proc, hint);