X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname-setup.c;h=57db9fbf7c2a2d26a7955ddbb15a9bdc86138961;hp=8b0ff793847ee78ecec438009cff10ba15314d96;hb=88e3dc903bd543a74b8699c1575b0da9eeab24a2;hpb=a338bab5d0603a179befce062bc6fc8a6521a232

diff --git a/src/hostname-setup.c b/src/hostname-setup.c
index 8b0ff7938..57db9fbf7 100644
--- a/src/hostname-setup.c
+++ b/src/hostname-setup.c
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "log.h"
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
 #define FILENAME "/etc/sysconfig/network"
 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE)
 #define FILENAME "/etc/HOSTNAME"
@@ -40,25 +40,8 @@
 #define FILENAME "/etc/conf.d/hostname"
 #endif
 
-static char* strip_bad_chars(char *s) {
-        char *p, *d;
-
-        for (p = s, d = s; *p; p++)
-                if ((*p >= 'a' && *p <= 'z') ||
-                    (*p >= 'A' && *p <= 'Z') ||
-                    (*p >= '0' && *p <= '9') ||
-                    *p == '-' ||
-                    *p == '_' ||
-                    *p == '.')
-                        *(d++) = *p;
-
-        *d = 0;
-
-        return s;
-}
-
 static int read_and_strip_hostname(const char *path, char **hn) {
-        char *s, *k;
+        char *s;
         int r;
 
         assert(path);
@@ -67,27 +50,21 @@ static int read_and_strip_hostname(const char *path, char **hn) {
         if ((r = read_one_line_file(path, &s)) < 0)
                 return r;
 
-        k = strdup(strstrip(s));
-        free(s);
+        hostname_cleanup(s);
 
-        if (!k)
-                return -ENOMEM;
-
-        strip_bad_chars(k);
-
-        if (k[0] == 0) {
-                free(k);
+        if (isempty(s)) {
+                free(s);
                 return -ENOENT;
         }
 
-        *hn = k;
+        *hn = s;
 
         return 0;
 }
 
 static int read_distro_hostname(char **hn) {
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX)
+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
         int r;
         FILE *f;
 
@@ -118,9 +95,9 @@ static int read_distro_hostname(char **hn) {
                         goto finish;
                 }
 
-                strip_bad_chars(k);
+                hostname_cleanup(k);
 
-                if (k[0] == 0) {
+                if (isempty(k)) {
                         free(k);
                         r = -ENOENT;
                         goto finish;
@@ -174,16 +151,36 @@ int hostname_setup(void) {
                 else
                         log_warning("Failed to read configured hostname: %s", strerror(-r));
 
-                hn = "localhost";
+                hn = NULL;
         } else
                 hn = b;
 
+        if (!hn) {
+                /* Don't override the hostname if it is unset and not
+                 * explicitly configured */
+
+                char *old_hostname = NULL;
+
+                if ((old_hostname = gethostname_malloc())) {
+                        bool already_set;
+
+                        already_set = old_hostname[0] != 0;
+                        free(old_hostname);
+
+                        if (already_set)
+                                goto finish;
+                }
+
+                hn = "localhost";
+        }
+
         if (sethostname(hn, strlen(hn)) < 0) {
                 log_warning("Failed to set hostname to <%s>: %m", hn);
                 r = -errno;
         } else
                 log_info("Set hostname to <%s>.", hn);
 
+finish:
         free(b);
 
         return r;