Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

[kopensolaris-gnu/glibc.git] / nss / nss_files / files-XXX.c

diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 7291c75..80efd29 100644 (file)
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -27,13 +27,16 @@ Cambridge, MA 02139, USA.  */
 
    ENTNAME -- database name of the structure and functions (hostent, pwent).
    STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).
 
    ENTNAME -- database name of the structure and functions (hostent, pwent).
    STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).

-   DATAFILE -- string of the database file's name.
+   DATABASE -- string of the database file's name ("hosts", "passwd").

 
    NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
 
    NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.

-   MIDLINE_COMMENTS - defined iff # before \n terminates a database line.
+
+   Also see files-parse.c.

 */
 
 */
 

-#define ENTNAME_r CONCAT(ENTNAME,_r)
+#define ENTNAME_r      CONCAT(ENTNAME,_r)
+
+#define DATAFILE       "/etc/" DATABASE

 
 #ifdef NEED_H_ERRNO
 #define H_ERRNO_PROTO  , int *herrnop
 
 #ifdef NEED_H_ERRNO
 #define H_ERRNO_PROTO  , int *herrnop


@@ -144,7 +147,7 @@ internal_getent (struct STRUCTURE *result,
   if (buflen < (int) sizeof *data + 1)
     {
       errno = ERANGE;
   if (buflen < (int) sizeof *data + 1)
     {
       errno = ERANGE;

-      return NSS_STATUS_NOTFOUND;
+      return NSS_STATUS_TRYAGAIN;

     }
 
   do
     }
 
   do


@@ -194,13 +197,15 @@ CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result,
 
    NAME is the name of the lookup; e.g. `hostbyname'.
 
 
    NAME is the name of the lookup; e.g. `hostbyname'.
 

+   KEYSIZE and KEYPATTERN are ignored here but used by ../nss_db/db-XXX.c.
+

    PROTO describes the arguments for the lookup key;
    e.g. `const char *hostname'.
 
    BREAK_IF_MATCH is a block of code which compares `struct STRUCTURE *result'
    to the lookup key arguments and does `break;' if they match.  */
 
    PROTO describes the arguments for the lookup key;
    e.g. `const char *hostname'.
 
    BREAK_IF_MATCH is a block of code which compares `struct STRUCTURE *result'
    to the lookup key arguments and does `break;' if they match.  */
 

-#define DB_LOOKUP(name, break_if_match, proto...)                            \
+#define DB_LOOKUP(name, keysize, keypattern, break_if_match, proto...)       \

 enum nss_status                                                                      \
 _nss_files_get##name##_r (proto,                                             \
                          struct STRUCTURE *result,                           \
 enum nss_status                                                                      \
 _nss_files_get##name##_r (proto,                                             \
                          struct STRUCTURE *result,                           \