diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | nss/db-Makefile | 21 | ||||
| -rw-r--r-- | nss/nss_files/files-service.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if.h | 2 |
4 files changed, 43 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 0c805a97fe..08e9a45261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ -1998-01-24 15:13 Ulrich Drepper <drepper@happy.cygnus.com> +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> * nss/db-Makefile: Handle empty and comment lines better. ($(VAR_DB)/services.db): Generate entries with missing protocol value. - + 1998-01-23 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-service.c (getservbyport): Allow proto == @@ -112,12 +117,12 @@ * sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to _NSIG + 1. - + 1998-01-02 15:10 Matthias Urlichs <urlichs@noris.de> * Rules: Add explicit rule for dummy.o; at least one library needs it and it isn't autogenerated by the default rules. - + 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c: Tweak epsilons. @@ -138,7 +143,7 @@ message. 1998-01-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> - + * nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include terminating null in key size. @@ -173,7 +178,7 @@ * time/leapseconds: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. - + 1998-01-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-alias.c (get_next_alias): Do mail alias @@ -209,13 +214,13 @@ signal" message. 1998-01-19 15:08 Ulrich Drepper <drepper@cygnus.com> - + * locale/programs/charmap.c (parse_charmap): Correct parsing of ellipsis expressions. * locale/programs/charset.c (insert_char): Correctly insert value of eliipsis expression. - + 1997-12-28 15:08 Ulrich Drepper <drepper@cygnus.com> * sysdeps/powerpc/__longjmp.S: Define _SETJMP_H before including 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) diff --git a/sysdeps/unix/sysv/linux/net/if.h b/sysdeps/unix/sysv/linux/net/if.h index dd33af0337..3591dded7f 100644 --- a/sysdeps/unix/sysv/linux/net/if.h +++ b/sysdeps/unix/sysv/linux/net/if.h @@ -145,6 +145,8 @@ struct ifreq #define ifr_slave ifr_ifru.ifru_slave /* slave device */ #define ifr_data ifr_ifru.ifru_data /* for use by interface */ #define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ +#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ +#define ifr_qlen ifr_ifru.ifru_ivalue /* queue length */ /* Structure used in SIOCGIFCONF request. Used to retrieve interface |