From: mar <mar>
Date: Wed, 5 Oct 1988 13:00:09 +0000 (+0000)
Subject: changed sms_query calls to do_sms_query, and made do_sms_query
X-Git-Tag: KREL1~104
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/a47906f24fddf98c3085abfa3ac778876daefbf3

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 dd7f2379..5b2fc949 100644
--- 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);