changed SMS to Moira

diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c
index b1af92c4d20a25ff947aefd818f40d227ca4e280..1f490404a5d4cdc068f6382d8a92967d50af7cc1 100644 (file)
--- a/clients/blanche/blanche.c
+++ b/clients/blanche/blanche.c
@@ -168,7 +168,7 @@ char **argv;
 
     /* fire up SMS */
     if (status = sms_connect(server)) {
-       com_err(whoami, status, " unable to connect to SMS");
+       com_err(whoami, status, " unable to connect to the Moira server");
        exit(2);
     }
     if ( status = sms_motd(&motd) ) {
@@ -176,13 +176,13 @@ char **argv;
        exit(2);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        sms_disconnect();
        exit(2);
     }
 
     if (!noauth && (status = sms_auth("blanche"))) {
-       com_err(whoami, status, " unable to authenticate to SMS");
+       com_err(whoami, status, " unable to authenticate to Moira");
        com_err(whoami, 0,
                "Try the -noauth flag if you don't need authentication");
        exit(2);

diff --git a/clients/mailmaint/mailmaint.c b/clients/mailmaint/mailmaint.c
index cd8ece5e67c6aaaec9c5955ee81474d135c920be..8bb037a506296116b00374c2ef884b6bae663e27 100644 (file)
--- a/clients/mailmaint/mailmaint.c
+++ b/clients/mailmaint/mailmaint.c
@@ -137,7 +137,7 @@ main(argc, argv)
 
     status = sms_connect(SMS_SERVER);
     if (status) {
-       (void) sprintf(buf, "\nConnection to SMS server failed");
+       (void) sprintf(buf, "\nConnection to Moira server failed");
        goto punt;
     }
 
@@ -148,7 +148,7 @@ main(argc, argv)
        exit(2);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        sms_disconnect();
        exit(2);
     }
@@ -822,7 +822,7 @@ clrwin(erase_row)
 static int
 scream()
 {
-    com_err(whoami, status, "\nAn SMS update returned a value -- programmer \
+    com_err(whoami, status, "\nA Moira update returned a value -- programmer \
 botch\n");
     sms_disconnect();
     exit(1);

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 3974014938cd9b9c5842804775343e01a6aac0da..80dacd4064b4e4735783a5d30c867faafc95deb4 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -650,7 +650,7 @@ Menu misc_menu = {
     4,
     {
        SIMPLEFUNC("statistics", "Show database statistics", TableStats),
-       SIMPLEFUNC("clients", "Show active SMS clients", ShowClients),
+       SIMPLEFUNC("clients", "Show active Moira clients", ShowClients),
        { ShowValue, NULLMENU, 2, {
            {"getval", "Show a database variable value"},
            {"name", "variable name: "},
@@ -673,7 +673,7 @@ Menu misc_menu = {
 Menu sms_top_menu = {
   NULLFUNC,
   NULLFUNC,
-  "Sms Database Manipulation",
+  "Moira Database Manipulation",
   10,
   {
     SUBMENU("cluster","Cluster Menu",&cluster_menu),

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index 2ef9735643f1d99797c63b9d23938e959bad79e8..883f6ba2397ad17d3b393fc356fbe5f8e127365e 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -251,7 +251,7 @@ int
 Scream()
 {
     com_err(program_name, 0,
-           "\nAn SMS update returned a value -- programmer botch\n");
+           "\nA Moira update returned a value -- programmer botch\n");
     sms_disconnect();
     exit(1);
 }
@@ -897,12 +897,14 @@ char *hint;
       return(status);
     status = sms_connect(moira_server);
     if (status) {
-       com_err(whoami, status, " while re-connecting to server");
+       com_err(whoami, status, " while re-connecting to server %s",
+               moira_server);
        return(SMS_ABORTED);
     }
     status = sms_auth(whoami);
     if (status) {
-       com_err(whoami, status, " while re-authenticating to server");
+       com_err(whoami, status, " while re-authenticating to server %s",
+               moira_server);
        sms_disconnect();
        return(SMS_ABORTED);
     }

diff --git a/clients/mrcheck/mrcheck.c b/clients/mrcheck/mrcheck.c
index fc0a109b09f445bf422a32a793b0fe77999ab752..b939091e46add166e51382eb46a9b03903de7dd2 100644 (file)
--- a/clients/mrcheck/mrcheck.c
+++ b/clients/mrcheck/mrcheck.c
@@ -92,7 +92,7 @@ main(argc, argv)
 
     status = sms_connect(SMS_SERVER);
     if (status) {
-       (void) sprintf(buf, "\nConnection to the SMS server failed.");
+       (void) sprintf(buf, "\nConnection to the Moira server failed.");
        goto punt;
     }
 
@@ -102,11 +102,11 @@ main(argc, argv)
        exit(2);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        sms_disconnect();
        exit(2);
     }
-    status = sms_auth("smscheck");
+    status = sms_auth("mrcheck");
     if (status) {
        (void) sprintf(buf, "\nAuthorization failure -- run \"kinit\" \
 and try again");
@@ -163,7 +163,7 @@ punt:
 
 scream()
 {
-    com_err(whoami, status, "Update to SMS returned a value -- \
+    com_err(whoami, status, "Update to Moira returned a value -- \
 programmer botch.\n");
     sms_disconnect();
     exit(1);

diff --git a/clients/passwd/chfn.c b/clients/passwd/chfn.c
index 4cf62ab54d9bd654db08ae23ec8f5f2316fc0f6c..f0e7aef9c0b19c9d28faccce8f01e7bb45ad41eb 100644 (file)
--- a/clients/passwd/chfn.c
+++ b/clients/passwd/chfn.c
@@ -107,7 +107,7 @@ leave(status)
 
 scream()
 {
-    com_err(whoami, 0, "Unexpected return value from SMS -- programmer botch");
+    com_err(whoami, 0, "Unexpected return value from Moira -- programmer botch");
     leave(1);
 }
 
@@ -130,7 +130,7 @@ chfn(uname)
 
     status = sms_connect(SMS_SERVER);
     if (status) {
-       com_err(whoami, status, " while connecting to SMS");
+       com_err(whoami, status, " while connecting to Moira");
        exit(1);
     }
 
@@ -140,7 +140,7 @@ chfn(uname)
        leave(1);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        leave(1);
     }
 

diff --git a/clients/passwd/chpobox.c b/clients/passwd/chpobox.c
index 9e4b8df8f8fae53a9d5077efed9586ba2f147b57..04639ba529e14fa56d7086ffe14f97d30ed02318 100644 (file)
--- a/clients/passwd/chpobox.c
+++ b/clients/passwd/chpobox.c
@@ -124,7 +124,7 @@ main(argc, argv)
 
     status = sms_connect(SMS_SERVER);
     if (status) {
-       com_err(whoami, status, " while connecting to SMS");
+       com_err(whoami, status, " while connecting to Moira");
        exit(1);
     }
 
@@ -135,7 +135,7 @@ main(argc, argv)
        exit(1);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        sms_disconnect();
        exit(1);
     }
@@ -198,7 +198,7 @@ main(argc, argv)
        status = sms_query("set_pobox_pop", 1, smsarg, scream, NULL);
        if (status == SMS_MACHINE) {
            fprintf(stderr,
-                   "SMS has no record of a previous POP box for %s\n", uname);
+                   "Moira has no record of a previous POP box for %s\n", uname);
        } else if (status != 0)
          com_err(whoami, status, " while setting pobox");
     }
@@ -219,7 +219,7 @@ show:
 
 scream()
 {
-    com_err(whoami, 0, "Unexpected return value from SMS -- programmer botch");
+    com_err(whoami, 0, "Unexpected return value from Moira -- programmer botch");
     sms_disconnect();
     exit(1);
 }

diff --git a/clients/passwd/chsh.c b/clients/passwd/chsh.c
index d0b69bfdbc081cd5cdf7b9848cae1d9489bfdfe4..e5fe0453383e232e4168f83fe52a9156d8f76eb0 100644 (file)
--- a/clients/passwd/chsh.c
+++ b/clients/passwd/chsh.c
@@ -95,7 +95,7 @@ leave(status)
 
 scream()
 {
-    com_err(whoami, 0, "Unexpected return value from SMS -- programmer botch");
+    com_err(whoami, 0, "Unexpected return value from Moira -- programmer botch");
     leave(1);
 }
 
@@ -116,7 +116,7 @@ chsh(uname)
 
     status = sms_connect(SMS_SERVER);
     if (status) {
-       com_err(whoami, status, " while connecting to SMS");
+       com_err(whoami, status, " while connecting to Moira");
        exit(1);
     }
 
@@ -126,7 +126,7 @@ chsh(uname)
        leave(1);
     }
     if (motd) {
-       fprintf(stderr, "The SMS server is currently unavailable:\n%s\n", motd);
+       fprintf(stderr, "The Moira server is currently unavailable:\n%s\n", motd);
        leave(1);
     }