2000-02-17 20:38:33 +01:00
|
|
|
/* passwd.cc: getpwnam () and friends
|
|
|
|
|
|
2013-01-21 05:38:31 +01:00
|
|
|
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
|
2014-01-27 21:04:35 +01:00
|
|
|
2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
|
This file is part of Cygwin.
|
|
|
|
|
|
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
|
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
|
|
|
details. */
|
|
|
|
|
|
2000-08-02 18:28:18 +02:00
|
|
|
#include "winsup.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "cygerrno.h"
|
2001-07-26 21:22:24 +02:00
|
|
|
#include "security.h"
|
2001-08-07 10:56:22 +02:00
|
|
|
#include "path.h"
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
#include "fhandler.h"
|
2001-10-01 06:10:07 +02:00
|
|
|
#include "dtable.h"
|
2000-08-12 07:35:42 +02:00
|
|
|
#include "pinfo.h"
|
2000-11-15 01:13:09 +01:00
|
|
|
#include "cygheap.h"
|
2008-10-21 18:47:28 +02:00
|
|
|
#include "shared_info.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
|
/* Parse /etc/passwd line into passwd structure. */
|
2003-01-20 03:57:54 +01:00
|
|
|
bool
|
2003-01-24 04:53:46 +01:00
|
|
|
pwdgrp::parse_passwd ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
pg_pwd &res = passwd ()[curr_lines];
|
|
|
|
|
res.p.pw_name = next_str (':');
|
|
|
|
|
res.p.pw_passwd = next_str (':');
|
|
|
|
|
if (!next_num (res.p.pw_uid))
|
2003-01-27 18:00:17 +01:00
|
|
|
return false;
|
2014-02-09 20:44:56 +01:00
|
|
|
if (!next_num (res.p.pw_gid))
|
2003-01-27 18:00:17 +01:00
|
|
|
return false;
|
2014-02-09 20:44:56 +01:00
|
|
|
res.p.pw_comment = NULL;
|
|
|
|
|
res.p.pw_gecos = next_str (':');
|
|
|
|
|
res.p.pw_dir = next_str (':');
|
|
|
|
|
res.p.pw_shell = next_str (':');
|
|
|
|
|
res.sid.getfrompw (&res.p);
|
2003-01-20 03:57:54 +01:00
|
|
|
return true;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2003-01-21 07:58:11 +01:00
|
|
|
void
|
2014-02-09 20:44:56 +01:00
|
|
|
pwdgrp::init_pwd ()
|
|
|
|
|
{
|
|
|
|
|
pwdgrp_buf_elem_size = sizeof (pg_pwd);
|
|
|
|
|
parse = &pwdgrp::parse_passwd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pwdgrp *
|
|
|
|
|
pwdgrp::prep_tls_pwbuf ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
if (!_my_tls.locals.pwbuf)
|
2002-06-05 13:10:15 +02:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
_my_tls.locals.pwbuf = ccalloc_abort (HEAP_BUF, 1,
|
|
|
|
|
sizeof (pwdgrp) + sizeof (pg_pwd));
|
|
|
|
|
pwdgrp *pw = (pwdgrp *) _my_tls.locals.pwbuf;
|
|
|
|
|
pw->init_pwd ();
|
|
|
|
|
pw->pwdgrp_buf = (void *) (pw + 1);
|
|
|
|
|
pw->max_lines = 1;
|
2002-06-05 13:10:15 +02:00
|
|
|
}
|
2014-02-09 20:44:56 +01:00
|
|
|
pwdgrp *pw = (pwdgrp *) _my_tls.locals.pwbuf;
|
|
|
|
|
if (pw->curr_lines)
|
|
|
|
|
{
|
|
|
|
|
cfree (pw->passwd ()[0].p.pw_name);
|
|
|
|
|
pw->curr_lines = 0;
|
|
|
|
|
}
|
|
|
|
|
return pw;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2002-11-20 18:10:05 +01:00
|
|
|
struct passwd *
|
2014-02-09 20:44:56 +01:00
|
|
|
pwdgrp::find_user (cygpsid &sid)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
for (ULONG i = 0; i < curr_lines; i++)
|
|
|
|
|
if (sid == passwd ()[i].sid)
|
|
|
|
|
return &passwd ()[i].p;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *
|
|
|
|
|
pwdgrp::find_user (const char *name)
|
|
|
|
|
{
|
|
|
|
|
for (ULONG i = 0; i < curr_lines; i++)
|
|
|
|
|
/* on Windows NT user names are case-insensitive */
|
|
|
|
|
if (strcasematch (name, passwd ()[i].p.pw_name))
|
|
|
|
|
return &passwd ()[i].p;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct passwd *
|
|
|
|
|
pwdgrp::find_user (uid_t uid)
|
|
|
|
|
{
|
|
|
|
|
for (ULONG i = 0; i < curr_lines; i++)
|
|
|
|
|
if (uid == passwd ()[i].p.pw_uid)
|
|
|
|
|
return &passwd ()[i].p;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-11-20 18:10:05 +01:00
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *
|
|
|
|
|
internal_getpwsid (cygpsid &sid)
|
|
|
|
|
{
|
|
|
|
|
struct passwd *ret;
|
|
|
|
|
|
|
|
|
|
cygheap->pg.nss_init ();
|
|
|
|
|
if (cygheap->pg.nss_pwd_files ())
|
|
|
|
|
{
|
|
|
|
|
cygheap->pg.pwd_cache.file.check_file (false);
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.find_user (sid)))
|
|
|
|
|
return ret;
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.add_user_from_file (sid)))
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
if (cygheap->pg.nss_pwd_db ())
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
if ((ret = cygheap->pg.pwd_cache.win.find_user (sid)))
|
|
|
|
|
return ret;
|
|
|
|
|
return cygheap->pg.pwd_cache.win.add_user_from_windows (sid);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-07-26 13:48:38 +02:00
|
|
|
return NULL;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
struct passwd *
|
2014-02-09 20:44:56 +01:00
|
|
|
internal_getpwnam (const char *name)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *ret;
|
2001-06-26 16:47:48 +02:00
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
cygheap->pg.nss_init ();
|
|
|
|
|
if (cygheap->pg.nss_pwd_files ())
|
|
|
|
|
{
|
|
|
|
|
cygheap->pg.pwd_cache.file.check_file (false);
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.find_user (name)))
|
|
|
|
|
return ret;
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.add_user_from_file (name)))
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
if (cygheap->pg.nss_pwd_db ())
|
|
|
|
|
{
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.win.find_user (name)))
|
|
|
|
|
return ret;
|
|
|
|
|
return cygheap->pg.pwd_cache.win.add_user_from_windows (name);
|
|
|
|
|
}
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct passwd *
|
2014-02-09 20:44:56 +01:00
|
|
|
internal_getpwuid (uid_t uid)
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
cygheap->pg.nss_init ();
|
|
|
|
|
if (cygheap->pg.nss_pwd_files ())
|
|
|
|
|
{
|
|
|
|
|
cygheap->pg.pwd_cache.file.check_file (false);
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.find_user (uid)))
|
|
|
|
|
return ret;
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.file.add_user_from_file (uid)))
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
if (cygheap->pg.nss_pwd_db ())
|
|
|
|
|
{
|
|
|
|
|
if ((ret = cygheap->pg.pwd_cache.win.find_user (uid)))
|
|
|
|
|
return ret;
|
|
|
|
|
return cygheap->pg.pwd_cache.win.add_user_from_windows (uid);
|
|
|
|
|
}
|
|
|
|
|
else if (uid == ILLEGAL_UID)
|
|
|
|
|
return cygheap->pg.pwd_cache.win.add_user_from_windows (uid);
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
extern "C" struct passwd *
|
2013-04-23 11:44:36 +02:00
|
|
|
getpwuid32 (uid_t uid)
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *temppw = internal_getpwuid (uid);
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
pthread_testcancel ();
|
|
|
|
|
return temppw;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2013-04-23 11:44:36 +02:00
|
|
|
#ifdef __x86_64__
|
|
|
|
|
EXPORT_ALIAS (getpwuid32, getpwuid)
|
|
|
|
|
#else
|
2002-05-29 17:04:29 +02:00
|
|
|
extern "C" struct passwd *
|
|
|
|
|
getpwuid (__uid16_t uid)
|
|
|
|
|
{
|
|
|
|
|
return getpwuid32 (uid16touid32 (uid));
|
|
|
|
|
}
|
2013-04-23 11:44:36 +02:00
|
|
|
#endif
|
2002-05-29 17:04:29 +02:00
|
|
|
|
2001-06-26 16:47:48 +02:00
|
|
|
extern "C" int
|
2013-04-23 11:44:36 +02:00
|
|
|
getpwuid_r32 (uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
|
2001-04-18 23:10:15 +02:00
|
|
|
{
|
|
|
|
|
*result = NULL;
|
|
|
|
|
|
|
|
|
|
if (!pwd || !buffer)
|
|
|
|
|
return ERANGE;
|
|
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *temppw = internal_getpwuid (uid);
|
2002-09-22 05:38:57 +02:00
|
|
|
pthread_testcancel ();
|
2001-04-18 23:10:15 +02:00
|
|
|
if (!temppw)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* check needed buffer size. */
|
2009-01-26 14:20:46 +01:00
|
|
|
size_t needsize = strlen (temppw->pw_name) + strlen (temppw->pw_passwd)
|
|
|
|
|
+ strlen (temppw->pw_gecos) + strlen (temppw->pw_dir)
|
|
|
|
|
+ strlen (temppw->pw_shell) + 5;
|
2001-04-18 23:10:15 +02:00
|
|
|
if (needsize > bufsize)
|
|
|
|
|
return ERANGE;
|
|
|
|
|
|
|
|
|
|
/* make a copy of temppw */
|
|
|
|
|
*result = pwd;
|
|
|
|
|
pwd->pw_uid = temppw->pw_uid;
|
|
|
|
|
pwd->pw_gid = temppw->pw_gid;
|
2009-01-26 14:20:46 +01:00
|
|
|
buffer = stpcpy (pwd->pw_name = buffer, temppw->pw_name);
|
|
|
|
|
buffer = stpcpy (pwd->pw_passwd = buffer + 1, temppw->pw_passwd);
|
|
|
|
|
buffer = stpcpy (pwd->pw_gecos = buffer + 1, temppw->pw_gecos);
|
|
|
|
|
buffer = stpcpy (pwd->pw_dir = buffer + 1, temppw->pw_dir);
|
|
|
|
|
stpcpy (pwd->pw_shell = buffer + 1, temppw->pw_shell);
|
2003-09-08 23:44:53 +02:00
|
|
|
pwd->pw_comment = NULL;
|
2001-04-18 23:10:15 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-23 11:44:36 +02:00
|
|
|
#ifdef __x86_64__
|
|
|
|
|
EXPORT_ALIAS (getpwuid_r32, getpwuid_r)
|
|
|
|
|
#else
|
2002-05-29 17:04:29 +02:00
|
|
|
extern "C" int
|
|
|
|
|
getpwuid_r (__uid16_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
|
|
|
|
|
{
|
|
|
|
|
return getpwuid_r32 (uid16touid32 (uid), pwd, buffer, bufsize, result);
|
|
|
|
|
}
|
2013-04-23 11:44:36 +02:00
|
|
|
#endif
|
2002-05-29 17:04:29 +02:00
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" struct passwd *
|
2000-02-17 20:38:33 +01:00
|
|
|
getpwnam (const char *name)
|
|
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *temppw = internal_getpwnam (name);
|
2002-09-22 05:38:57 +02:00
|
|
|
pthread_testcancel ();
|
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
pwdgrp_check::isinitializing ().
(pwdgrp_check::isinitializing): Create.
* passwd.cc (grab_int): Change type to unsigned, use strtoul and
set the pointer content to 0 if the field is invalid.
(parse_pwd): Move validity test after getting pw_gid.
(read_etc_passwd): Replace "passwd_state <= " by
passwd_state::isinitializing ().
(internal_getpwuid): Ditto.
(internal_getpwnam): Ditto.
(getpwent): Ditto.
(getpass): Ditto.
* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
(read_etc_group): Replace "group_state <= " by
group_state::isinitializing ().
(internal_getgrgid): Ditto.
(getgrent32): Ditto.
(internal_getgrent): Ditto.
2002-12-10 Pierre Humblet <pierre.humblet@ieee.org>
* security.h: Move declarations of internal_getgrent,
internal_getpwsid and internal_getgrsid to pwdgrp.h.
* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
internal_getpwuid, internal_getgrsid, internal_getgrgid,
internal_getgrnam, internal_getgrent and internal_getgroups.
Delete "emulated" from enum pwdgrp_state.
(pwdgrp_check::isuninitialized): Create.
(pwdgrp_check::pwdgrp_state): Change state to initializing
rather than to uninitialized.
(pwdgrp_read::gets): Remove trailing CRs.
* passwd.cc (grab_string): Don't look for NLs.
(grab_int): Ditto.
(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
(search_for): Delete.
(read_etc_passwd): Simplify tests to actually read the file.
Set state to loaded before making internal_getpwXX calls.
Replace search_for calls by equivalent internal_pwgetXX calls.
(internal_getpwsid): Use passwd_state.isuninitialized to decide
to call read_etc_passwd.
(internal_getpwuid): Create.
(internal_getpwnam): Create.
(getpwuid32): Simply call internal_getpwuid.
(getpwuid_r32): Call internal_getpwuid.
(getpwnam): Simply call internal_getpwnam.
(getpwnam_r): Call internal_getpwnam.
* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
(add_grp_line): Adjust blank space.
(class group_lock): Ditto.
(read_etc_group): Simplify tests to actually read the file.
Set state to loaded before making internal_getgrXX calls.
Replace getgrXX calls by equivalent internal calls.
(internal_getgrsid): Use group_state.isuninitialized to decide
to call read_etc_group.
(internal_getgrgid): Create.
(internal_getgrnam): Create.
(getgroups32): Simply call internal_getgrgid.
(getgrnam32): Simply call internal_getgrnam.
(internal_getgrent): Call group_state.isuninitialized.
(internal_getgroups): Create from the former getgroups32, using
two of the four arguments. Set gid to myself->gid and username
to cygheap->user.name ().
(getgroups32): Simply call internal_getgroup.
(getgroups): Call internal_getgroup instead of getgroups32.
(setgroups32): Call internal versions of get{pw,gr}XX.
* sec_helper.cc: Include pwdgrp.h.
(is_grp_member): Call internal versions of get{pw,gr}XX.
* security.cc: Include pwdgrp.h.
(alloc_sd): Call internal versions of get{pw,gr}XX.
* syscalls.cc: Include pwdgrp.h.
(seteuid32): Call internal versions of get{pw,gr}XX.
(setegid32): Ditto.
* uinfo.cc: Include pwdgrp.h.
(internal_getlogin): Call internal versions of get{pw,gr}XX.
(cygheap_user::ontherange): Ditto.
* sec_acl.cc: Include pwdgrp.h.
(setacl): Call internal versions of get{pw,gr}XX.
(acl_access): Ditto and simplify logic.
(aclfromtext): Ditto.
2002-12-10 13:43:49 +01:00
|
|
|
return temppw;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2001-04-18 23:10:15 +02:00
|
|
|
|
2001-06-26 16:47:48 +02:00
|
|
|
/* the max size buffer we can expect to
|
2001-04-18 23:10:15 +02:00
|
|
|
* use is returned via sysconf with _SC_GETPW_R_SIZE_MAX.
|
|
|
|
|
* This may need updating! - Rob Collins April 2001.
|
|
|
|
|
*/
|
|
|
|
|
extern "C" int
|
|
|
|
|
getpwnam_r (const char *nam, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
|
|
|
|
|
{
|
|
|
|
|
*result = NULL;
|
|
|
|
|
|
|
|
|
|
if (!pwd || !buffer || !nam)
|
|
|
|
|
return ERANGE;
|
|
|
|
|
|
2014-02-09 20:44:56 +01:00
|
|
|
struct passwd *temppw = internal_getpwnam (nam);
|
2002-09-22 05:38:57 +02:00
|
|
|
pthread_testcancel ();
|
2001-04-21 16:23:47 +02:00
|
|
|
|
2001-04-18 23:10:15 +02:00
|
|
|
if (!temppw)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* check needed buffer size. */
|
2009-01-26 14:20:46 +01:00
|
|
|
size_t needsize = strlen (temppw->pw_name) + strlen (temppw->pw_passwd)
|
|
|
|
|
+ strlen (temppw->pw_gecos) + strlen (temppw->pw_dir)
|
|
|
|
|
+ strlen (temppw->pw_shell) + 5;
|
2001-04-18 23:10:15 +02:00
|
|
|
if (needsize > bufsize)
|
|
|
|
|
return ERANGE;
|
2001-06-26 16:47:48 +02:00
|
|
|
|
2001-04-18 23:10:15 +02:00
|
|
|
/* make a copy of temppw */
|
|
|
|
|
*result = pwd;
|
|
|
|
|
pwd->pw_uid = temppw->pw_uid;
|
|
|
|
|
pwd->pw_gid = temppw->pw_gid;
|
2009-01-26 14:20:46 +01:00
|
|
|
buffer = stpcpy (pwd->pw_name = buffer, temppw->pw_name);
|
|
|
|
|
buffer = stpcpy (pwd->pw_passwd = buffer + 1, temppw->pw_passwd);
|
|
|
|
|
buffer = stpcpy (pwd->pw_gecos = buffer + 1, temppw->pw_gecos);
|
|
|
|
|
buffer = stpcpy (pwd->pw_dir = buffer + 1, temppw->pw_dir);
|
|
|
|
|
stpcpy (pwd->pw_shell = buffer + 1, temppw->pw_shell);
|
2003-09-09 00:03:20 +02:00
|
|
|
pwd->pw_comment = NULL;
|
2001-04-18 23:10:15 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" struct passwd *
|
2000-02-17 20:38:33 +01:00
|
|
|
getpwent (void)
|
|
|
|
|
{
|
2014-02-09 20:44:56 +01:00
|
|
|
pwdgrp &prf = cygheap->pg.pwd_cache.file;
|
|
|
|
|
if (cygheap->pg.nss_pwd_files ())
|
|
|
|
|
{
|
|
|
|
|
cygheap->pg.pwd_cache.file.check_file (false);
|
|
|
|
|
if (_my_tls.locals.pw_pos < prf.cached_users ())
|
|
|
|
|
return &prf.passwd ()[_my_tls.locals.pw_pos++].p;
|
|
|
|
|
}
|
|
|
|
|
if ((cygheap->pg.nss_pwd_db ()) && cygheap->pg.nss_db_caching ())
|
|
|
|
|
{
|
|
|
|
|
pwdgrp &prw = cygheap->pg.pwd_cache.win;
|
|
|
|
|
if (_my_tls.locals.pw_pos - prf.cached_users () < prw.cached_users ())
|
|
|
|
|
return &prw.passwd ()[_my_tls.locals.pw_pos++ - prf.cached_users ()].p;
|
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-23 11:44:36 +02:00
|
|
|
#ifndef __x86_64__
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" struct passwd *
|
* (child_info.h, cygheap.h, dcrt0.cc, dir.cc, fhandler.cc, fhandler.h,
fhandler_clipboard.cc, fhandler_disk_file.cc, fhandler_dsp.cc,
fhandler_floppy.cc, fhandler_mem.cc, fhandler_random.cc,
fhandler_tape.cc, fhandler_zero.cc, grp.cc, mmap.cc, passwd.cc,
pinfo.cc, pinfo.h, pipe.cc, sec_acl.cc, sec_helper.cc, security.cc,
security.h, spawn.cc, syscalls.cc, thread.h, uinfo.cc, winsup.h):
Change usage of uid_t to __uid16_t, gid_t to __gid16_t and
off_t to __off32_t throughout. Use INVALID_UID, INVALID_GID and
INVALID_SEEK instead casting -1 to the appropriate type.
* winsup.h: Define INVALID_UID, INVALID_GID and INVALID_SEEK.
* include/cygwin/acl.h: Define internal __aclent16_t and __aclent32_t
types. Don't declare acl functions when compiling Cygwin.
* include/cygwin/grp.h: Declare getgrgid() and getgrnam() with
correct types for internal usage.
2002-02-10 14:38:51 +01:00
|
|
|
getpwduid (__uid16_t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2013-04-23 11:44:36 +02:00
|
|
|
#endif
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" void
|
2000-02-17 20:38:33 +01:00
|
|
|
setpwent (void)
|
|
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
_my_tls.locals.pw_pos = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" void
|
2000-02-17 20:38:33 +01:00
|
|
|
endpwent (void)
|
|
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
_my_tls.locals.pw_pos = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" int
|
2014-01-17 15:53:04 +01:00
|
|
|
setpassent (int)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-04 11:57:17 +02:00
|
|
|
static void
|
|
|
|
|
_getpass_close_fd (void *arg)
|
|
|
|
|
{
|
|
|
|
|
if (arg)
|
|
|
|
|
fclose ((FILE *) arg);
|
|
|
|
|
}
|
|
|
|
|
|
2000-02-21 06:20:38 +01:00
|
|
|
extern "C" char *
|
2000-02-17 20:38:33 +01:00
|
|
|
getpass (const char * prompt)
|
|
|
|
|
{
|
2003-12-23 17:26:31 +01:00
|
|
|
char *pass = _my_tls.locals.pass;
|
2000-02-17 20:38:33 +01:00
|
|
|
struct termios ti, newti;
|
2012-07-09 14:57:03 +02:00
|
|
|
bool tc_set = false;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2012-04-04 11:57:17 +02:00
|
|
|
/* Try to use controlling tty in the first place. Use stdin and stderr
|
|
|
|
|
only as fallback. */
|
|
|
|
|
FILE *in = stdin, *err = stderr;
|
|
|
|
|
FILE *tty = fopen ("/dev/tty", "w+b");
|
|
|
|
|
pthread_cleanup_push (_getpass_close_fd, tty);
|
|
|
|
|
if (tty)
|
|
|
|
|
{
|
|
|
|
|
/* Set close-on-exec for obvious reasons. */
|
|
|
|
|
fcntl (fileno (tty), F_SETFD, fcntl (fileno (tty), F_GETFD) | FD_CLOEXEC);
|
|
|
|
|
in = err = tty;
|
|
|
|
|
}
|
2001-10-16 01:39:33 +02:00
|
|
|
|
2012-04-04 11:57:17 +02:00
|
|
|
/* Make sure to notice if stdin is closed. */
|
2012-07-09 14:57:03 +02:00
|
|
|
if (fileno (in) >= 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2012-04-04 11:57:17 +02:00
|
|
|
flockfile (in);
|
2012-07-09 14:57:03 +02:00
|
|
|
/* Change tty attributes if possible. */
|
|
|
|
|
if (!tcgetattr (fileno (in), &ti))
|
|
|
|
|
{
|
|
|
|
|
newti = ti;
|
|
|
|
|
newti.c_lflag &= ~(ECHO | ISIG); /* No echo, no signal handling. */
|
|
|
|
|
if (!tcsetattr (fileno (in), TCSANOW, &newti))
|
|
|
|
|
tc_set = true;
|
|
|
|
|
}
|
2012-04-04 11:57:17 +02:00
|
|
|
fputs (prompt, err);
|
|
|
|
|
fflush (err);
|
|
|
|
|
fgets (pass, _PASSWORD_LEN, in);
|
|
|
|
|
fprintf (err, "\n");
|
2012-07-09 14:57:03 +02:00
|
|
|
if (tc_set)
|
|
|
|
|
tcsetattr (fileno (in), TCSANOW, &ti);
|
2012-04-04 11:57:17 +02:00
|
|
|
funlockfile (in);
|
|
|
|
|
char *crlf = strpbrk (pass, "\r\n");
|
|
|
|
|
if (crlf)
|
|
|
|
|
*crlf = '\0';
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2012-04-04 11:57:17 +02:00
|
|
|
pthread_cleanup_pop (1);
|
2000-02-17 20:38:33 +01:00
|
|
|
return pass;
|
|
|
|
|
}
|
