diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-01-24 12:08:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-01-24 12:08:37 +0000 |
| commit | ecb9d3e182343fb4a89e4446e41037c6971b1657 (patch) | |
| tree | 257cff3ee3b08e2f3ff6070d7873f5fdedd922c3 /nss | |
| parent | 2f954871a4e32c3a26649e3223cd169367ece097 (diff) | |
| download | glibc-ecb9d3e182343fb4a89e4446e41037c6971b1657.tar.gz glibc-ecb9d3e182343fb4a89e4446e41037c6971b1657.tar.xz glibc-ecb9d3e182343fb4a89e4446e41037c6971b1657.zip | |
Update.
1998-01-24 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/net/if.h (ifr_bandwidth, ifr_qlen): Added to follow latest kernel development. 1998-01-24 15:13 Ulrich Drepper <drepper@happy.cygnus.com>
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/db-Makefile | 21 | ||||
| -rw-r--r-- | nss/nss_files/files-service.c | 14 |
2 files changed, 28 insertions, 7 deletions
diff --git a/nss/db-Makefile b/nss/db-Makefile index b3f1ed4ad5..a0dad0fd6a 100644 --- a/nss/db-Makefile +++ b/nss/db-Makefile @@ -32,6 +32,8 @@ all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) $(VAR_DB)/passwd.db: /etc/passwd @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ printf "=%s ", $$3; print }' $^ | \ @@ -41,6 +43,8 @@ $(VAR_DB)/passwd.db: /etc/passwd $(VAR_DB)/group.db: /etc/group @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ printf "=%s ", $$3; print }' $^ | \ @@ -50,6 +54,8 @@ $(VAR_DB)/group.db: /etc/group $(VAR_DB)/ethers.db: /etc/ethers @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ printf "=%s ", $$2; print }' $^ | \ @@ -59,6 +65,8 @@ $(VAR_DB)/ethers.db: /etc/ethers $(VAR_DB)/protocols.db: /etc/protocols @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ printf "=%s ", $$2; print; \ @@ -70,6 +78,8 @@ $(VAR_DB)/protocols.db: /etc/protocols $(VAR_DB)/rpc.db: /etc/rpc @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ printf "=%s ", $$2; print; \ @@ -81,17 +91,24 @@ $(VAR_DB)/rpc.db: /etc/rpc $(VAR_DB)/services.db: /etc/services @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS="[ \t/]+"; cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s/%s ", $$1, $$3; print; \ + printf ".%s/ ", $$1; print; \ printf "=%s/%s ", $$2, $$3; print; \ + printf "=%s/ ", $$2; print; \ for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \ - { printf ".%s/%s ", $$i, $$3; print } }' $^ | \ + { printf ".%s/%s ", $$i, $$3; print; \ + printf ".%s/ ", $$i; print } }' $^ | \ $(MAKEDB) -o $@ - @echo "done." $(VAR_DB)/shadow.db: /etc/shadow @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ $(MAKEDB) -o $@ - @@ -100,6 +117,8 @@ $(VAR_DB)/shadow.db: /etc/shadow $(VAR_DB)/netgroup.db: /etc/netgroup @echo -n "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { cnt=0 } \ + /^[ \t]*$$/ { next } \ + /^[ \t]*#/ { next } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { end=sub(/\\/, " "); \ gsub(/[ \t]+/, " "); \ diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 186b8a27fc..b63fafcd1e 100644 --- a/nss/nss_files/files-service.c +++ b/nss/nss_files/files-service.c @@ -1,5 +1,5 @@ /* Services file parser in nss_files module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -39,8 +39,8 @@ LINE_PARSER #include GENERIC -DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto), - (".%s/%s", name, proto), +DB_LOOKUP (servbyname, 2 + strlen (name) + (proto ? strlen (proto) : 0), + (".%s/%s", name, proto ?: ""), { /* Must match both protocol (if specified) and name. */ if (proto != NULL && strcmp (result->s_proto, proto)) @@ -49,10 +49,12 @@ DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto), }, const char *name, const char *proto) -DB_LOOKUP (servbyport, 21 + strlen (proto), ("=%d/%s", port, proto), +DB_LOOKUP (servbyport, 21 + (proto ? strlen (proto) : 0), + ("=%d/%s", ntohs (port), proto ?: ""), { /* Must match both port and protocol. */ - if (result->s_port == port - && strcmp (result->s_proto, proto) == 0) + if (result->s_port == ntohs (port) + && (proto == NULL + || strcmp (result->s_proto, proto) == 0)) break; }, int port, const char *proto) |