diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-04 16:23:36 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-04 16:23:36 +0400 |
commit | 6ce541281ec5536c550d4196d41b881d63c7b99e (patch) | |
tree | ec6823106c5ffabb513016efe855553b1fec34f6 /winsup/cygwin/sec_auth.cc | |
parent | 02dbd9ae87948c48970f3e2b5639606671ac4f0b (diff) |
Drop NT4 support.
* autoload.cc (DnsQuery_A): Fatal if not available.
(DnsRecordListFree): Ditto.
(DsGetDcNameW): Ditto.
(NetGetAnyDCName): Remove.
(NetGetDCName): Remove.
(EnumProcessModules): Fatal if not available.
(GetModuleFileNameExW): Ditto.
(GetModuleInformation): Ditto.
(GetProcessMemoryInfo): Ditto.
(QueryWorkingSet): Ditto.
(LsaRegisterLogonProcess): Ditto.
* fenv.cc (_feinitialise): Drop supports_sse condition.
* fhandler_disk_file.cc (path_conv::isgood_inode): Fix comment.
(fhandler_base::fstat_by_name): Drop has_fileid_dirinfo condition.
(fhandler_disk_file::opendir): Ditto.
* fhandler_netdrive.cc (fhandler_netdrive::readdir): Fix comment.
* fhandler_proc.cc (format_proc_partitions): Drop NT4-only code.
* fhandler_process.cc (get_process_state): Ditto.
* kernel32.cc (GetWindowsDirectoryW): Remove.
(GetWindowsDirectoryA): Remove.
* miscfuncs.cc (nice_to_winprio): Drop NT4-only code.
* mount.cc (fs_info::update): Fix comments.
* net.cc (get_2k_ifs): Drop NT4-only code.
* sec_auth.cc (get_logon_server): Ditto.
(lsaauth): Drop NT4-specific error handling.
* security.cc (alloc_sd): Set SE_DACL_PROTECTED unconditionally.
* select.cc (select_stuff::wait): Always use MWMO_INPUTAVAILABLE.
(peek_windows): Drop NT4-only condition in call to PeekMessage.
* syscalls.cc (gethostid): Remove NT4-only workaround.
* wincap.cc: Througout, drop has_dacl_protect,
has_broken_if_oper_status, has_process_io_counters,
has_terminal_services, has_extended_priority_class, has_guid_volumes,
has_fileid_dirinfo, has_mwmo_inputavailable and supports_sse from
wincaps.
(wincap_nt4sp4): Remove.
(wincap_minimal): Set to wincap_2000.
(wincapc::init): Rely on availability of OSVERSIONINFOEX structure.
Treat error from GetVersionEx as fatal. Treat NT4 as fatal.
* wincap.h (struct wincaps): Drop has_dacl_protect,
has_broken_if_oper_status, has_process_io_counters,
has_terminal_services, has_extended_priority_class, has_guid_volumes,
has_fileid_dirinfo, has_mwmo_inputavailable and supports_sse flags
and methods.
* winlean.h (GetWindowsDirectoryW) Define as GetSystemWindowsDirectoryW.
(GetWindowsDirectoryA): Define as GetSystemWindowsDirectoryA.
Diffstat (limited to 'winsup/cygwin/sec_auth.cc')
-rw-r--r-- | winsup/cygwin/sec_auth.cc | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index 775957f25..6df304716 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -216,9 +216,8 @@ close_local_policy (LSA_HANDLE &lsa) bool get_logon_server (PWCHAR domain, WCHAR *server, bool rediscovery) { - DWORD dret; + DWORD ret; PDOMAIN_CONTROLLER_INFOW pci; - WCHAR *buf; DWORD size = MAX_COMPUTERNAME_LENGTH + 1; /* Empty domain is interpreted as local system */ @@ -230,31 +229,16 @@ get_logon_server (PWCHAR domain, WCHAR *server, bool rediscovery) } /* Try to get any available domain controller for this domain */ - dret = DsGetDcNameW (NULL, domain, NULL, NULL, - rediscovery ? DS_FORCE_REDISCOVERY : 0, &pci); - if (dret == ERROR_SUCCESS) + ret = DsGetDcNameW (NULL, domain, NULL, NULL, + rediscovery ? DS_FORCE_REDISCOVERY : 0, &pci); + if (ret == ERROR_SUCCESS) { wcscpy (server, pci->DomainControllerName); NetApiBufferFree (pci); debug_printf ("DC: rediscovery: %d, server: %W", rediscovery, server); return true; } - else if (dret == ERROR_PROC_NOT_FOUND) - { - /* NT4 w/o DSClient */ - if (rediscovery) - dret = NetGetAnyDCName (NULL, domain, (LPBYTE *) &buf); - else - dret = NetGetDCName (NULL, domain, (LPBYTE *) &buf); - if (dret == NERR_Success) - { - wcscpy (server, buf); - NetApiBufferFree (buf); - debug_printf ("NT: rediscovery: %d, server: %W", rediscovery, server); - return true; - } - } - __seterrno_from_win_error (dret); + __seterrno_from_win_error (ret); return false; } @@ -972,8 +956,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw) if (status != STATUS_SUCCESS) { debug_printf ("LsaRegisterLogonProcess: %p", status); - __seterrno_from_nt_status (status == ERROR_PROC_NOT_FOUND - ? STATUS_PROCEDURE_NOT_FOUND : status); + __seterrno_from_nt_status (status); goto out; } else if (GetLastError () == ERROR_PROC_NOT_FOUND) |