diff --git a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp
index 93c7a42c70d..1ada60670d6 100644
--- a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp
+++ b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp
@@ -94,14 +94,20 @@ nsUserInfo::GetDomain(char * *aDomain)
     nsresult rv = NS_ERROR_FAILURE;
 
     struct utsname buf;
-    
+    char *domainname = nsnull;
+
     if (uname(&buf)) { 
         return rv;
     }
-    
  
-    if (buf.__domainname && nsCRT::strlen(buf.__domainname)) {   
-        *aDomain = nsCRT::strdup(buf.__domainname);
+#if 1
+    domainname = buf.__domainname;
+#else
+    domainname = buf.domainname;
+#endif
+
+    if (domainname && nsCRT::strlen(domainname)) {   
+        *aDomain = nsCRT::strdup(domainname);
         rv = NS_OK;
     }
     else {
diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp
index 93c7a42c70d..1ada60670d6 100644
--- a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp
+++ b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp
@@ -94,14 +94,20 @@ nsUserInfo::GetDomain(char * *aDomain)
     nsresult rv = NS_ERROR_FAILURE;
 
     struct utsname buf;
-    
+    char *domainname = nsnull;
+
     if (uname(&buf)) { 
         return rv;
     }
-    
  
-    if (buf.__domainname && nsCRT::strlen(buf.__domainname)) {   
-        *aDomain = nsCRT::strdup(buf.__domainname);
+#if 1
+    domainname = buf.__domainname;
+#else
+    domainname = buf.domainname;
+#endif
+
+    if (domainname && nsCRT::strlen(domainname)) {   
+        *aDomain = nsCRT::strdup(domainname);
         rv = NS_OK;
     }
     else {