move partial_canonicalize_hostname to libmrclient

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index c4dbaa535b2955f024f10d47223c32d91c98873d..d6299d34d99d7f3b3d6c83dca563615a946a1a0a 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -44,7 +44,6 @@ struct mqelem *GetMCInfo(int type, char *name1, char *name2);
 char **AskMCDInfo(char **info, int type, Bool name);
 int CheckAndRemoveFromCluster(char *name, Bool ask_user);
 int CheckAndRemoveMachines(char *name, Bool ask_first);
-char *partial_canonicalize_hostname(char *s);
 
 #define MACHINE  0
 #define CLUSTER  1
@@ -986,48 +985,6 @@ int DeleteMachine(int argc, char **argv)
 }
 
 
-char *partial_canonicalize_hostname(char *s)
-{
-  char buf[256], *cp;
-  static char *def_domain = NULL;
-
-  if (!def_domain)
-    {
-      if (mr_host(buf, sizeof(buf)) == MR_SUCCESS)
-       {
-         cp = strchr(buf, '.');
-         if (cp)
-           def_domain = strdup(++cp);
-       }
-      else
-       {
-         struct hostent *hp;
-#ifdef HAVE_UNAME
-         struct utsname name;
-         uname(&name);
-         hp = gethostbyname(name.nodename);
-#else
-         char  name[256];
-         gethostname(name, sizeof(name));
-         name[sizeof(name)-1] = 0;
-         hp = gethostbyname(name);
-#endif /* HAVE_UNAME */
-         cp = strchr(hp->h_name, '.');
-         if (cp)
-           def_domain = strdup(++cp);
-       }
-      if (!def_domain)
-       def_domain = "";
-    }
-
-  if (strchr(s, '.') || strchr(s, '*'))
-    return s;
-  sprintf(buf, "%s.%s", s, def_domain);
-  free(s);
-  return strdup(buf);
-}
-
-
 /*     Function Name: ShowCname
  *     Description: This function shows machine aliases
  *     Arguments: argc, argv - the alias argv[1], the real name in argv[2]