From d19c050837ac2d835d1b9bdf9a9717c66bdf4b79 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Wed, 6 Apr 2016 22:22:39 +1000 Subject: [PATCH] Fix handling of "host.domain" style server names in ov_server() The old code would return "omain" rather than "domain" in this case. Also remove unneccesary checks on the return value of get_server_itsname() - this function already falls back to 'name' if 'itsname' isn't set yet. --- source/output.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/source/output.c b/source/output.c index a176cca..4fa9c72 100644 --- a/source/output.c +++ b/source/output.c @@ -279,20 +279,16 @@ char *ov_server(int server) char *c; char *d; static char tmpstr[61]; - char *string = get_server_itsname(server); + const char *string = get_server_itsname(server); - if (!string || !*string) - string = get_server_name(server); - if (!string || !*string) - return empty_string; strlcpy(tmpstr, string, sizeof tmpstr); if (!(c = strrchr(tmpstr,'.'))) - return(string); + return tmpstr; *c = 0; if (!(d = strrchr(tmpstr, '.'))) - d = ++c; /* Extract domain */ + d = c; /* Extract domain */ d++; - return(d); + return d; } void serversay(int save, int from_server, const char *format, ...)