diff --git a/ChangeLog b/ChangeLog
index 70eb5a68aa..5dc903aadb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/posix/getaddrinfo.c (getaddrinfo): Correct test for
+	invalid ai_flags.
+
 1999-02-15  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* manual/llio.texi (Waiting for I/O): Correct meaning.  Patch by
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 7502e00e6a..884a27c4e1 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -533,7 +533,7 @@ getaddrinfo (const char *name, const char *service,
   if (hints == NULL)
     hints = &default_hints;
 
-  if (hints->ai_flags & ~3)
+  if (hints->ai_flags & ~(AI_PASSIVE|AI_CANANONNAME|AI_NUMERICHOST))
     return EAI_BADFLAGS;
 
   if ((hints->ai_flags & AI_CANONNAME) && name == NULL)