From 1dba1fccee562ead9a1245c4eadb86580974cd1f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 7 Feb 2009 20:12:12 +0100 Subject: [PATCH] Don't fail motd command when motdfil can't be read Not the player's business. Simply treat it as no MOTD. --- src/lib/player/player.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 722711578..68851e876 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -265,25 +265,24 @@ show_motd(void) if (errno == ENOENT) return RET_OK; else { - pr ("Could not open motd.\n"); logerror("Could not open motd (%s).\n", motdfil); - return RET_FAIL; + return RET_OK; } } if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) { logerror("bad header on login message (motdfil)"); fclose(motd_fp); - return RET_FAIL; + return RET_OK; } if (tgm.tel_length >= (long)sizeof(buf)) { logerror("text length (%ld) is too long for login message (motdfil)", tgm.tel_length); fclose(motd_fp); - return RET_FAIL; + return RET_OK; } if (fread(buf, tgm.tel_length, 1, motd_fp) != 1) { logerror("bad length %ld on login message", tgm.tel_length); fclose(motd_fp); - return RET_FAIL; + return RET_OK; } buf[tgm.tel_length] = 0; uprnf(buf); -- 2.43.0