more work moving to quilt for patch management

[debian/sudo] / sudo.c

diff --git a/sudo.c b/sudo.c
index 4ee0c4c3623b3a1139ca2ed082af27651a323280..27af77a68c4712e68f9d1d0653ea2578d73d59e6 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -628,7 +628,6 @@ init_vars(sudo_mode, envp)
      * "host" is the (possibly fully-qualified) hostname and
      * "shost" is the unqualified form of the hostname.
      */
-    sudo_user.host_fqdn_queried = FALSE;
     nohostname = gethostname(thost, sizeof(thost));
     if (nohostname)
        user_host = user_shost = "localhost";
@@ -639,7 +638,13 @@ init_vars(sudo_mode, envp)
            /* Defer call to set_fqdn() until log_error() is safe. */
            user_shost = user_host;
        } else {
-           user_shost = user_host;
+           if ((p = strchr(user_host, '.'))) {
+               *p = '\0';
+               user_shost = estrdup(user_host);
+               *p = '.';
+           } else {
+               user_shost = user_host;
+           }
        }
     }
 
@@ -1364,7 +1369,6 @@ set_fqdn()
     } else {
        user_shost = user_host;
     }
-    sudo_user.host_fqdn_queried = TRUE;
 }
 
 /*