From bb89bdd8a9ffc11fa9cdf72451cba9248fa9bd89 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Mon, 26 Sep 2016 21:42:34 +0200
Subject: [PATCH] Refactor fallback handling in getent()

This patch factors out the fgetint() fallback code for parsing
/etc/services and /etc/protocols.  Useful on systems with a
malfunctioning C library.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 inetd.c | 52 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/inetd.c b/inetd.c
index 90911842..0d57e84e 100644
--- a/inetd.c
+++ b/inetd.c
@@ -321,9 +321,8 @@ void inetd_stop(inetd_t *inetd)
 	}
 }
 
-static struct servent *getent_service(char *service, char *proto)
+static struct servent *fallback_service(char *service, char *proto)
 {
-#ifdef ENABLE_STATIC
 	int service_num;
 	static struct servent lfs;
 
@@ -339,29 +338,50 @@ static struct servent *getent_service(char *service, char *proto)
 	}
 
 	return NULL;
+}
+
+static struct servent *getent_service(char *service, char *proto)
+{
+	struct servent *ent;
+
+#ifdef ENABLE_STATIC
+	ent = fallback_service(service, proto);
 #else
-	return getservbyname(service, proto);
+	ent = getservbyname(service, proto);
+	if (!ent)
+		ent = fallback_service(service, proto);
 #endif
+	return ent;
+}
+
+static struct protoent *fallback_proto(char *proto)
+{
+	int proto_num;
+	static struct protoent lfp;
+
+	proto_num = fgetint("/etc/protocols", " \n\t", proto);
+	if (proto_num > 0) {
+		lfp.p_name  = proto;
+		lfp.p_proto = proto_num;
+
+		return &lfp;
+	}
+
+	return NULL;
 }
 
 static struct protoent *getent_proto(char *proto)
 {
+	struct protoent *ent;
+
 #ifdef ENABLE_STATIC
-		int proto_num;
-		static struct protoent lfp;
-
-		proto_num = fgetint("/etc/protocols", " \n\t", proto);
-		if (proto_num > 0) {
-			lfp.p_name  = proto;
-			lfp.p_proto = proto_num;
-
-			return &lfp;
-		}
-
-		return NULL;
+	ent = fallback_proto(proto);
 #else
-		return getprotobyname(proto);
+	ent = getprotobyname(proto);
+	if (!ent)
+		ent = fallback_proto(proto);
 #endif
+	return ent;
 }
 
 static int getent(char *service, char *proto, struct servent **sv, struct protoent **pv)