Use domain of moira server instead of domain of local host when

canonicalizing hostnames with no "."s. Matt owes me M&Ms. :-)

diff --git a/lib/fixhost.c b/lib/fixhost.c
index 81c3bc2e66602fbdf769a7d1265981d98ecd5d63..b1c1563283e5b07841cb425419cec13953f1630f 100644 (file)
--- a/lib/fixhost.c
+++ b/lib/fixhost.c
@@ -81,19 +81,27 @@ char *canonicalize_hostname(char *host)
 
          if (domain == NULL)
            {
-             struct utsname name;
+             char hostbuf[256];
 
-             uname(&name);
-             hp = gethostbyname(name.nodename);
-             if (hp)
+             if (mr_host(hostbuf, sizeof(hostbuf)) == MR_SUCCESS)
                {
-                 cp = strchr(hp->h_name, '.');
+                 cp = strchr(hostbuf, '.');
                  if (cp)
                    domain = strdup(++cp);
-                 if (!domain)
-                   domain = "";
                }
              else
+               {
+                 struct utsname name;
+                 uname(&name);
+                 hp = gethostbyname(name.nodename);
+                 if (hp)
+                   {
+                     cp = strchr(hp->h_name, '.');
+                     if (cp)
+                       domain = strdup(++cp);
+                   }
+               }
+             if (!domain)
                domain = "";
            }
          tbuf = malloc(strlen(host) + strlen(domain) + 2);