From: Timo Sirainen <tss@iki.fi>
Date: Mon, 4 Aug 2008 19:49:40 +0000 (-0400)
Subject: hostpid_init(): If called again, update the hostname/pid.
X-Git-Tag: 1.2.alpha1~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aeb83768a92216c1a0045ffe1599594a9a2bc062;p=thirdparty%2Fdovecot%2Fcore.git

hostpid_init(): If called again, update the hostname/pid.

--HG--
branch : HEAD
---

diff --git a/src/lib/hostpid.c b/src/lib/hostpid.c
index e50d4d9737..a86386a26c 100644
--- a/src/lib/hostpid.c
+++ b/src/lib/hostpid.c
@@ -12,16 +12,11 @@ void hostpid_init(void)
 {
 	static char hostname[256], pid[MAX_INT_STRLEN];
 
-	if (my_hostname == NULL) {
-		if (gethostname(hostname, sizeof(hostname)-1) == -1)
-			i_strocpy(hostname, "unknown", sizeof(hostname));
-		hostname[sizeof(hostname)-1] = '\0';
+	if (gethostname(hostname, sizeof(hostname)-1) == -1)
+		i_strocpy(hostname, "unknown", sizeof(hostname));
+	hostname[sizeof(hostname)-1] = '\0';
+	my_hostname = hostname;
 
-		my_hostname = hostname;
-	}
-
-	if (my_pid == NULL) {
-		i_strocpy(pid, dec2str(getpid()), sizeof(pid));
-		my_pid = pid;
-	}
+	i_strocpy(pid, dec2str(getpid()), sizeof(pid));
+	my_pid = pid;
 }