Update.

[glibc.git] / nss / XXX-lookup.c

diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c
index 1f8cbbf01593952ce563053b6fc84559259818d6..da0e6f4510dbdaa763aeed7d8b013c53da0a3cc9 100644 (file)
--- a/nss/XXX-lookup.c
+++ b/nss/XXX-lookup.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+/* Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-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 free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   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
+   Lesser 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.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include "nsswitch.h"
 
@@ -23,7 +23,14 @@ Boston, MA 02111-1307, USA.  */
 |* Here we assume one symbol to be defined:                       *|
 |*                                                                *|
 |* DATABASE_NAME - name of the database the function accesses     *|
-|*                (e.g., hosts, servicess, ...)                   *|
+|*                (e.g., hosts, services, ...)                    *|
+|*                                                                *|
+|* One additional symbol may optionally be defined:               *|
+|*                                                                *|
+|* ALTERNATE_NAME - name of another service which is examined in   *|
+|*                  case DATABASE_NAME is not found                *|
+|*                                                                *|
+|* DEFAULT_CONFIG - string for default conf (e.g. "dns files")    *|
 |*                                                                *|
 \*******************************************************************/
 
@@ -31,21 +38,38 @@ Boston, MA 02111-1307, USA.  */
 #define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
 #define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
 
+#define DATABASE_NAME_SYMBOL CONCAT3_1 (__nss_, DATABASE_NAME, _database)
 #define DATABASE_NAME_STRING STRINGIFY1 (DATABASE_NAME)
 #define STRINGIFY1(Name) STRINGIFY2 (Name)
 #define STRINGIFY2(Name) #Name
 
+#ifdef ALTERNATE_NAME
+#define ALTERNATE_NAME_STRING STRINGIFY1 (ALTERNATE_NAME)
+#else
+#define ALTERNATE_NAME_STRING NULL
+#endif
+
+#ifndef DEFAULT_CONFIG
+#define DEFAULT_CONFIG NULL
+#endif
+
+service_user *DATABASE_NAME_SYMBOL attribute_hidden;
 
-static service_user *database = NULL;
+extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name,
+                         void **fctp) internal_function;
+libc_hidden_proto (DB_LOOKUP_FCT)
 
 int
+internal_function
 DB_LOOKUP_FCT (service_user **ni, const char *fct_name, void **fctp)
 {
-  if (database == NULL
-      && __nss_database_lookup (DATABASE_NAME_STRING, &database) < 0)
+  if (DATABASE_NAME_SYMBOL == NULL
+      && __nss_database_lookup (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING,
+                               DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0)
     return -1;
 
-  *ni = database;
+  *ni = DATABASE_NAME_SYMBOL;
 
   return __nss_lookup (ni, fct_name, fctp);
 }
+libc_hidden_def (DB_LOOKUP_FCT)