2000-04-30 08:52:59 +02:00
|
|
|
/* Copyright (c) 1998, 2000 Free Software Foundation, Inc.
|
1998-01-31 09:39:55 +01:00
|
|
|
This file is part of the GNU C Library.
|
2000-04-30 08:52:59 +02:00
|
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
|
1998-01-31 09:39:55 +01:00
|
|
|
|
|
|
|
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 <ctype.h>
|
|
|
|
#include <malloc.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
1999-06-19 11:58:37 +02:00
|
|
|
#include <libintl.h>
|
1998-10-18 17:16:22 +02:00
|
|
|
#include <sys/param.h>
|
1998-01-31 09:39:55 +01:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include "dbg_log.h"
|
|
|
|
#include "nscd.h"
|
|
|
|
|
1998-10-18 17:16:22 +02:00
|
|
|
/* Names of the databases. */
|
|
|
|
const char *dbnames[lastdb] =
|
|
|
|
{
|
|
|
|
[pwddb] = "passwd",
|
|
|
|
[grpdb] = "group",
|
|
|
|
[hstdb] = "hosts"
|
|
|
|
};
|
|
|
|
|
1998-01-31 09:39:55 +01:00
|
|
|
int
|
1998-10-18 17:16:22 +02:00
|
|
|
nscd_parse_file (const char *fname, struct database dbs[lastdb])
|
1998-01-31 09:39:55 +01:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
char *line, *cp, *entry, *arg1, *arg2;
|
|
|
|
size_t len;
|
1998-10-18 17:16:22 +02:00
|
|
|
int cnt;
|
1998-01-31 09:39:55 +01:00
|
|
|
|
|
|
|
/* Open the configuration file. */
|
|
|
|
fp = fopen (fname, "r");
|
|
|
|
if (fp == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
line = NULL;
|
|
|
|
len = 0;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
ssize_t n = getline (&line, &len, fp);
|
|
|
|
if (n < 0)
|
|
|
|
break;
|
|
|
|
if (line[n - 1] == '\n')
|
|
|
|
line[n - 1] = '\0';
|
|
|
|
|
|
|
|
/* Because the file format does not know any form of quoting we
|
|
|
|
can search forward for the next '#' character and if found
|
|
|
|
make it terminating the line. */
|
Update.
1999-04-28 Ulrich Drepper <drepper@cygnus.com>
* argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0.
* argp/argp-parse.c (_argp_hang): Likewise.
* argp/argp-pv.c (argp_program_version): Likewise.
* argp/argp-pvh.c (argp_program_version_hook): Likewise.
* inet/ether_hton.c (ether_hton, startp): Likewise.
* inet/ether_ntoh.c (ether_ntoh, startp): Likewise.
* inet/getnetgrent_r.c (setup, startp): Likewise.
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise.
* intl/localealias.c (string_space, string_space_act, string_space_max,
nmap, maxmap): Likewise.
* libio/iopopen.c (proc_file_chain): Likewise.
* libio/oldiopopen.c (old_proc_file_chain): Likewise.
* locale/lc-collate.c (__collate_table, __collate_extra,
__collate_element_hash, __collate_element_strings,
__collate_element_values): Likewise.
* malloc/mcheck.c (mcheck_used): Likewise.
* malloc/mtrace.c (added_atexit_handler): Likewise.
* malloc/set-freeres.c (already_called): Likewise.
* misc/getpass.c (getpass) [buf, bufsize]: Likewise.
* misc/syslog.c (LogStat, LogTag): Likewise.
* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise.
* nss/getXXbyYY_r.c (startp): Likewise.
* posix/getopt.c (optarg, __getopt_initialized): Likewise.
* posix/regex.c (init_syntax_once) [done]: Likewise.
(debug): Likewise.
* string/strfry.c (init): Likewise.
* sunrpc/svc_run.c (svc_top): Likewise.
* posix/euidaccess.c (have_ids): Likewise.
* sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise.
* sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise.
* time/getdate.c (getdate_err): Likewise.
* time/tzfile.c (transitions, type_idxs, types, zone_names, leaps):
Likewise.
* time/tzset.c (old_tz, is_initialized): Likewise.
* inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization
of static data with zero.
* signal/allocrtsig.c (init): Likewise.
* string/Makefile (routines): Add strchrnul.
* string/Versions [GLIBC_2.1.1]: Add strchrnul.
* string/string.c: Add strchrnul prototype.
* include/string.h: Add __strchrnul prototype.
* sysdeps/generic/strchrnul.c: New file.
* sysdeps/i386/strchrnul.S: New file.
* sysdeps/i386/bits/string.c: Add strchrnul optimization.
* sysdeps/i386/i486/bits/string.c: Likewise.
* argp/argp-help.c (argp_args_usage): Use __strchrnul.
* inet/ether_line.c (ether_line): Likewise.
* nscd/nscd_conf.c (nscd_parse_file): Likewise.
* nss/nsswitch.c (nss_parse_file): Likewise.
* posix/execvp.c (execvp): Likewise.
* posix/fnmatch.c (internal_fnmatch): Likewise.
* resolv/res_hconf.c (_res_hconv_init): Likewise.
* resolv/res_init.c (res_init): Likewise.
* stdlib/fmtmsg.c (init): Likewise.
* stdlib/getsubopt.c (getsubopt): Likewise.
* catgets/catgets.c (catopen): Only allocate one memory block.
(catclose): Only one free call necessary.
* catgets/open_catalog.c (__open_catalog): Simplify handling of
file descriptor.
* ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead
of real functions. Simplify _tolower and _toupper.
* grp/initgroups.c (compat_call): Remove unnecessary use of pointer
variable.
* iconv/gconv.h (struct gconv_info): Change data element from pointer
to array of size 0.
* iconv/gconv_open.c (__gconv_open): Allocate structures accordingly.
* iconv/gconv_close.c (__gconv_close): Don't free data.
* iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to
insert new alias.
* iconv/gconv_db.c (add_derivation): More efficient copying. Check
for error while inserting in tree.
* include/time.h: Pretty print.
* inet/ruserpass.c: Rewrite use of toktab to avoid string pointers
in table and lots of relocations.
* posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid
string pointers in table and lots of relocations.
* intl/finddomain.c: Remove definition of strchr macro.
* io/ftw.c (nftw_arr, ftw_arr): Make const.
* locale/loadlocale.c (_nl_load_locale): Optimize string copying.
* locale/localeinfo.h (_nl_category_names): Change into an array with
fixed width char string elements.
* locale/setlocale.c (_nl_category_names): Likewise.
(_nl_current): Make global.
* locale/nl_langinfo.c (nldata): Removed. Use _nl_current now.
* malloc/Makefile (distribute): Add stackinfo.h.
* sysdeps/generic/stackinfo.h: New file.
* sysdeps/i386/stackinfo.h: New file.
* posix/execl.c: Use stackinfo.h in optimizing alloca use.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* nis/nis_table.c (__create_ib_request): Always use realloc.
* posix/execvp.c (execute): Rename to script_execute and keep only
code to execute using shell.
(execvp): Call execv directly and only fall back on script_execute.
* resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define
and always use xdigits instead.
* resolv/res_init.c (res_init): Use rawmemchr instead of strchr
where appropriate.
* stdlib/fpioconst.h (__tens): New declaration.
(struct mp_power): Remove array, add arrayoff element.
* stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one
__tens array and add in _fpioconst_pow10 offsets into __tens.
* stdio-common/printf_fp.c: Rewrite to use new __tens array.
* stdlib/strtod.c: Likewise.
* stdlib/a64l.c (a64l_table): Avoid unnecessary elements.
* stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end
of the list.
* stdlib/atexit.c (__exit_funcs): Don't initialize.
* stdlib/fmtmsg.c (keywords): Make name element fixed width array.
* sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use
a single and an array with offsets.
* sunrpc/des_soft.c (partab): Make it const.
* sunrpc/key_call.c (trytimeout, tottimeout): Make const.
(__key_encryptsession_pk_LOCAL): Don't initialize with 0.
(__key_decryptsession_pk_LOCAL): Likewise.
(__key_gendes_LOCAL): Likewise.
(MESSENGER): Mark const.
(key_call_private_main): Don't initialize with 0.
(use_keyenvoy): Don't initialize with 0.
(key_call): Rewrite to reverse logic of use_doors variable.
* sunrpc/netname.c (OPSYS): Define as array, not pointer.
(startp): Don't initialize with zero.
* sunrpc/openchild.c (_openchild): Make first argument const.
* sunrpc/pmap_rmt.c (timeout): Mark const.
* sunrpc/xcrypt.c (hex): Likewise.
* sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting
initialization of global variables.
* sysdeps/unix/sysv/linux/getpt.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Likewise.
* termios/tcgetsid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change
fxsr to osfxsr.
* time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory
block. Add function to free memory if wanted.
* time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read.
* wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers.
* wcsmbs/wmemset.c: Little code optimization.
1999-04-29 01:13:52 +02:00
|
|
|
*strchrnul (line, '#') = '\0';
|
1998-01-31 09:39:55 +01:00
|
|
|
|
|
|
|
/* If the line is blank it is ignored. */
|
|
|
|
if (line[0] == '\0')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
entry = line;
|
|
|
|
while (isspace (*entry) && *entry != '\0')
|
|
|
|
++entry;
|
|
|
|
cp = entry;
|
|
|
|
while (!isspace (*cp) && *cp != '\0')
|
|
|
|
++cp;
|
|
|
|
arg1 = cp;
|
|
|
|
++arg1;
|
|
|
|
*cp = '\0';
|
1998-09-07 01:45:24 +02:00
|
|
|
if (strlen (entry) == 0)
|
1998-01-31 09:39:55 +01:00
|
|
|
dbg_log (_("Parse error: %s"), line);
|
|
|
|
while (isspace (*arg1) && *arg1 != '\0')
|
|
|
|
++arg1;
|
|
|
|
cp = arg1;
|
|
|
|
while (!isspace (*cp) && *cp != '\0')
|
|
|
|
++cp;
|
|
|
|
arg2 = cp;
|
|
|
|
++arg2;
|
|
|
|
*cp = '\0';
|
|
|
|
if (strlen (arg2) > 0)
|
|
|
|
{
|
|
|
|
while (isspace (*arg2) && *arg2 != '\0')
|
|
|
|
++arg2;
|
|
|
|
cp = arg2;
|
|
|
|
while (!isspace (*cp) && *cp != '\0')
|
|
|
|
++cp;
|
|
|
|
*cp = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp (entry, "positive-time-to-live") == 0)
|
|
|
|
{
|
1998-10-18 17:16:22 +02:00
|
|
|
for (cnt = 0; cnt < lastdb; ++cnt)
|
|
|
|
if (strcmp (arg1, dbnames[cnt]) == 0)
|
|
|
|
{
|
|
|
|
dbs[cnt].postimeout = atol (arg2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cnt == lastdb)
|
1998-01-31 09:39:55 +01:00
|
|
|
dbg_log ("server %s is not supported\n", arg1);
|
|
|
|
}
|
|
|
|
else if (strcmp (entry, "negative-time-to-live") == 0)
|
|
|
|
{
|
1998-10-18 17:16:22 +02:00
|
|
|
for (cnt = 0; cnt < lastdb; ++cnt)
|
|
|
|
if (strcmp (arg1, dbnames[cnt]) == 0)
|
|
|
|
{
|
|
|
|
dbs[cnt].negtimeout = atol (arg2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cnt == lastdb)
|
|
|
|
dbg_log ("server %s is not supported\n", arg1);
|
1998-01-31 09:39:55 +01:00
|
|
|
}
|
|
|
|
else if (strcmp (entry, "suggested-size") == 0)
|
|
|
|
{
|
1998-10-18 17:16:22 +02:00
|
|
|
for (cnt = 0; cnt < lastdb; ++cnt)
|
|
|
|
if (strcmp (arg1, dbnames[cnt]) == 0)
|
|
|
|
{
|
|
|
|
dbs[cnt].module = atol (arg2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cnt == lastdb)
|
|
|
|
dbg_log ("server %s is not supported\n", arg1);
|
|
|
|
}
|
|
|
|
else if (strcmp (entry, "enable-cache") == 0)
|
|
|
|
{
|
|
|
|
for (cnt = 0; cnt < lastdb; ++cnt)
|
|
|
|
if (strcmp (arg1, dbnames[cnt]) == 0)
|
|
|
|
{
|
|
|
|
if (strcmp (arg2, "no") == 0)
|
|
|
|
dbs[cnt].enabled = 0;
|
|
|
|
else if (strcmp (arg2, "yes") == 0)
|
|
|
|
dbs[cnt].enabled = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cnt == lastdb)
|
|
|
|
dbg_log ("server %s is not supported\n", arg1);
|
1998-01-31 09:39:55 +01:00
|
|
|
}
|
1998-10-18 17:16:22 +02:00
|
|
|
else if (strcmp (entry, "check-files") == 0)
|
1998-01-31 09:39:55 +01:00
|
|
|
{
|
1998-10-18 17:16:22 +02:00
|
|
|
for (cnt = 0; cnt < lastdb; ++cnt)
|
|
|
|
if (strcmp (arg1, dbnames[cnt]) == 0)
|
|
|
|
{
|
|
|
|
if (strcmp (arg2, "no") == 0)
|
|
|
|
dbs[cnt].check_file = 0;
|
|
|
|
else if (strcmp (arg2, "yes") == 0)
|
|
|
|
dbs[cnt].check_file = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cnt == lastdb)
|
|
|
|
dbg_log ("server %s is not supported\n", arg1);
|
1998-01-31 09:39:55 +01:00
|
|
|
}
|
|
|
|
else if (strcmp (entry, "logfile") == 0)
|
|
|
|
{
|
|
|
|
if (!set_logfile (arg1))
|
|
|
|
dbg_log (_("Could not create log file \"%s\""), arg1);
|
|
|
|
}
|
|
|
|
else if (strcmp (entry, "debug-level") == 0)
|
|
|
|
{
|
|
|
|
int level = atoi (arg1);
|
|
|
|
if (level > 0)
|
1998-10-18 17:16:22 +02:00
|
|
|
debug_level = level;
|
|
|
|
}
|
|
|
|
else if (strcmp (entry, "threads") == 0)
|
|
|
|
{
|
|
|
|
if (nthreads == -1)
|
|
|
|
nthreads = MAX (atol (arg1), lastdb);
|
1998-01-31 09:39:55 +01:00
|
|
|
}
|
2000-04-30 08:52:59 +02:00
|
|
|
else if (strcmp (entry, "server-user") == 0)
|
|
|
|
{
|
|
|
|
if (!arg1)
|
2000-12-09 19:33:58 +01:00
|
|
|
dbg_log (_("Must specify user name for server-user option"));
|
2000-04-30 08:52:59 +02:00
|
|
|
else
|
|
|
|
server_user = strdup (arg1);
|
|
|
|
}
|
1998-01-31 09:39:55 +01:00
|
|
|
else
|
|
|
|
dbg_log (_("Unknown option: %s %s %s"), entry, arg1, arg2);
|
|
|
|
}
|
|
|
|
while (!feof (fp));
|
|
|
|
|
|
|
|
/* Free the buffer. */
|
|
|
|
free (line);
|
|
|
|
/* Close configuration file. */
|
|
|
|
fclose (fp);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|