diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2010-09-28 20:18:57 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2010-09-28 20:18:57 +0400 |
commit | 9d86e318268d40d33505a11ed865984754bdd040 (patch) | |
tree | 34c7af99d63d03abbe969044e4de36367ee75438 | |
parent | 2a9b4b7aa07c166beca1c37d2ba7faa22feca33f (diff) |
* net.cc (getdomainname): Drop special case for NT4.
-rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
-rw-r--r-- | winsup/cygwin/net.cc | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d260e2d69..3e225b63f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2010-09-28 Corinna Vinschen <corinna@vinschen.de> + * net.cc (getdomainname): Drop special case for NT4. + +2010-09-28 Corinna Vinschen <corinna@vinschen.de> + Revert accidental previous login. 2010-09-28 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 093abce6c..cefef6741 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -1467,22 +1467,6 @@ getdomainname (char *domain, size_t len) strncpy(domain, info->DomainName, len); return 0; } - - /* This is only used by NT4. - The registry names are language independent. */ - reg_key r (HKEY_LOCAL_MACHINE, KEY_READ, - "SYSTEM", "CurrentControlSet", "Services", - "Tcpip", "Parameters", NULL); - - if (!r.error ()) - { - int res1, res2 = 0; /* Suppress compiler warning */ - res1 = r.get_string ("Domain", domain, len, ""); - if (res1 != ERROR_SUCCESS || !domain[0]) - res2 = r.get_string ("DhcpDomain", domain, len, ""); - if (res1 == ERROR_SUCCESS || res2 == ERROR_SUCCESS) - return 0; - } __seterrno (); return -1; } |