mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
50304ef057
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
186 lines
5.4 KiB
C
186 lines
5.4 KiB
C
/* Handle locking of password file.
|
|
Copyright (C) 1996, 1998 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 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 <fcntl.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <shadow.h>
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/file.h>
|
|
|
|
|
|
/* Name of the lock file. */
|
|
#define PWD_LOCKFILE "/etc/.pwd.lock"
|
|
|
|
/* How long to wait for getting the lock before returning with an
|
|
error. */
|
|
#define TIMEOUT 15 /* sec */
|
|
|
|
|
|
/* File descriptor for lock file. */
|
|
static int lock_fd = -1;
|
|
|
|
/* Prevent problems in multithreaded program by using mutex. */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static void noop_handler __P ((int __sig));
|
|
|
|
|
|
/* We cannot simply return in error cases. We have to close the file
|
|
and perhaps restore the signal handler. */
|
|
#define RETURN_CLOSE_FD(code) \
|
|
do { \
|
|
if ((code) < 0 && lock_fd >= 0) \
|
|
{ \
|
|
__close (lock_fd); \
|
|
lock_fd = -1; \
|
|
} \
|
|
__libc_lock_unlock (lock); \
|
|
return (code); \
|
|
} while (0)
|
|
|
|
#define RETURN_RESTORE_HANDLER(code) \
|
|
do { \
|
|
/* Restore old action handler for alarm. We don't need to know \
|
|
about the current one. */ \
|
|
__sigaction (SIGALRM, &saved_act, NULL); \
|
|
RETURN_CLOSE_FD (code); \
|
|
} while (0)
|
|
|
|
#define RETURN_CLEAR_ALARM(code) \
|
|
do { \
|
|
/* Clear alarm. */ \
|
|
alarm (0); \
|
|
/* Restore old set of handled signals. We don't need to know \
|
|
about the current one.*/ \
|
|
__sigprocmask (SIG_SETMASK, &saved_set, NULL); \
|
|
RETURN_RESTORE_HANDLER (code); \
|
|
} while (0)
|
|
|
|
|
|
int
|
|
__lckpwdf ()
|
|
{
|
|
int flags;
|
|
sigset_t saved_set; /* Saved set of caught signals. */
|
|
struct sigaction saved_act; /* Saved signal action. */
|
|
sigset_t new_set; /* New set of caught signals. */
|
|
struct sigaction new_act; /* New signal action. */
|
|
struct flock fl; /* Information struct for locking. */
|
|
int result;
|
|
|
|
if (lock_fd != -1)
|
|
/* Still locked by own process. */
|
|
return -1;
|
|
|
|
/* Prevent problems caused by multiple threads. */
|
|
__libc_lock_lock (lock);
|
|
|
|
lock_fd = __open (PWD_LOCKFILE, O_WRONLY | O_CREAT, 0600);
|
|
if (lock_fd == -1)
|
|
/* Cannot create lock file. */
|
|
RETURN_CLOSE_FD (-1);
|
|
|
|
/* Make sure file gets correctly closed when process finished. */
|
|
flags = __fcntl (lock_fd, F_GETFD, 0);
|
|
if (flags == -1)
|
|
/* Cannot get file flags. */
|
|
RETURN_CLOSE_FD (-1);
|
|
flags |= FD_CLOEXEC; /* Close on exit. */
|
|
if (__fcntl (lock_fd, F_SETFD, flags) < 0)
|
|
/* Cannot set new flags. */
|
|
RETURN_CLOSE_FD (-1);
|
|
|
|
/* Now we have to get exclusive write access. Since multiple
|
|
process could try this we won't stop when it first fails.
|
|
Instead we set a timeout for the system call. Once the timer
|
|
expires it is likely that there are some problems which cannot be
|
|
resolved by waiting.
|
|
|
|
It is important that we don't change the signal state. We must
|
|
restore the old signal behaviour. */
|
|
memset (&new_act, '\0', sizeof (struct sigaction));
|
|
new_act.sa_handler = noop_handler;
|
|
sigfillset (&new_act.sa_mask);
|
|
new_act.sa_flags = 0ul;
|
|
|
|
/* Install new action handler for alarm and save old. */
|
|
if (__sigaction (SIGALRM, &new_act, &saved_act) < 0)
|
|
/* Cannot install signal handler. */
|
|
RETURN_CLOSE_FD (-1);
|
|
|
|
/* Now make sure the alarm signal is not blocked. */
|
|
sigemptyset (&new_set);
|
|
sigaddset (&new_set, SIGALRM);
|
|
if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0)
|
|
RETURN_RESTORE_HANDLER (-1);
|
|
|
|
/* Start timer. If we cannot get the lock in the specified time we
|
|
get a signal. */
|
|
alarm (TIMEOUT);
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
result = __fcntl (lock_fd, F_SETLKW, &fl);
|
|
|
|
RETURN_CLEAR_ALARM (result);
|
|
}
|
|
weak_alias (__lckpwdf, lckpwdf)
|
|
|
|
|
|
int
|
|
__ulckpwdf ()
|
|
{
|
|
int result;
|
|
|
|
if (lock_fd == -1)
|
|
/* There is no lock set. */
|
|
result = -1;
|
|
else
|
|
{
|
|
/* Prevent problems caused by multiple threads. */
|
|
__libc_lock_lock (lock);
|
|
|
|
result = __close (lock_fd);
|
|
|
|
/* Mark descriptor as unused. */
|
|
lock_fd = -1;
|
|
|
|
/* Clear mutex. */
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__ulckpwdf, ulckpwdf)
|
|
|
|
|
|
static void
|
|
noop_handler (sig)
|
|
int sig;
|
|
{
|
|
/* We simply return which makes the `fcntl' call return with an error. */
|
|
}
|