about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-29 18:12:01 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-29 18:12:01 +0000
commit30f1226b0b921c541d539450e5b6fe8af7fc4ab9 (patch)
treee6b03d73295b23e8b8da7cf341e31e9fb1948937
parent1a6c971d0030bdd01aacbee3bbb52602f5ab6b4c (diff)
downloadglibc-30f1226b0b921c541d539450e5b6fe8af7fc4ab9.tar.gz
glibc-30f1226b0b921c541d539450e5b6fe8af7fc4ab9.tar.xz
glibc-30f1226b0b921c541d539450e5b6fe8af7fc4ab9.zip
Update.
2000-08-29  Ulrich Drepper  <drepper@redhat.com>

	* inet/rcmd.c (__checkhost_sa): If getnameinfo succeeds but the
	names don't match don't return.
	Patch by Olaf Kirch <okir@flash.lst.de>.
-rw-r--r--ChangeLog6
-rw-r--r--inet/rcmd.c5
-rw-r--r--localedata/locales/sv_SE4
-rw-r--r--posix/Makefile1
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 70c0b6cf09..60cf8640ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* inet/rcmd.c (__checkhost_sa): If getnameinfo succeeds but the
+	names don't match don't return.
+	Patch by Olaf Kirch <okir@flash.lst.de>.
+
 2000-08-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* time/strftime.c (my_strftime): Handle # flag for %b as well.
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 6c01f96811..16ad02b438 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -615,8 +615,9 @@ __checkhost_sa (struct sockaddr *ra, size_t ralen, char *lhost,
 	/* XXX */
 	if (getnameinfo(ra, ralen,
 			raddr, sizeof(raddr), NULL, 0,
-			NI_NUMERICHOST) == 0)
-		return negate * (strcmp(raddr, lhost) == 0);
+			NI_NUMERICHOST) == 0
+	    && strcmp(raddr, lhost) == 0)
+		return negate;
 
 	/* Better be a hostname. */
 	match = 0;
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index 167e855c29..3d5b6a5310 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -78,9 +78,9 @@ reorder-after <z>
 % words or names are only to be distinguished by 'v' or % 'w', 'v' is
 % placed before 'w'.
 reorder-after <U0056>
-<U0057> <v>;<BAS>;<CAP>;<w> # W
+<U0057> <v>;<BAS>;<CAP>;<w> % W
 reorder-after <U0076>
-<U0077> <w>;<BAS>;<MIN>;<w> # w
+<U0077> <v>;<BAS>;<MIN>;<w> % w
 
 reorder-after <U00E3>
 <U00E4> <ae>;<REU>;<MIN>;IGNORE % ä
diff --git a/posix/Makefile b/posix/Makefile
index f313bb4d66..d1dc009bf4 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -85,6 +85,7 @@ generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \
 
 include ../Rules
 
+ifeq (yes,$(built-static-nss))
 # We need it for "make check" only. We can skip them if they haven't
 # been built yet during "make".
 otherlibs += $(wildcard $(nssobjdir)/libnss_files.a \