about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-02 19:42:29 +0000
committerRoland McGrath <roland@gnu.org>1996-07-02 19:42:29 +0000
commit54955962d2b2660b5aaede52557333f608d293a6 (patch)
tree7aea43780858a9137defa783097eccc41bb55521
parent96bda0ea44eb94e0284e91f20ba9733ae63f26a5 (diff)
downloadglibc-54955962d2b2660b5aaede52557333f608d293a6.tar.gz
glibc-54955962d2b2660b5aaede52557333f608d293a6.tar.xz
glibc-54955962d2b2660b5aaede52557333f608d293a6.zip
* nss/nss_files/files-ethers.c (ntohost): Fix db key.
-rw-r--r--ChangeLog2
-rw-r--r--nss/nss_files/files-ethers.c6
-rw-r--r--stdio-common/tst-ungetc.c1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a6586f43c..2e7b1a433c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Tue Jul  2 10:44:37 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* nss/nss_files/files-ethers.c (ntohost): Fix db key.
+
 	* nss/nss_files/files-network.c: Pass empty for new DB_LOOKUP args.
 	(DATABASE): Define this instead of DATAFILE.
 	* nss/nss_files/files-hosts.c: Likewise.
diff --git a/nss/nss_files/files-ethers.c b/nss/nss_files/files-ethers.c
index 70f7d07dbd..290d931c97 100644
--- a/nss/nss_files/files-ethers.c
+++ b/nss/nss_files/files-ethers.c
@@ -64,8 +64,10 @@ DB_LOOKUP (hostton, 1 + strlen (name), (".%s", name),
 	       break;
 	   }, const char *name)
 
-DB_LOOKUP (ntohost, 7, ("=%c%c%c%c%c%c",
-			addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]),
+DB_LOOKUP (ntohost, 18, ("=%x:%x:%x:%x:%x:%x",
+			 addr->ether_addr_octet[0], addr->ether_addr_octet[1],
+			 addr->ether_addr_octet[2], addr->ether_addr_octet[3],
+			 addr->ether_addr_octet[4], addr->ether_addr_octet[5]),
 	   {
 	     if (memcmp (&result->e_addr, addr,
 			 sizeof (struct ether_addr)) == 0)
diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c
index 67c45d4028..ba74a84f7f 100644
--- a/stdio-common/tst-ungetc.c
+++ b/stdio-common/tst-ungetc.c
@@ -1,6 +1,7 @@
 /* Test for ungetc bugs.  */
 
 #include <stdio.h>
+#include <unistd.h>
 
 #define assert(x) \
   if (!(x)) \