From efc1575ecd6c005883f5e4bb292a6a33a4c17b2a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 29 Jun 2002 22:05:30 +0000 Subject: * autoload.cc (NetGetDCName): Change to make this an optional load function. * cygheap.h (cygheap_user::logsrv): Return NULL when operation fails. (cygheap_user::winname): Ditto. (cygheap_user::domain): Ditto. * uinfo.cc (cygheap_user::env_logsrv): Save results in temp variable. (cygheap_user::env_userprofile): Ditto. --- winsup/cygwin/cygheap.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/cygheap.h') diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index 63585d91a..d2e06bfef 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -144,15 +144,18 @@ public: const char *logsrv () { - return env_logsrv ("LOGONSERVER=", sizeof ("LOGONSERVER=") - 1); + const char *p = env_logsrv ("LOGONSERVER=", sizeof ("LOGONSERVER=") - 1); + return (p == almost_null) ? NULL : p; } const char *winname () { - return env_name ("USERNAME=", sizeof ("USERNAME=") - 1); + const char *p = env_name ("USERNAME=", sizeof ("USERNAME=") - 1); + return (p == almost_null) ? NULL : p; } const char *domain () { - return env_domain ("USERDOMAIN=", sizeof ("USERDOMAIN=") - 1); + const char *p = env_domain ("USERDOMAIN=", sizeof ("USERDOMAIN=") - 1); + return (p == almost_null) ? NULL : p; } BOOL set_sid (PSID new_sid); BOOL set_orig_sid (); -- cgit v1.2.3