From 02ecab8ef9e9f6a26d1963d949064caae4efea56 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 1 Mar 2000 19:52:43 +0000 Subject: [PATCH] not part of the build yet. git-svn-id: svn://10.0.0.236/trunk@61975 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp | 14 ++++++++++---- .../xpfe/components/startup/src/nsUserInfoUnix.cpp | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) 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 {