From 51702635af8445431054291c86aaace7c30b0970 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 7 May 1997 15:31:21 +0000 Subject: Update. * locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and _NL_CTYPE_MAP_NAMES field to stringlist. Change name of _NL_CTYPE_CODESET_NAME to "charmap". * locale/localeinfo.h (enum value_type): Add stringlist. * locale/programs/locale.c (show_info): Handle stringlist. * locale/programs/charmap.c (charmap_read): If charmap file is not using the given name try to find it by looking through all available charmap files and compare the code set name. * locale/programs/locale.c (write_charmaps): Also print names of charset in fields in the files. * elf/ldd.bash.in: Correct translatable strings. * posix/TESTS: Add some more tests for character class matching. * posix/regex.c: Merge with GNU awk version. (regex_compile): Use ISO C/amend 1 functions for character class handling. * posix/regex.h: Merge with GNU awk version. * posix/getopt.c: Declare as master copies. * posix/getopt1.c: Likewise. * posix/getopt.h: Likewise. * sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option value to mount functions. Patch by a sun . * stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency with other tests. * sunrpc/svc_run.c (svc_exit): New, defined. (svc_run): Test for svc_stop variable. * sysdeps/m68k/s_cexp.c: Rewritten. * sysdeps/m68k/s_cexpf.c: Likewise. * sysdeps/m68k/s_cexpl.c: Likewise. --- nis/nis_call.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nis/nis_call.c') diff --git a/nis/nis_call.c b/nis/nis_call.c index 12b3ab265e..a92f1445f4 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -134,7 +134,7 @@ __nis_dobind (const nis_server *server, u_long flags) if ((flags & NO_AUTHINFO) != NO_AUTHINFO) { #if defined(HAVE_SECURE_RPC) - if (server->key_type == NIS_PK_DH) + if (server->key_type == NIS_PK_DH && getenv ("NO_SECURE_RPC") == NULL) { char netname[MAXNETNAMELEN+1]; char *p; @@ -173,11 +173,8 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog, if (serv == NULL || serv_len == 0) { dir = readColdStartFile (); - if (dir == NULL) - { - fputs (_("Error: could not find a NIS_COLD_START file\n"), stderr); - return NIS_UNAVAIL; - } + if (dir == NULL) /* No /var/nis/NIS_COLD_START -> no NIS+ installed */ + return NIS_UNAVAIL; server = dir->do_servers.do_servers_val; server_len = dir->do_servers.do_servers_len; } -- cgit v1.2.3