diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-01-24 14:01:59 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-01-24 14:04:42 +0100 |
| commit | c6171b9fde818b058b710c5e146bdecd963b7e9e (patch) | |
| tree | 5bbfcf0aabe5bbf81d711917c69e21fc21f145c1 | |
| parent | 04e3dc112884313b79ff346651d6219e85aba7fd (diff) | |
| download | cygnal-c6171b9fde818b058b710c5e146bdecd963b7e9e.tar.gz cygnal-c6171b9fde818b058b710c5e146bdecd963b7e9e.tar.bz2 cygnal-c6171b9fde818b058b710c5e146bdecd963b7e9e.zip | |
Cygwin: gethostname: fix fetching hostname from non-winsock function
If gethostname() fails we call GetComputerNameEx with
ComputerNameDnsFullyQualified. This is wrong, gethostname should return
the hostname only, not the FQDN. Fix this by calling GetComputerNameEx
with ComputerNameDnsHostname.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/net.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/release/2.12.0 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index cfd29d191..2af71f7e5 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -718,7 +718,7 @@ cygwin_gethostname (char *name, size_t len) { DWORD local_len = len; - if (!GetComputerNameExA (ComputerNameDnsFullyQualified, name, + if (!GetComputerNameExA (ComputerNameDnsHostname, name, &local_len)) { if (GetLastError () == ERROR_MORE_DATA) diff --git a/winsup/cygwin/release/2.12.0 b/winsup/cygwin/release/2.12.0 index c847b91c0..5835952ee 100644 --- a/winsup/cygwin/release/2.12.0 +++ b/winsup/cygwin/release/2.12.0 @@ -79,3 +79,5 @@ Bug Fixes Addresses: https://cygwin.com/ml/cygwin/2018-12/msg00173.html - Fix thread names in GDB when cygthreads get reused. + +- Fix return value of gethostname in a border case. |