From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 17/19] agetty: replace gethostbyname() with getaddrinfo()
Date: Sun, 14 Oct 2012 21:21:08 +0100 [thread overview]
Message-ID: <1350246070-10544-18-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1350246070-10544-1-git-send-email-kerolasa@iki.fi>
The gethostbyname() is legacy function which may be withdrawn in a
future.
Reference: http://pubs.opengroup.org/onlinepubs/009695399/functions/gethostbyname.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
term-utils/agetty.8 | 2 +-
term-utils/agetty.c | 20 ++++++++++++++++----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index e400ec8..e51017d 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -215,7 +215,7 @@ no hostname at all will be shown.
\-\-long\-hostname
By default the hostname is only printed until the first dot. With
this option enabled, the full qualified hostname by gethostname()
-or if not found by gethostbyname() is shown.
+or if not found by getaddrinfo() is shown.
.TP
\-\-version
Output version information and exit.
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 244ea29..ac7c16c 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -1298,17 +1298,29 @@ static void do_prompt(struct options *op, struct termios *tp)
if (!hn)
log_err(_("failed to allocate memory: %m"));
if (gethostname(hn, sysconf(_SC_HOST_NAME_MAX)) == 0) {
- struct hostent *ht;
char *dot = strchr(hn, '.');
if ((op->flags & F_LONGHNAME) == 0) {
if (dot)
*dot = '\0';
write_all(STDOUT_FILENO, hn, strlen(hn));
- } else if (dot == NULL && (ht = gethostbyname(hn)))
- write_all(STDOUT_FILENO, ht->h_name, strlen(ht->h_name));
- else
+ } else if (dot == NULL) {
+ struct addrinfo *res, hints;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ if (!getaddrinfo(hn, NULL, &hints, &res)) {
+ write_all(STDOUT_FILENO,
+ res->ai_canonname,
+ strlen(res->ai_canonname));
+ freeaddrinfo(res);
+ } else {
+ freeaddrinfo(res);
+ goto printhn;
+ }
+ } else {
+ printhn:
write_all(STDOUT_FILENO, hn, strlen(hn));
+ }
write_all(STDOUT_FILENO, " ", 1);
}
free(hn);
--
1.7.12.2
next prev parent reply other threads:[~2012-10-14 20:21 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 20:20 [PATCH 00/19] compliancy fixes Sami Kerola
2012-10-14 20:20 ` [PATCH 01/19] last: stop using MAXHOSTNAMELEN Sami Kerola
2012-10-15 1:46 ` Mike Frysinger
2012-10-14 20:20 ` [PATCH 02/19] login: " Sami Kerola
2012-10-14 20:20 ` [PATCH 03/19] write: " Sami Kerola
2012-10-15 2:12 ` Mike Frysinger
[not found] ` <20121015152558.GK18377@x2.net.home>
2012-10-18 20:06 ` Sami Kerola
2012-10-22 6:01 ` Mike Frysinger
2012-10-22 8:06 ` Karel Zak
2012-10-22 8:09 ` Karel Zak
2012-10-22 20:03 ` Mike Frysinger
2012-10-22 20:22 ` Karel Zak
2012-10-14 20:20 ` [PATCH 04/19] agetty: " Sami Kerola
2012-10-14 20:20 ` [PATCH 05/19] c.h: remove unnecessary MAXHOSTNAMELEN fallback definition Sami Kerola
2012-10-14 20:20 ` [PATCH 06/19] docs: add line breaks to whereis.1 Sami Kerola
2012-10-14 20:20 ` [PATCH 07/19] sd-daemon: fix cppcheck warnings Sami Kerola
2012-10-14 22:10 ` Dave Reisner
2012-10-15 8:32 ` Sami Kerola
2012-10-14 20:20 ` [PATCH 08/19] libmount: replace usleep with nanosleep Sami Kerola
2012-10-15 2:14 ` Mike Frysinger
2012-10-14 20:21 ` [PATCH 09/19] include/all-io: " Sami Kerola
2012-10-14 20:21 ` [PATCH 10/19] hwclock: " Sami Kerola
2012-10-14 20:21 ` [PATCH 11/19] rtcwake: " Sami Kerola
2012-10-14 20:21 ` [PATCH 12/19] agetty: " Sami Kerola
2012-10-14 20:21 ` [PATCH 13/19] tailf: " Sami Kerola
2012-10-14 20:21 ` [PATCH 14/19] include/usleep: remove remaining references to usleep Sami Kerola
2012-10-14 20:21 ` [PATCH 15/19] libmount, eject: replace index() and rindex() with strrch() or strrchr() Sami Kerola
2012-10-15 2:14 ` Mike Frysinger
2012-10-14 20:21 ` [PATCH 16/19] logger: replace gethostbyname() with getaddrinfo() Sami Kerola
2012-10-14 20:21 ` Sami Kerola [this message]
2012-10-14 20:21 ` [PATCH 18/19] build-sys: remove gethostbyname() check Sami Kerola
2012-10-14 20:21 ` [PATCH 19/19] fsck.cramfs: replace utime() with utimensat() Sami Kerola
2012-10-15 2:17 ` Mike Frysinger
2012-10-15 8:36 ` Sami Kerola
2012-10-15 17:39 ` Mike Frysinger
2012-10-22 9:07 ` [PATCH 00/19] compliancy fixes Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350246070-10544-18-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).