diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-07-11 01:19:07 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-07-11 01:19:07 +0000 |
commit | 2d7da676f38bc00f40d2b604036c0295c156529e (patch) | |
tree | b07f60862c86c9a3cd03ec0e4bfbe600b99c0f55 /nis/nss_nisplus/nisplus-parser.c | |
parent | 9c2322bc08c01e34c7488ef12c1d1bf26097190b (diff) | |
download | glibc-2d7da676f38bc00f40d2b604036c0295c156529e.tar glibc-2d7da676f38bc00f40d2b604036c0295c156529e.tar.gz glibc-2d7da676f38bc00f40d2b604036c0295c156529e.tar.bz2 glibc-2d7da676f38bc00f40d2b604036c0295c156529e.zip |
update.cvs/libc-ud-970710
1997-07-11 03:00 Ulrich Drepper <drepper@cygnus.com>
* inet/inet_ntoa.c: Prevent looking for thread data key if we found
one.
* signal/sigandset.c: Include stddef.h to get NULL defined.
* signal/sigisempty.c: Likewise.
* signal/sigorset.c: Likewise.
* sysdeps/stub/if_index.h: Likewise.
* wcsmbs/wcstod_l.c: Include locale.h to get __locale_t defined.
* wcsmbs/wcstof_l.c: Likewise.
* wcsmbs/wcstol_l.c: Likewise.
* wcsmbs/wcstold_l.c: Likewise.
* wcsmbs/wcstoll_l.c: Likewise.
* wcsmbs/wcstoul_l.c: Likewise.
* wcsmbs/wcstoull_l.c: Likewise.
Reported by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>.
* stdio-common/snprintf.c: Use ISO C function definition form.
* sysdeps/stub/libc-lock.h: Don't define __libc_key_create and
__libc_setspecific as empty macros since they are used as
function with return value.
Reported by Andreas Jaeger.
1997-07-10 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>
* sysdeps/mach/hurd/select.c (__select): Need bit count for
MACH_MSG_TYPE_INTEGER_T.
1997-07-08 10:12 Fila Kolodny <fila@ibi.com>
* sysdeps/i370/Implies: New file for i370-ibm-mvs port.
* sysdeps/mvs/Implies: Likewise.
1997-07-09 23:06 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/Makefile: Add new source files.
* nis/nis_intern.h: Add new internal functions.
* nis/rpcsvc/nislib.h: Likewise.
* nis/lckcache.c: New.
* nis/nis_cache.c: New, dummy functions in the moment.
* nis/nis_util.c: New.
* nis/nisplus-parser.h: New.
* nis/nss_nisplus/nisplus-parser.c: New.
* nis/rpcsvc/nis_cache.h: New.
* nis/rpcsvc/nis_cache.x: New.
* nis/nss_compat/compat-grp.c: Matches Solaris behaviour now.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nisplus/nisplus-alias.c: Likewise.
* nis/nss_nisplus/nisplus-ethers.c: Likewise.
* nis/nss_nisplus/nisplus-grp.c: Likewise.
* nis/nss_nisplus/nisplus-hosts.c: Likewise.
* nis/nss_nisplus/nisplus-netgrp.c: Likewise.
* nis/nss_nisplus/nisplus-network.c: Likewise.
* nis/nss_nisplus/nisplus-proto.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-pwd.c: Likewise.
* nis/nss_nisplus/nisplus-rpc.c: Likewise.
* nis/nss_nisplus/nisplus-service.c: Likewise.
* nis/nss_nisplus/nisplus-spwd.c: Likewise.
* nis/nss_nis/nis-publickey.c: Remove libc-lock.h include.
* nis/nis_intern.c: Removed.
* nis/nis_call.c: Complete rewrite.
* nis/nis_lookup.c: Likewise.
* nis/nis_table.c: Likewise.
* nis/libnsl.map: Add missing symbols.
* nis/nis_print.c: Fix nis_print_link.
* nis/nis_subr.c: Fix nis_getnames.
1997-07-09 07:19 H.J. Lu <hjl@gnu.ai.mit.edu>
* posix/execvp.c (execvp): Handle ESTALE.
1997-07-10 13:54 Ulrich Drepper <drepper@cygnus.com>
* posix/regex.c: Make CHAR_SET_SIZE definition always available,
even if SYNTAX_TABLE is defined.
Patch by Akim Demaille <demaille@inf.enst.fr>.
1997-07-09 08:16 H.J. Lu <hjl@gnu.ai.mit.edu>
* libio/fileops.c (_IO_file_underflow): Adjust pointers
before calling _IO_SYSREAD ().
1997-07-07 22:54 Zack Weinberg <zack@rabi.phys.columbia.edu>
* sysdeps/sparc/divrem.m4: Eliminate use of "DEFS.h"
(sysdep.h does the same job).
* sysdeps/sparc/alloca.S: Likewise.
* sysdeps/sparc/dotmul.S: Likewise.
* sysdeps/sparc/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/rem.S: Regenerated.
* sysdeps/sparc/sdiv.S: Regenerated.
* sysdeps/sparc/udiv.S: Regenerated.
* sysdeps/sparc/urem.S: Regenerated.
* sysdeps/sparc/DEFS.h: Removed.
* sysdeps/sparc/elf/DEFS.h: Removed.
* sysdeps/sparc/Dist: Don't distribute DEFS.h.
* sysdeps/unix/sparc/sysdep.h: Use 4 byte alignment. Add .type
directive #ifdef HAVE_ELF. Minor format changes.
* sysdeps/alpha/DEFS.h: Removed.
* sysdeps/alpha/Dist: Don't distribute DEFS.h.
1997-07-07 19:03 H.J. Lu <hjl@gnu.ai.mit.edu>
* math/test-fenv.c (feenv_nomask_test): Move
fesetenv (FE_NOMASK_ENV) after fork () to work with
SMP.
* sysdeps/i386/fpu_control.h (_FPU_IEEE): Fix comment.
1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Add _IO_peekc_locked.
1997-07-07 15:45 Fila Kolodny <fila@ibi.com>
* Makeconfig: Add dbobjdir to rpath-link analogous to nssobjdir.
1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/fpu/feholdexcpt.c: Shift the exception mask in the
right position.
* sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise.
1997-07-08 13:59 Ulrich Drepper <drepper@cygnus.com>
* time/strftime.c (spaces, zeroes): Handle broken SGI compiler.
Patch by Richard Stallman <rms@gnu.ai.mit.edu>.
Diffstat (limited to 'nis/nss_nisplus/nisplus-parser.c')
-rw-r--r-- | nis/nss_nisplus/nisplus-parser.c | 337 |
1 files changed, 337 insertions, 0 deletions
diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c new file mode 100644 index 0000000000..bb6bba1e3e --- /dev/null +++ b/nis/nss_nisplus/nisplus-parser.c @@ -0,0 +1,337 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. + + 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. */ + +#include <pwd.h> +#include <ctype.h> +#include <errno.h> +#include <string.h> +#include <rpcsvc/nis.h> + +#include "nisplus-parser.h" + +#define NISENTRYVAL(idx,col,res) \ + ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) + +#define NISENTRYLEN(idx,col,res) \ + ((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len) + + +int +_nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, + char *buffer, size_t buflen) +{ + char *first_unused = buffer; + size_t room_left = buflen; + + if (result == NULL) + return 0; + + if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) || + result->objects.objects_len != 1 || + __type_of (result->objects.objects_val) != ENTRY_OBJ || + strcmp(result->objects.objects_val->EN_data.en_type, + "passwd_tbl") != 0 || + result->objects.objects_val->EN_data.en_cols.en_cols_len < 7) + return 0; + + if (NISENTRYLEN (0, 0, result) >= room_left) + { + /* The line is too long for our buffer. */ + no_more_room: + __set_errno (ERANGE); + return 0; + } + + strncpy (first_unused, NISENTRYVAL(0, 0, result), + NISENTRYLEN (0, 0, result)); + first_unused[NISENTRYLEN(0, 0, result)] = '\0'; + pw->pw_name = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 1, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL(0, 1, result), + NISENTRYLEN (0, 1, result)); + first_unused[NISENTRYLEN(0, 1, result)] = '\0'; + pw->pw_passwd = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 2, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (0, 2, result), + NISENTRYLEN (0, 2, result)); + first_unused[NISENTRYLEN(0, 2, result)] = '\0'; + pw->pw_uid = atoi (first_unused); + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 3, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL(0, 3, result), + NISENTRYLEN (0, 3, result)); + first_unused[NISENTRYLEN(0, 3, result)] = '\0'; + pw->pw_gid = atoi (first_unused); + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 4, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL(0, 4, result), + NISENTRYLEN (0, 4, result)); + first_unused[NISENTRYLEN(0, 4, result)] = '\0'; + pw->pw_gecos = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 5, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (0, 5, result), + NISENTRYLEN (0, 5, result)); + first_unused[NISENTRYLEN(0, 5, result)] = '\0'; + pw->pw_dir = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 6, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (0, 6, result), + NISENTRYLEN (0, 6, result)); + first_unused[NISENTRYLEN (0, 6, result)] = '\0'; + pw->pw_shell = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + return 1; +} + +int +_nss_nisplus_parse_grent (nis_result *result, u_long entry, + struct group *gr, char *buffer, size_t buflen) +{ + char *first_unused = buffer; + size_t room_left = buflen; + char *line; + int count; + + if (result == NULL) + return 0; + + if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) || + __type_of(result->objects.objects_val) != ENTRY_OBJ || + strcmp (result->objects.objects_val[entry].EN_data.en_type, + "group_tbl") != 0 || + result->objects.objects_val[entry].EN_data.en_cols.en_cols_len < 4) + return 0; + + if (NISENTRYLEN (entry, 0, result) >= room_left) + { + /* The line is too long for our buffer. */ + no_more_room: + __set_errno (ERANGE); + return 0; + } + + strncpy (first_unused, NISENTRYVAL (entry, 0, result), + NISENTRYLEN (entry, 0, result)); + first_unused[NISENTRYLEN (entry, 0, result)] = '\0'; + gr->gr_name = first_unused; + room_left -= (strlen (first_unused) + 1); + first_unused += strlen (first_unused) + 1; + + if (NISENTRYLEN (entry, 1, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (entry, 1, result), + NISENTRYLEN (entry, 1, result)); + first_unused[NISENTRYLEN (entry, 1, result)] = '\0'; + gr->gr_passwd = first_unused; + room_left -= (strlen (first_unused) + 1); + first_unused += strlen (first_unused) + 1; + + if (NISENTRYLEN (entry, 2, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (entry, 2, result), + NISENTRYLEN (entry, 2, result)); + first_unused[NISENTRYLEN (entry, 2, result)] = '\0'; + gr->gr_gid = atoi (first_unused); + room_left -= (strlen (first_unused) + 1); + first_unused += strlen (first_unused) + 1; + + if (NISENTRYLEN (entry, 3, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (entry, 3, result), + NISENTRYLEN (entry, 3, result)); + first_unused[NISENTRYLEN (entry, 3, result)] = '\0'; + line = first_unused; + room_left -= (strlen (line) + 1); + first_unused += strlen (line) + 1; + /* Adjust the pointer so it is aligned for + storing pointers. */ + first_unused += __alignof__ (char *) - 1; + first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *)); + gr->gr_mem = (char **) first_unused; + + count = 0; + while (*line != '\0') + { + /* Skip leading blanks. */ + while (isspace (*line)) + ++line; + + if (*line == '\0') + break; + + if (room_left < sizeof (char *)) + goto no_more_room; + room_left -= sizeof (char *); + gr->gr_mem[count] = line; + + while (*line != '\0' && *line != ',' && !isspace(*line)) + ++line; + + if (line != gr->gr_mem[count]) + { + if (*line != '\0') + { + *line = '\0'; + ++line; + } + ++count; + } + else + gr->gr_mem[count] = NULL; + } + if (room_left < sizeof (char *)) + goto no_more_room; + room_left -= sizeof (char *); + gr->gr_mem[count] = NULL; + + return 1; +} + +int +_nss_nisplus_parse_spent (nis_result *result, struct spwd *sp, + char *buffer, size_t buflen) +{ + char *first_unused = buffer; + size_t room_left = buflen; + + if (result == NULL) + return 0; + + if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) || + result->objects.objects_len != 1 || + __type_of(result->objects.objects_val) != ENTRY_OBJ || + strcmp (result->objects.objects_val->EN_data.en_type, + "passwd_tbl") != 0 || + result->objects.objects_val[0].EN_data.en_cols.en_cols_len < 8) + return 0; + + if (NISENTRYLEN(0, 0, result) >= room_left) + { + /* The line is too long for our buffer. */ + no_more_room: + __set_errno (ERANGE); + return 0; + } + + strncpy (first_unused, NISENTRYVAL (0, 0, result), + NISENTRYLEN (0, 0, result)); + first_unused[NISENTRYLEN(0, 0, result)] = '\0'; + sp->sp_namp = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + if (NISENTRYLEN(0, 1, result) >= room_left) + goto no_more_room; + + strncpy (first_unused, NISENTRYVAL (0, 1, result), + NISENTRYLEN (0, 1, result)); + first_unused[NISENTRYLEN(0, 1, result)] = '\0'; + sp->sp_pwdp = first_unused; + room_left -= (strlen (first_unused) +1); + first_unused += strlen (first_unused) +1; + + sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact = + sp->sp_expire = sp->sp_flag = -1; + + if (NISENTRYLEN (0, 7, result) > 0) + { + char *line, *cp; + + line = NISENTRYVAL (0, 7, result); + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_lstchg = atol (line); + + line = cp; + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_min = atol(line); + + line = cp; + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_max = atol(line); + + line = cp; + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_warn = atol(line); + + line = cp; + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_inact = atol(line); + + line = cp; + cp = strchr (line, ':'); + if (cp == NULL) + return 0; + *cp++ = '\0'; + sp->sp_expire = atol(line); + + line = cp; + if (line == NULL) + return 0; + sp->sp_flag = atol(line); + } + + return 1; +} |