strip @mit.edu even (especially) when the user didn't explicitly

say it was a string.

diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c
index 9eced03c38fa9aed180fc9cb56bfe3f6980da057..4ab050ab78ee0b45045a198f4a7176ae060c7925 100644 (file)
--- a/clients/blanche/blanche.c
+++ b/clients/blanche/blanche.c
@@ -468,7 +468,7 @@ int main(int argc, char **argv)
   while (sq_get_data(addlist, &memberstruct))
     {
       /* canonicalize string if necessary */
-      if (memberstruct->type == M_STRING &&
+      if (memberstruct->type != M_KERBEROS &&
          (p = strchr(memberstruct->name, '@')))
        {
          char *host = canonicalize_hostname(strdup(++p));
@@ -498,8 +498,9 @@ int main(int argc, char **argv)
                {
                  host = strdup(memberstruct->name);
                  *(strchr(memberstruct->name, '@')) = 0;
-                 memberstruct->type = M_ANY;
-                 fprintf(stderr, "Warning: \"STRING:%s\" converted to "
+                 if (memberstruct->type == M_STRING)
+                     memberstruct->type = M_ANY;
+                 fprintf(stderr, "Warning: \"%s\" converted to "
                          "\"%s\" because it is a local name.\n",
                          host, memberstruct->name);
                  break;