* uinfo.cc (cygheap_user::env_logsrv): Return "almost_null" in case where no

domain or username is "SYSTEM".

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0152f46..983b961 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2002-06-28  Christopher Faylor  <cgf@redhat.com>
 
+       * uinfo.cc (cygheap_user::env_logsrv): Return "almost_null" in case
+       where no domain or username is "SYSTEM".
+
+2002-06-28  Christopher Faylor  <cgf@redhat.com>
+
        * cygheap.h (cygheap_user): Reorg to accommodate environment caching.
        (cygheap_user::logsrv): New method.
        (cygheap_user::winname): Ditto.

diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 5326ce4..9fc336d 100644 (file)
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -320,7 +320,7 @@ cygheap_user::env_logsrv (const char *name, size_t namelen)
     return plogsrv;
 
   if (!domain () || strcasematch (winname (), "SYSTEM"))
-    return NULL;
+    return almost_null;
 
   char logsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
   cfree_and_set (plogsrv, almost_null);