Move xdr_* functions from nis/nis_xdr.h.

[kopensolaris-gnu/glibc.git] / nss / nsswitch.c

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 7dd3e05..c968502 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -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.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 


@@ -22,11 +22,11 @@
 #include <errno.h>
 #include <netdb.h>
 #include <bits/libc-lock.h>
 #include <errno.h>
 #include <netdb.h>
 #include <bits/libc-lock.h>

-#include <link.h>      /* We need some help from ld.so.  */

 #include <search.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <search.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <elf/ldsodefs.h>      /* We need some help from ld.so.  */

 
 #if !defined DO_STATIC_NSS || defined PIC
 # include <gnu/lib-names.h>
 
 #if !defined DO_STATIC_NSS || defined PIC
 # include <gnu/lib-names.h>


@@ -35,12 +35,14 @@
 #include "nsswitch.h"
 
 /* Prototypes for the local functions.  */
 #include "nsswitch.h"
 
 /* Prototypes for the local functions.  */

-static void *nss_lookup_function (service_user *ni, const char *fct_name);
-static name_database *nss_parse_file (const char *fname);
-static name_database_entry *nss_getline (char *line);
-static service_user *nss_parse_service_list (const char *line);
+static void *nss_lookup_function (service_user *ni, const char *fct_name)
+     internal_function;
+static name_database *nss_parse_file (const char *fname) internal_function;
+static name_database_entry *nss_getline (char *line) internal_function;
+static service_user *nss_parse_service_list (const char *line)
+     internal_function;

 static service_library *nss_new_service (name_database *database,
 static service_library *nss_new_service (name_database *database,

-                                        const char *name);
+                                        const char *name) internal_function;

 
 
 /* Declare external database variables.  */
 
 
 /* Declare external database variables.  */


@@ -66,7 +68,6 @@ static struct
 
 __libc_lock_define_initialized (static, lock)
 
 
 __libc_lock_define_initialized (static, lock)
 

-

 #if !defined DO_STATIC_NSS || defined PIC
 /* String with revision number of the shared object files.  */
 static const char *const __nss_shlib_revision = LIBNSS_FILES_SO + 15;
 #if !defined DO_STATIC_NSS || defined PIC
 /* String with revision number of the shared object files.  */
 static const char *const __nss_shlib_revision = LIBNSS_FILES_SO + 15;


@@ -134,7 +135,8 @@ __nss_database_lookup (const char *database, const char *alternate_name,
 
 
 /* -1 == not found
 
 
 /* -1 == not found

-    0 == adjusted for next function */
+    0 == function found
+    1 == finished */

 int
 __nss_lookup (service_user **ni, const char *fct_name, void **fctp)
 {
 int
 __nss_lookup (service_user **ni, const char *fct_name, void **fctp)
 {


@@ -149,7 +151,7 @@ __nss_lookup (service_user **ni, const char *fct_name, void **fctp)
       *fctp = nss_lookup_function (*ni, fct_name);
     }
 
       *fctp = nss_lookup_function (*ni, fct_name);
     }
 

-  return *fctp != NULL ? 0 : -1;
+  return *fctp != NULL ? 0 : (*ni)->next == NULL ? 1 : -1;

 }
 
 
 }
 
 


@@ -250,10 +252,9 @@ static int
 nss_dlerror_run (void (*operate) (void *), void *args)
 {
   char *last_errstring = NULL;
 nss_dlerror_run (void (*operate) (void *), void *args)
 {
   char *last_errstring = NULL;

-  const char *last_object_name = NULL;

   int result;
 
   int result;
 

-  (void) _dl_catch_error (&last_errstring, &last_object_name, operate, args);
+  (void) _dl_catch_error (&last_errstring, operate, args);

 
   result = last_errstring != NULL;
   if (result)
 
   result = last_errstring != NULL;
   if (result)


@@ -310,6 +311,7 @@ known_compare (const void *p1, const void *p2)
 
 
 static void *
 
 
 static void *

+internal_function

 nss_lookup_function (service_user *ni, const char *fct_name)
 {
   void **found, *result;
 nss_lookup_function (service_user *ni, const char *fct_name)
 {
   void **found, *result;


@@ -376,7 +378,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
              /* Load the shared library.  */
              size_t shlen = (7 + strlen (ni->library->name) + 3
                              + strlen (__nss_shlib_revision) + 1);
              /* Load the shared library.  */
              size_t shlen = (7 + strlen (ni->library->name) + 3
                              + strlen (__nss_shlib_revision) + 1);

-
+             int saved_errno = errno;

              struct do_open_args args;
              args.shlib_name = __alloca (shlen);
              args.ni = ni;
              struct do_open_args args;
              args.shlib_name = __alloca (shlen);
              args.ni = ni;


@@ -389,8 +391,11 @@ nss_lookup_function (service_user *ni, const char *fct_name)
                        __nss_shlib_revision);
 
              if (nss_dlerror_run (do_open, &args) != 0)
                        __nss_shlib_revision);
 
              if (nss_dlerror_run (do_open, &args) != 0)

-               /* Failed to load the library.  */
-               ni->library->lib_handle = (void *) -1l;
+               {
+                 /* Failed to load the library.  */
+                 ni->library->lib_handle = (void *) -1l;
+                 __set_errno (saved_errno);
+               }

            }
 
          if (ni->library->lib_handle == (void *) -1l)
            }
 
          if (ni->library->lib_handle == (void *) -1l)


@@ -476,6 +481,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
 
 
 static name_database *
 
 
 static name_database *

+internal_function

 nss_parse_file (const char *fname)
 {
   FILE *fp;
 nss_parse_file (const char *fname)
 {
   FILE *fp;


@@ -548,6 +554,7 @@ nss_parse_file (const char *fname)
        `( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *
        `( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *

+internal_function

 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;
 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;


@@ -582,8 +589,7 @@ nss_parse_service_list (const char *line)
              free (new_service);
              return result;
            }
              free (new_service);
              return result;
            }

-         memcpy (source, name, line - name);
-         source[line - name] = '\0';
+         *((char *) __mempcpy (source, name, line - name)) = '\0';

 
          new_service->name = source;
        }
 
          new_service->name = source;
        }


@@ -697,6 +703,7 @@ nss_parse_service_list (const char *line)
 }
 
 static name_database_entry *
 }
 
 static name_database_entry *

+internal_function

 nss_getline (char *line)
 {
   const char *name;
 nss_getline (char *line)
 {
   const char *name;


@@ -743,6 +750,7 @@ nss_getline (char *line)
 
 
 static service_library *
 
 
 static service_library *

+internal_function

 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;
 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;