diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-01-30 11:44:34 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-01-30 11:44:34 +0000 |
commit | 6591c3356242ba48627beb29345e4e44242c7068 (patch) | |
tree | 402220c75072909733e8d383ea5b999f30f1f527 /nss | |
parent | 7f0ff1b04ad67b1a4f624a8ad54e7533d1c8aab3 (diff) | |
download | glibc-6591c3356242ba48627beb29345e4e44242c7068.tar.gz |
Update.
1998-01-30 19:58 Ulrich Drepper <drepper@cygnus.com>
* include/cpio.h: Move to ...
* posix/cpio.h: ...here.
* locale/programs/ld-collate.c: Fix typo.
* signal/signal.h: Declare _sys_siglist with NSIG+1 elements.
* stdio-common/tiformat.c: Add checks for %#.0o and friends.
* login/utmp_file.c (pututline_file): Don't always report success
if similar entry is found. Patch by Mark M. Kettenis.
1998-01-30 16:06 Philip Blundell <pb@nexus.co.uk>
* manual/Makefile: Don't try to install the info files if makeinfo
is not available.
1998-01-30 12:05 Philip Blundell <pb@nexus.co.uk>
* sysdeps/unix/sysv/linux/bits/ioctls.h: Include a copy of the
kernel's network ioctls, rather than using <linux/sockios.h> to
get them. This way we are sure of maintaining compatibility if
the kernel interface should change.
1998-01-30 15:52 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Dist: Add netrose/rose.h.
1998-01-25 19:54 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/unix/sysv/linux/netrose/rose.h: New file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install it.
1998-01-27 22:29 Zack Weinberg <zack@rabi.phys.columbia.edu>
Implement System V pseudoterminal handling.
* login/Makefile
(routines): Add getpt, grantpt, unlockpt, ptsname.
(libutil-routines): Remove pty. Add openpty, forkpty.
(distribute): New internal header pty-internal.h.
(others): Add the helper program, pt_chown.
(install-others): Install it, in $(libexecdir), mode 4755.
* login/pty-internal.h: New file.
* login/openpty.c: New file.
* login/forkpty.c: New file.
* login/programs/pt_chown.c: New file.
* libc.map: Add getpt, grantpt, unlockpt, ptsname, ptsname_r.
* stdlib/stdlib.h: Prototype them.
* config.make.in: Define $(libexecdir).
* Makeconfig: Define $(inst_libexecdir).
* sysdeps/generic/pty.c: Removed.
* sysdeps/unix/sysv/linux/pty.c: Removed.
* sysdeps/generic/getpt.c: Stub out.
* sysdeps/generic/grantpt.c: Likewise.
* sysdeps/generic/ptsname.c: Likewise.
* sysdeps/generic/unlockpt.c: Likewise.
* sysdeps/unix/grantpt.c: New file.
* sysdeps/unix/bsd/getpt.c: New file.
* sysdeps/unix/bsd/unlockpt.c: New file.
* sysdeps/unix/sysv/linux/getpt.c: New file.
* sysdeps/unix/sysv/linux/ptsname.c: New file.
* sysdeps/unix/sysv/linux/unlockpt.c: New file.
1998-01-29 23:56 Ulrich Drepper <drepper@cygnus.com>
* localedata/locales/ru_RU: Fix YESEXPR. Patch by lav@yars.free.net.
1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nss/Makefile (tests): Add rule for test-netdb.c.
* nss/test-netdb.c: New file.
1998-01-29 02:38 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-open.c (_dl_open): Make sure the variable `reloc' is
really kept as a variable. Patch by Richard Henderson,
reported by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>.
* elf/rtld.c (dl_main): Call _dl_init_paths before handling preloading.
* elf/genrtldtbl.awk: Mark machine dependent directory of generated
entries as not existing.
1998-01-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* stdio-common/vfprintf.c (process_arg): Fix printing of octal
zero in alternate form with precision of zero, which must produce
"0". Add braces to avoid ambiguous `else'.
1998-01-26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Fix memory leak and trailing null
problem with strncpy.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/comapt-spwd.c: Likewise.
1998-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* assert/assert.h (assert_perror): Correct test for errnum. Patch
by uch@nop.or.jp. [PR libc/437]
1997-12-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* locales/pl_PL: Fix int_curr_symbol.
1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nis/nis_cache.c: Include <unistd.h> for declaration of close.
1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* stdio-common/test-popen.c: Include <errno.h>.
* sysdeps/unix/sysv/linux/if_index.c: Include <unistd.h> for
close.
* inet/getnetgrent_r.c: Include <errno.h>.
* db2/db/db_conv.c: Include <string.h> for memcpy.
* gmon/bb_exit_func.c: Include <string.h> instead of <strings.h>
so that memcpy is declared.
* iconv/iconv_open.c: Include <stdlib.h> for alloca.
* misc/init-misc.c: Remove unneeded inclusion of <errno.h>.
1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* pwd/fgetpwent_r.c (__fgetpwent_r): Correctly handle buffer
overflow while reading line with fgets.
* grp/fgetgrent_r.c (__fgetgrent_r): Likewise.
1998-01-27 00:46 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/bits/types.h (__ipc_pid_t): Change to
unsigned short, not short.
Reported by Andreas Jaeger.
1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/mips/syscalls.list: Correct typo
(ccept->accept).
* sysdeps/generic/inttypes.h: Fix spelling.
1998-01-04 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/arm/Dist: Add bits/mman.h.
* sysdeps/unix/sysv/linux/alpha/Dist: Add net/route.h.
1998-01-27 00:30 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/printf.h (struct print_info): Add new bitfield is_char.
* stdio-common/printf-parse.h (parse_one_spec): Fill in is_char
field for hh modifier.
* stdio-common/vfprint.c: Use is_char field and do not depend in
is_short having the value 2.
Bug reported by Andreas Jaeger.
1998-01-05 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* libio/freopen.c (freopen): Call _IO_old_freopen only if defined
PIC && DO_VERSIONING.
1998-01-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Rules: Add rules for $(common-objpfx)dummy$o.
Diffstat (limited to 'nss')
-rw-r--r-- | nss/Makefile | 4 | ||||
-rw-r--r-- | nss/test-netdb.c | 349 |
2 files changed, 352 insertions, 1 deletions
diff --git a/nss/Makefile b/nss/Makefile index 904d3ec423..e0fceee93e 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -1,4 +1,4 @@ -# 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 @@ -36,6 +36,8 @@ routines = nsswitch $(addsuffix -lookup,$(databases)) databases = proto service hosts network grp pwd rpc ethers \ spwd netgrp key alias +tests = test-netdb + include ../Makeconfig # Specify rules for the nss_* modules. We have some services. diff --git a/nss/test-netdb.c b/nss/test-netdb.c new file mode 100644 index 0000000000..918bbeb7c3 --- /dev/null +++ b/nss/test-netdb.c @@ -0,0 +1,349 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1998. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + Testing of some network related lookup functions. + The system databases looked up are: + - /etc/services + - /etc/hosts + - /etc/networks + - /etc/protocols + - /etc/rpc + The tests try to be fairly generic and simple so that they work on + every possible setup (and might therefore not detect some possible + errors). +*/ + +#include <netdb.h> +#include <rpc/netdb.h> +#include <stdio.h> +#include <arpa/inet.h> +#include <netinet/in.h> +#include <sys/param.h> +#include <sys/socket.h> + +/* + The following define is neccessary for glibc 2.0.6 +*/ +#ifndef INET6_ADDRSTRLEN +# define INET6_ADDRSTRLEN 46 +#endif + +int error_count; + +void +output_servent (const char *call, struct servent *sptr) +{ + char **pptr; + + if (sptr == NULL) + printf ("Call: %s returned NULL\n", call); + else + { + printf ("Call: %s, returned: s_name: %s, s_port: %d, s_proto: %s\n", + call, sptr->s_name, ntohs(sptr->s_port), sptr->s_proto); + for (pptr = sptr->s_aliases; *pptr != NULL; pptr++) + printf (" alias: %s\n", *pptr); + } +} + + +void +test_services (void) +{ + struct servent *sptr; + + sptr = getservbyname ("domain", "tcp"); + output_servent ("getservbyname (\"domain\", \"tcp\")", sptr); + + sptr = getservbyname ("domain", "udp"); + output_servent ("getservbyname (\"domain\", \"udp\")", sptr); + + sptr = getservbyname ("domain", NULL); + output_servent ("getservbyname (\"domain\", NULL)", sptr); + + sptr = getservbyname ("not-existant", NULL); + output_servent ("getservbyname (\"not-existant\", NULL)", sptr); + + sptr = getservbyport (htons(53), "tcp"); + output_servent ("getservbyport (htons(53), \"tcp\")", sptr); + + sptr = getservbyport (htons(53), NULL); + output_servent ("getservbyport (htons(53), NULL)", sptr); + + sptr = getservbyport (htons(1), "udp"); /* shouldn't exist */ + output_servent ("getservbyport (htons(1), \"udp\")", sptr); + + setservent (0); + do + { + sptr = getservent (); + output_servent ("getservent ()", sptr); + } + while (sptr != NULL); + endservent (); +} + + +void +output_hostent (const char *call, struct hostent *hptr) +{ + int i; + char **pptr; + char buf[INET6_ADDRSTRLEN]; + + if (hptr == NULL) + printf ("Call: %s returned NULL\n", call); + else + { + printf ("Call: %s returned: name: %s, addr_type: %d\n", + call, hptr->h_name, hptr->h_addrtype); + for (pptr = hptr->h_aliases; *pptr != NULL; pptr++) + printf (" alias: %s\n", *pptr); + + for (pptr = hptr->h_addr_list; *pptr != NULL; pptr++) + printf (" ip: %s\n", + inet_ntop (hptr->h_addrtype, *pptr, buf, sizeof (buf))); + } +} + +void +test_hosts (void) +{ + struct hostent *hptr1, *hptr2; + char name[MAXHOSTNAMELEN]; + size_t namelen = sizeof(name); + struct in_addr ip; + + hptr1 = gethostbyname ("localhost"); + hptr2 = gethostbyname ("LocalHost"); + if (hptr1 != NULL || hptr2 != NULL) + { + if (hptr1 == NULL) + { + printf ("localhost not found - but LocalHost found:-(\n"); + ++error_count; + } + else if (hptr2 == NULL) + { + printf ("LocalHost not found - but localhost found:-(\n"); + ++error_count; + } + else if (strcmp (hptr1->h_name, hptr2->h_name) != 0) + { + printf ("localhost and LocalHost have different canoncial name\n"); + printf ("gethostbyname (\"localhost\")->%s\n", hptr1->h_name); + printf ("gethostbyname (\"LocalHost\")->%s\n", hptr2->h_name); + ++error_count; + } + else + output_hostent ("gethostbyname(\"localhost\")", hptr1); + } + + + if (gethostname (name, namelen) == 0) + { + printf ("Hostname: %s\n", name); + hptr1 = gethostbyname (name); + output_hostent ("gethostbyname (gethostname(...))", hptr1); + } + + ip.s_addr = htonl (INADDR_LOOPBACK); + hptr1 = gethostbyaddr ((char *)&ip, sizeof(ip), AF_INET); + if (hptr1 != NULL) + { + printf ("official name of 127.0.0.1: %s\n", hptr1->h_name); + } + + sethostent (0); + do + { + hptr1 = gethostent (); + output_hostent ("gethostent ()", hptr1); + } + while (hptr1 != NULL); + endhostent (); + +} + + +void +output_netent (const char *call, struct netent *nptr) +{ + char **pptr; + + if (nptr == NULL) + printf ("Call: %s returned NULL\n", call); + else + { + struct in_addr ip; + + ip.s_addr = htonl(nptr->n_net); + printf ("Call: %s, returned: n_name: %s, network_number: %s\n", + call, nptr->n_name, inet_ntoa (ip)); + + for (pptr = nptr->n_aliases; *pptr != NULL; pptr++) + printf (" alias: %s\n", *pptr); + } +} + +void +test_network (void) +{ + struct netent *nptr; + u_int32_t ip; + + /* + this test needs the following line in /etc/networks: + loopback 127.0.0.0 + */ + nptr = getnetbyname ("loopback"); + output_netent ("getnetbyname (\"loopback\")",nptr); + + ip = inet_network ("127.0.0.0"); + nptr = getnetbyaddr (ip, AF_INET); + output_netent ("getnetbyaddr (inet_network (\"127.0.0.0\"), AF_INET)",nptr); + + setnetent (0); + do + { + nptr = getnetent (); + output_netent ("getnetent ()", nptr); + } + while (nptr != NULL); + endnetent (); +} + + +void +output_protoent (const char *call, struct protoent *prptr) +{ + char **pptr; + + if (prptr == NULL) + printf ("Call: %s returned NULL\n", call); + else + { + printf ("Call: %s, returned: p_name: %s, p_proto: %d\n", + call, prptr->p_name, prptr->p_proto); + for (pptr = prptr->p_aliases; *pptr != NULL; pptr++) + printf (" alias: %s\n", *pptr); + } +} + + +void +test_protocols (void) +{ + struct protoent *prptr; + + prptr = getprotobyname ("IP"); + output_protoent ("getprotobyname (\"IP\")", prptr); + + prptr = getprotobynumber (1); + output_protoent ("getprotobynumber (1)", prptr); + + setprotoent (0); + do + { + prptr = getprotoent (); + output_protoent ("getprotoent ()", prptr); + } + while (prptr != NULL); + endprotoent (); +} + + +void +output_rpcent (const char *call, struct rpcent *rptr) +{ + char **pptr; + + if (rptr == NULL) + printf ("Call: %s returned NULL\n", call); + else + { + printf ("Call: %s, returned: r_name: %s, r_number: %d\n", + call, rptr->r_name, rptr->r_number); + for (pptr = rptr->r_aliases; *pptr != NULL; pptr++) + printf (" alias: %s\n", *pptr); + } +} + +void +test_rpc (void) +{ + struct rpcent *rptr; + + rptr = getrpcbyname ("portmap"); + output_rpcent ("getrpcyname (\"portmap\")", rptr); + + rptr = getrpcbynumber (100000); + output_rpcent ("getrpcbynumber (100000)", rptr); + + setrpcent (0); + do + { + rptr = getrpcent (); + output_rpcent ("getrpcent ()", rptr); + } + while (rptr != NULL); + endrpcent (); +} + +/* + Override /etc/nsswitch.conf for this program. + This is mainly useful for developers +*/ +void +setdb (const char *dbname) +{ + if (strcmp ("db", dbname)) + { + /* + db is not implemented for hosts, networks + */ + __nss_configure_lookup ("hosts", dbname); + __nss_configure_lookup ("networks", dbname); + } + __nss_configure_lookup ("protocols", dbname); + __nss_configure_lookup ("rpc", dbname); + __nss_configure_lookup ("services", dbname); +} + + +int +main (void) +{ + /* + setdb ("db"); + */ + test_hosts (); + test_network (); + test_protocols (); + test_rpc (); + test_services (); + + if (error_count) + printf ("\n %d errors occured!\n", error_count); + else + printf ("No visible errors occured!\n"); + + exit (error_count); +} |