[PATCH] __lookup_serv: return correct error code

[PATCH] __lookup_serv: return correct error code

[A. Wilcox]

From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>

If AI_NUMERICSERV is specified and a numeric service was not provided,
POSIX mandates getaddrinfo return EAI_NONAME.  EAI_SERVICE is only for
services that cannot be used on the specified socket type.
---
 src/network/lookup_serv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/lookup_serv.c b/src/network/lookup_serv.c
index 66ebaea..403b12a 100644
--- a/src/network/lookup_serv.c
+++ b/src/network/lookup_serv.c
@@ -64,7 +64,7 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro
 		return cnt;
 	}
 
-	if (flags & AI_NUMERICSERV) return EAI_SERVICE;
+	if (flags & AI_NUMERICSERV) return EAI_NONAME;
 
 	size_t l = strlen(name);
 
-- 
2.10.0

Re: [PATCH] __lookup_serv: return correct error code

[Rich Felker]

On Thu, Sep 14, 2017 at 03:53:21PM -0500, A. Wilcox wrote:
> From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
> 
> If AI_NUMERICSERV is specified and a numeric service was not provided,
> POSIX mandates getaddrinfo return EAI_NONAME.  EAI_SERVICE is only for
> services that cannot be used on the specified socket type.
> ---
>  src/network/lookup_serv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/network/lookup_serv.c b/src/network/lookup_serv.c
> index 66ebaea..403b12a 100644
> --- a/src/network/lookup_serv.c
> +++ b/src/network/lookup_serv.c
> @@ -64,7 +64,7 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro
>  		return cnt;
>  	}
>  
> -	if (flags & AI_NUMERICSERV) return EAI_SERVICE;
> +	if (flags & AI_NUMERICSERV) return EAI_NONAME;
>  
>  	size_t l = strlen(name);
>  
> -- 
> 2.10.0

I think you've uncovered a larger bug than the patch fixes; it looks
like most of the EAI_SERVICE return points in __lookup_serv are wrong.
Most should probably be EAI_NONAME; a couple should possibly be
EAI_SOCKTYPE. Thoughts?

Rich

Re: [PATCH] __lookup_serv: return correct error code

[Rich Felker]

On Thu, Sep 14, 2017 at 05:48:17PM -0400, Rich Felker wrote:
> On Thu, Sep 14, 2017 at 03:53:21PM -0500, A. Wilcox wrote:
> > From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
> > 
> > If AI_NUMERICSERV is specified and a numeric service was not provided,
> > POSIX mandates getaddrinfo return EAI_NONAME.  EAI_SERVICE is only for
> > services that cannot be used on the specified socket type.
> > ---
> >  src/network/lookup_serv.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/network/lookup_serv.c b/src/network/lookup_serv.c
> > index 66ebaea..403b12a 100644
> > --- a/src/network/lookup_serv.c
> > +++ b/src/network/lookup_serv.c
> > @@ -64,7 +64,7 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro
> >  		return cnt;
> >  	}
> >  
> > -	if (flags & AI_NUMERICSERV) return EAI_SERVICE;
> > +	if (flags & AI_NUMERICSERV) return EAI_NONAME;
> >  
> >  	size_t l = strlen(name);
> >  
> > -- 
> > 2.10.0
> 
> I think you've uncovered a larger bug than the patch fixes; it looks
> like most of the EAI_SERVICE return points in __lookup_serv are wrong.
> Most should probably be EAI_NONAME; a couple should possibly be
> EAI_SOCKTYPE. Thoughts?

On further consideration, "AI_NUMERICSERV was specified and the
argument is not a numeric string" seems like the only case that
explicitly mandates EAI_NONAME. Specification of EAI_SERVICE is really
ambiguous/underspecified though. The patch is probably okay as-is.

Rich