mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include <pty.h>. * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc.
297 lines
7.4 KiB
C
297 lines
7.4 KiB
C
/*
|
|
* Copyright (c) 1985, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
static char sccsid[] = "@(#)ruserpass.c 8.3 (Berkeley) 4/2/94";
|
|
#endif /* not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
/* #include "ftp_var.h" */
|
|
|
|
static int token __P((void));
|
|
static FILE *cfile;
|
|
|
|
#define DEFAULT 1
|
|
#define LOGIN 2
|
|
#define PASSWD 3
|
|
#define ACCOUNT 4
|
|
#define MACDEF 5
|
|
#define ID 10
|
|
#define MACHINE 11
|
|
|
|
static char tokval[100];
|
|
|
|
static struct toktab {
|
|
char *tokstr;
|
|
int tval;
|
|
} toktab[]= {
|
|
{ "default", DEFAULT },
|
|
{ "login", LOGIN },
|
|
{ "password", PASSWD },
|
|
{ "passwd", PASSWD },
|
|
{ "account", ACCOUNT },
|
|
{ "machine", MACHINE },
|
|
{ "macdef", MACDEF },
|
|
{ NULL, 0 }
|
|
};
|
|
|
|
|
|
|
|
int
|
|
ruserpass(host, aname, apass)
|
|
char *host, **aname, **apass;
|
|
{
|
|
char *hdir, *buf, *tmp;
|
|
char myname[1024], *mydomain;
|
|
int t, i, c, usedefault = 0;
|
|
struct stat stb;
|
|
|
|
hdir = __secure_getenv("HOME");
|
|
if (hdir == NULL) {
|
|
/* If we can't get HOME, fail instead of trying ".",
|
|
which is no improvement. This really should call
|
|
getpwuid(getuid()). */
|
|
/*hdir = ".";*/
|
|
return -1;
|
|
}
|
|
|
|
buf = alloca (strlen (hdir) + 8);
|
|
|
|
(void) sprintf(buf, "%s/.netrc", hdir);
|
|
cfile = fopen(buf, "r");
|
|
if (cfile == NULL) {
|
|
if (errno != ENOENT)
|
|
warn("%s", buf);
|
|
return (0);
|
|
}
|
|
if (gethostname(myname, sizeof(myname)) < 0)
|
|
myname[0] = '\0';
|
|
if ((mydomain = strchr(myname, '.')) == NULL)
|
|
mydomain = "";
|
|
next:
|
|
while ((t = token())) switch(t) {
|
|
|
|
case DEFAULT:
|
|
usedefault = 1;
|
|
/* FALL THROUGH */
|
|
|
|
case MACHINE:
|
|
if (!usedefault) {
|
|
if (token() != ID)
|
|
continue;
|
|
/*
|
|
* Allow match either for user's input host name
|
|
* or official hostname. Also allow match of
|
|
* incompletely-specified host in local domain.
|
|
*/
|
|
if (strcasecmp(host, tokval) == 0)
|
|
goto match;
|
|
/* if (strcasecmp(hostname, tokval) == 0)
|
|
goto match;
|
|
if ((tmp = strchr(hostname, '.')) != NULL &&
|
|
strcasecmp(tmp, mydomain) == 0 &&
|
|
strncasecmp(hostname, tokval, tmp-hostname) == 0 &&
|
|
tokval[tmp - hostname] == '\0')
|
|
goto match; */
|
|
if ((tmp = strchr(host, '.')) != NULL &&
|
|
strcasecmp(tmp, mydomain) == 0 &&
|
|
strncasecmp(host, tokval, tmp - host) == 0 &&
|
|
tokval[tmp - host] == '\0')
|
|
goto match;
|
|
continue;
|
|
}
|
|
match:
|
|
while ((t = token()) && t != MACHINE && t != DEFAULT) switch(t) {
|
|
|
|
case LOGIN:
|
|
if (token())
|
|
if (*aname == 0) {
|
|
*aname = malloc((unsigned) strlen(tokval) + 1);
|
|
(void) strcpy(*aname, tokval);
|
|
} else {
|
|
if (strcmp(*aname, tokval))
|
|
goto next;
|
|
}
|
|
break;
|
|
case PASSWD:
|
|
if (strcmp(*aname, "anonymous") &&
|
|
fstat(fileno(cfile), &stb) >= 0 &&
|
|
(stb.st_mode & 077) != 0) {
|
|
warnx(_("Error: .netrc file is readable by others."));
|
|
warnx(_("Remove password or make file unreadable by others."));
|
|
goto bad;
|
|
}
|
|
if (token() && *apass == 0) {
|
|
*apass = malloc((unsigned) strlen(tokval) + 1);
|
|
(void) strcpy(*apass, tokval);
|
|
}
|
|
break;
|
|
case ACCOUNT:
|
|
#if 0
|
|
if (fstat(fileno(cfile), &stb) >= 0
|
|
&& (stb.st_mode & 077) != 0) {
|
|
warnx("Error: .netrc file is readable by others.");
|
|
warnx("Remove account or make file unreadable by others.");
|
|
goto bad;
|
|
}
|
|
if (token() && *aacct == 0) {
|
|
*aacct = malloc((unsigned) strlen(tokval) + 1);
|
|
(void) strcpy(*aacct, tokval);
|
|
}
|
|
#endif
|
|
break;
|
|
case MACDEF:
|
|
#if 0
|
|
if (proxy) {
|
|
(void) fclose(cfile);
|
|
return (0);
|
|
}
|
|
while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t');
|
|
if (c == EOF || c == '\n') {
|
|
printf("Missing macdef name argument.\n");
|
|
goto bad;
|
|
}
|
|
if (macnum == 16) {
|
|
printf("Limit of 16 macros have already been defined\n");
|
|
goto bad;
|
|
}
|
|
tmp = macros[macnum].mac_name;
|
|
*tmp++ = c;
|
|
for (i=0; i < 8 && (c=getc(cfile)) != EOF &&
|
|
!isspace(c); ++i) {
|
|
*tmp++ = c;
|
|
}
|
|
if (c == EOF) {
|
|
printf("Macro definition missing null line terminator.\n");
|
|
goto bad;
|
|
}
|
|
*tmp = '\0';
|
|
if (c != '\n') {
|
|
while ((c=getc(cfile)) != EOF && c != '\n');
|
|
}
|
|
if (c == EOF) {
|
|
printf("Macro definition missing null line terminator.\n");
|
|
goto bad;
|
|
}
|
|
if (macnum == 0) {
|
|
macros[macnum].mac_start = macbuf;
|
|
}
|
|
else {
|
|
macros[macnum].mac_start = macros[macnum-1].mac_end + 1;
|
|
}
|
|
tmp = macros[macnum].mac_start;
|
|
while (tmp != macbuf + 4096) {
|
|
if ((c=getc(cfile)) == EOF) {
|
|
printf("Macro definition missing null line terminator.\n");
|
|
goto bad;
|
|
}
|
|
*tmp = c;
|
|
if (*tmp == '\n') {
|
|
if (*(tmp-1) == '\0') {
|
|
macros[macnum++].mac_end = tmp - 1;
|
|
break;
|
|
}
|
|
*tmp = '\0';
|
|
}
|
|
tmp++;
|
|
}
|
|
if (tmp == macbuf + 4096) {
|
|
printf("4K macro buffer exceeded\n");
|
|
goto bad;
|
|
}
|
|
#endif
|
|
break;
|
|
default:
|
|
warnx(_("Unknown .netrc keyword %s"), tokval);
|
|
break;
|
|
}
|
|
goto done;
|
|
}
|
|
done:
|
|
(void) fclose(cfile);
|
|
return (0);
|
|
bad:
|
|
(void) fclose(cfile);
|
|
return (-1);
|
|
}
|
|
|
|
static int
|
|
token()
|
|
{
|
|
char *cp;
|
|
int c;
|
|
struct toktab *t;
|
|
|
|
if (feof(cfile) || ferror(cfile))
|
|
return (0);
|
|
while ((c = getc(cfile)) != EOF &&
|
|
(c == '\n' || c == '\t' || c == ' ' || c == ','))
|
|
continue;
|
|
if (c == EOF)
|
|
return (0);
|
|
cp = tokval;
|
|
if (c == '"') {
|
|
while ((c = getc(cfile)) != EOF && c != '"') {
|
|
if (c == '\\')
|
|
c = getc(cfile);
|
|
*cp++ = c;
|
|
}
|
|
} else {
|
|
*cp++ = c;
|
|
while ((c = getc(cfile)) != EOF
|
|
&& c != '\n' && c != '\t' && c != ' ' && c != ',') {
|
|
if (c == '\\')
|
|
c = getc(cfile);
|
|
*cp++ = c;
|
|
}
|
|
}
|
|
*cp = 0;
|
|
if (tokval[0] == 0)
|
|
return (0);
|
|
for (t = toktab; t->tokstr; t++)
|
|
if (!strcmp(t->tokstr, tokval))
|
|
return (t->tval);
|
|
return (ID);
|
|
}
|