From 38bc119696ba49314fdb3967767b799a9503a358 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 29 Jun 2002 06:50:17 +0000 Subject: [PATCH] * uinfo.cc (cygheap_user::test_uid): Return NULL or further tests are sorta useless. (cygheap_user::env_domain): Recalculate if name is missing. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/uinfo.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9800f1cc1..627db828f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2002-06-29 Christopher Faylor + + * uinfo.cc (cygheap_user::test_uid): Return NULL or further tests are + sorta useless. + (cygheap_user::env_domain): Recalculate if name is missing. + 2002-06-29 Christopher Faylor * environ.cc (spenv::from_cygheap): Still need to take setuid into diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 9fc336d73..ae500049e 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -309,7 +309,7 @@ cygheap_user::test_uid (char *&what, const char *name, size_t namelen) if (what) return what; if (orig_uid == myself->uid) - what = getwinenveq (name, namelen, HEAP_STR) ?: almost_null; + what = getwinenveq (name, namelen, HEAP_STR); return what; } @@ -332,7 +332,7 @@ cygheap_user::env_logsrv (const char *name, size_t namelen) const char * cygheap_user::env_domain (const char *name, size_t namelen) { - if (test_uid (pdomain, name, namelen)) + if (pwinname && test_uid (pdomain, name, namelen)) return pdomain; char username[UNLEN + 1];