From: jweiss <jweiss>
Date: Tue, 21 Sep 1999 22:59:21 +0000 (+0000)
Subject: strip @mit.edu even (especially) when the user didn't explicitly
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/2b3e2afe2318592efd37b747dad94356f24a013d

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 9eced03c..4ab050ab 100644
--- 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;