From 9d86e318268d40d33505a11ed865984754bdd040 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 28 Sep 2010 16:18:57 +0000 Subject: * net.cc (getdomainname): Drop special case for NT4. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/net.cc | 16 ---------------- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'winsup') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d260e2d69..3e225b63f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2010-09-28 Corinna Vinschen + + * net.cc (getdomainname): Drop special case for NT4. + 2010-09-28 Corinna Vinschen Revert accidental previous login. 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; } -- cgit v1.2.3