This commit was manufactured by cvs2svn to create tagZ-cygwin_daemon_merge_HEAD

'Z-cygwin_daemon_merge_HEAD'.

Sprout from cygwin_daemon 2002-01-02 00:06:36 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.'
Cherrypick from cygwin_daemon 2002-02-25 17:47:52 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.':
    winsup/cygwin/how-spawn-works.txt
    winsup/cygwin/wsock_event.h
Cherrypick from cygwin_daemon 2002-06-06 15:35:10 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.':
    winsup/cygwin/include/netinet/udp.h
    winsup/cygwin/stackdump.sgml
Cherrypick from cygwin_daemon 2002-01-17 10:39:38 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.':
    winsup/cygwin/libc/fnmatch.c
Cherrypick from cygwin_daemon 2002-07-03 20:31:40 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.':
    winsup/cygwin/include/sys/statfs.h
Cherrypick from cygwin_daemon 2002-09-04 15:17:25 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin_daemon'.':
    winsup/cygwin/how-autoload-works.txt
Cherrypick from master 2002-09-22 12:04:15 UTC Conrad Scott <conrad.scott@dsl.pipex.com> '2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>':
    winsup/cygserver/threaded_queue.cc
    winsup/cygserver/woutsup.h
    winsup/cygwin/CYGWIN_LICENSE
    winsup/cygwin/ChangeLog
    winsup/cygwin/ChangeLog-1998
    winsup/cygwin/ChangeLog-1999
    winsup/cygwin/ChangeLog-2000
    winsup/cygwin/Makefile.in
    winsup/cygwin/assert.cc
    winsup/cygwin/autoload.cc
    winsup/cygwin/child_info.h
    winsup/cygwin/configure
    winsup/cygwin/configure.in
    winsup/cygwin/cygerrno.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygmagic
    winsup/cygwin/cygmalloc.h
    winsup/cygwin/cygrun.c
    winsup/cygwin/cygserver.cc
    winsup/cygwin/cygserver_client.cc
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygserver_process.cc
    winsup/cygwin/cygserver_shm.cc
    winsup/cygwin/cygserver_shm.h
    winsup/cygwin/cygserver_transport.cc
    winsup/cygwin/cygserver_transport_pipes.cc
    winsup/cygwin/cygserver_transport_sockets.cc
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygthread.h
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/debug.cc
    winsup/cygwin/debug.h
    winsup/cygwin/dir.cc
    winsup/cygwin/dlfcn.cc
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dll_init.h
    winsup/cygwin/dlmalloc.c
    winsup/cygwin/dtable.cc
    winsup/cygwin/dtable.h
    winsup/cygwin/environ.cc
    winsup/cygwin/environ.h
    winsup/cygwin/errno.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/exec.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fcntl.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_proc.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_random.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_registry.cc
    winsup/cygwin/fhandler_serial.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_virtual.cc
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/fhandler_zero.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/glob.c
    winsup/cygwin/gmon.c
    winsup/cygwin/grp.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/heap.h
    winsup/cygwin/hires.h
    winsup/cygwin/how-cygheap-works.txt
    winsup/cygwin/how-fhandlers-work.txt
    winsup/cygwin/how-signals-work.txt
    winsup/cygwin/how-to-debug-cygwin.txt
    winsup/cygwin/include/cygwin/acl.h
    winsup/cygwin/include/cygwin/cygserver.h
    winsup/cygwin/include/cygwin/cygserver_process.h
    winsup/cygwin/include/cygwin/cygserver_transport.h
    winsup/cygwin/include/cygwin/cygserver_transport_pipes.h
    winsup/cygwin/include/cygwin/cygserver_transport_sockets.h
    winsup/cygwin/include/cygwin/grp.h
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/ipc.h
    winsup/cygwin/include/cygwin/msg.h
    winsup/cygwin/include/cygwin/mtio.h
    winsup/cygwin/include/cygwin/sem.h
    winsup/cygwin/include/cygwin/shm.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/stat.h
    winsup/cygwin/include/cygwin/types.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/fnmatch.h
    winsup/cygwin/include/getopt.h
    winsup/cygwin/include/glob.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/include/netdb.h
    winsup/cygwin/include/netinet/ip.h
    winsup/cygwin/include/netinet/tcp.h
    winsup/cygwin/include/pthread.h
    winsup/cygwin/include/sys/cygwin.h
    winsup/cygwin/include/sys/ioctl.h
    winsup/cygwin/include/sys/mount.h
    winsup/cygwin/include/sys/resource.h
    winsup/cygwin/include/sys/socket.h
    winsup/cygwin/include/sys/soundcard.h
    winsup/cygwin/include/sys/strace.h
    winsup/cygwin/include/sys/sysmacros.h
    winsup/cygwin/include/sys/termios.h
    winsup/cygwin/include/sys/uio.h
    winsup/cygwin/include/sys/un.h
    winsup/cygwin/include/sys/vfs.h
    winsup/cygwin/init.cc
    winsup/cygwin/ioctl.cc
    winsup/cygwin/ipc.cc
    winsup/cygwin/lib/cygwin_crt0.c
    winsup/cygwin/lib/dll_main.cc
    winsup/cygwin/lib/getopt.c
    winsup/cygwin/localtime.cc
    winsup/cygwin/malloc.cc
    winsup/cygwin/malloc_wrapper.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mkvers.sh
    winsup/cygwin/mmap.cc
    winsup/cygwin/msg.cc
    winsup/cygwin/net.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/ntea.cc
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/perthread.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pinfo.h
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/pthread.cc
    winsup/cygwin/pwdgrp.h
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/resource.cc
    winsup/cygwin/safe_memory.h
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_acl.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/sem.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/shared_info.h
    winsup/cygwin/shm.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.c
    winsup/cygwin/spawn.cc
    winsup/cygwin/speclib
    winsup/cygwin/strace.cc
    winsup/cygwin/sync.cc
    winsup/cygwin/sync.h
    winsup/cygwin/syscalls.cc
    winsup/cygwin/sysconf.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/termios.cc
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/threaded_queue.cc
    winsup/cygwin/threaded_queue.h
    winsup/cygwin/times.cc
    winsup/cygwin/tty.cc
    winsup/cygwin/tty.h
    winsup/cygwin/uinfo.cc
    winsup/cygwin/uname.cc
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/window.cc
    winsup/cygwin/winsup.h
    winsup/cygwin/winver.rc
    winsup/cygwin/woutsup.h
Delete:
    winsup/cygwin/include/cygwin/ip.h
    winsup/cygwin/include/sys/ipc.h
    winsup/cygwin/include/sys/shm.h
    winsup/cygwin/include/wchar.h
    winsup/cygwin/lib/_cygwin_S_IEXEC.cc
    winsup/cygwin/regexp/regerror.c
    winsup/cygwin/regexp/regexp.3
    winsup/cygwin/regexp/regexp.c
    winsup/cygwin/regexp/regsub.c
    winsup/cygwin/shortcut.c
    winsup/cygwin/shortcut.h
    winsup/cygwin/test.c

1 files changed, 104 insertions, 43 deletions

diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h
index 8555fe461..d9bd691f3 100644
--- a/winsup/cygwin/security.h
+++ b/winsup/cygwin/security.h
@@ -1,6 +1,6 @@
 /* security.h: security declarations
 
-   Copyright 2000, 2001 Red Hat, Inc.
+   Copyright 2000, 2001, 2002 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -8,14 +8,14 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#define DONT_INHERIT (0)
-#define INHERIT_ALL  (CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)
-#define INHERIT_ONLY (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)
+#include <accctrl.h>
 
 #define DEFAULT_UID DOMAIN_USER_RID_ADMIN
 #define DEFAULT_GID DOMAIN_ALIAS_RID_ADMINS
 
 #define MAX_SID_LEN 40
+#define MAX_DACL_LEN(n) (sizeof (ACL) \
+		   + (n) * (sizeof (ACCESS_ALLOWED_ACE) - sizeof (DWORD) + MAX_SID_LEN))
 
 #define NO_SID ((PSID)NULL)
 
@@ -39,6 +39,15 @@ class cygsid {
     }
 
 public:
+  inline operator const PSID () { return psid; }
+
+  inline const PSID operator= (cygsid &nsid)
+    { return assign (nsid); }
+  inline const PSID operator= (const PSID nsid)
+    { return assign (nsid); }
+  inline const PSID operator= (const char *nsidstr)
+    { return getfromstr (nsidstr); }
+
   inline cygsid () : psid ((PSID) sbuf) {}
   inline cygsid (const PSID nsid) { *this = nsid; }
   inline cygsid (const char *nstrsid) { *this = nstrsid; }
@@ -46,7 +55,7 @@ public:
   inline PSID set () { return psid = (PSID) sbuf; }
 
   BOOL getfrompw (const struct passwd *pw);
-  BOOL getfromgr (const struct group *gr);
+  BOOL getfromgr (const struct __group32 *gr);
 
   int get_id (BOOL search_grp, int *type = NULL);
   inline int get_uid () { return get_id (FALSE); }
@@ -54,13 +63,6 @@ public:
 
   char *string (char *nsidstr) const;
 
-  inline const PSID operator= (cygsid &nsid)
-    { return assign (nsid); }
-  inline const PSID operator= (const PSID nsid)
-    { return assign (nsid); }
-  inline const PSID operator= (const char *nsidstr)
-    { return getfromstr (nsidstr); }
-
   inline BOOL operator== (const PSID nsid) const
     {
       if (!psid || !nsid)
@@ -77,8 +79,6 @@ public:
   inline BOOL operator!= (const char *nsidstr) const
     { return !(*this == nsidstr); }
 
-  inline operator const PSID () { return psid; }
-
   void debug_print (const char *prefix = NULL) const
     {
       char buf[256];
@@ -86,40 +86,63 @@ public:
     }
 };
 
+typedef enum { cygsidlist_empty, cygsidlist_alloc, cygsidlist_auto } cygsidlist_type;
 class cygsidlist {
+  int maxcount;
 public:
   int count;
   cygsid *sids;
+  cygsidlist_type type;
 
-  cygsidlist () : count (0), sids (NULL) {}
-  ~cygsidlist () { delete [] sids; }
+  cygsidlist (cygsidlist_type t, int m)
+    {
+      type = t;
+      count = 0;
+      maxcount = m;
+      if (t == cygsidlist_alloc)
+	sids = alloc_sids (m);
+      else
+	sids = new cygsid [m];
+    }
+  ~cygsidlist () { if (type == cygsidlist_auto) delete [] sids; }
 
-  BOOL add (cygsid &nsi)
+  BOOL add (const PSID nsi) /* Only with auto for now */
     {
-      cygsid *tmp = new cygsid [count + 1];
-      if (!tmp)
-	return FALSE;
-      for (int i = 0; i < count; ++i)
-	tmp[i] = sids[i];
-      delete [] sids;
-      sids = tmp;
+      if (count >= maxcount)
+        {
+	  cygsid *tmp = new cygsid [ 2 * maxcount];
+	  if (!tmp)
+	    return FALSE;
+	  maxcount *= 2;
+	  for (int i = 0; i < count; ++i)
+	    tmp[i] = sids[i];
+	  delete [] sids;
+	  sids = tmp;
+	}
       sids[count++] = nsi;
       return TRUE;
     }
-  BOOL add (const PSID nsid) { return add (nsid); }
+  BOOL add (cygsid &nsi) { return add ((PSID) nsi); }
   BOOL add (const char *sidstr)
     { cygsid nsi (sidstr); return add (nsi); }
+  BOOL addfromgr (struct __group32 *gr) /* Only with alloc */
+    { return sids[count++].getfromgr (gr); }
 
   BOOL operator+= (cygsid &si) { return add (si); }
   BOOL operator+= (const char *sidstr) { return add (sidstr); }
+  BOOL operator+= (const PSID psid) { return add (psid); }
 
-  BOOL contains (cygsid &sid) const
+  int position (const PSID sid) const
     {
       for (int i = 0; i < count; ++i)
 	if (sids[i] == sid)
-	  return TRUE;
-      return FALSE;
+	  return i;
+      return -1;
     }
+
+  BOOL contains (const PSID sid) const { return position (sid) >= 0; }
+  cygsid *alloc_sids (int n);
+  void free_sids ();
   void debug_print (const char *prefix = NULL) const
     {
       debug_printf ("-- begin sidlist ---");
@@ -131,6 +154,31 @@ public:
     }
 };
 
+class user_groups {
+public:
+  cygsid pgsid;
+  cygsidlist sgsids;
+  BOOL ischanged;
+
+  BOOL issetgroups () const { return (sgsids.type == cygsidlist_alloc); }
+  void update_supp (const cygsidlist &newsids)
+    {
+      sgsids.free_sids ();
+      sgsids = newsids;
+      ischanged = TRUE;
+    }
+  void clear_supp ()
+    {
+      sgsids.free_sids ();
+      ischanged = TRUE;
+    }
+  void update_pgrp (const PSID sid)
+    {
+      pgsid = sid;
+      ischanged = TRUE;
+    }
+};
+
 extern cygsid well_known_null_sid;
 extern cygsid well_known_world_sid;
 extern cygsid well_known_local_sid;
@@ -159,14 +207,16 @@ extern BOOL allow_smbntsec;
    and group lists so they are somehow security related. Besides that
    I didn't find a better place to declare them. */
 extern struct passwd *internal_getpwent (int);
-extern struct group *internal_getgrent (int);
+extern struct __group32 *internal_getgrent (int);
 
 /* File manipulation */
 int __stdcall set_process_privileges ();
 int __stdcall get_file_attribute (int, const char *, int *,
-				  uid_t * = NULL, gid_t * = NULL);
+				  __uid32_t * = NULL, __gid32_t * = NULL);
 int __stdcall set_file_attribute (int, const char *, int);
-int __stdcall set_file_attribute (int, const char *, uid_t, gid_t, int, const char *);
+int __stdcall set_file_attribute (int, const char *, __uid32_t, __gid32_t, int);
+int __stdcall get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, int *,
+				  __uid32_t * = NULL, __gid32_t * = NULL);
 LONG __stdcall read_sd(const char *file, PSECURITY_DESCRIPTOR sd_buf, LPDWORD sd_size);
 LONG __stdcall write_sd(const char *file, PSECURITY_DESCRIPTOR sd_buf, DWORD sd_size);
 BOOL __stdcall add_access_allowed_ace (PACL acl, int offset, DWORD attributes, PSID sid, size_t &len_add, DWORD inherit);
@@ -178,19 +228,17 @@ void set_security_attribute (int attribute, PSECURITY_ATTRIBUTES psa,
 /* Try a subauthentication. */
 HANDLE subauth (struct passwd *pw);
 /* Try creating a token directly. */
-HANDLE create_token (cygsid &usersid, cygsid &pgrpsid);
+HANDLE create_token (cygsid &usersid, user_groups &groups, struct passwd * pw);
+/* Verify an existing token */
+BOOL verify_token (HANDLE token, cygsid &usersid, user_groups &groups, BOOL * pintern = NULL);
 
 /* Extract U-domain\user field from passwd entry. */
 void extract_nt_dom_user (const struct passwd *pw, char *domain, char *user);
-/* Get default logonserver and domain for this box. */
-BOOL get_logon_server_and_user_domain (char *logonserver, char *domain);
+/* Get default logonserver for a domain. */
+BOOL get_logon_server (const char * domain, char * server, WCHAR *wserver = NULL);
 
 /* sec_helper.cc: Security helper functions. */
-BOOL __stdcall is_grp_member (uid_t uid, gid_t gid);
-/* `lookup_name' should be called instead of LookupAccountName.
- * logsrv may be NULL, in this case only the local system is used for lookup.
- * The buffer for ret_sid (40 Bytes) has to be allocated by the caller! */
-BOOL __stdcall lookup_name (const char *, const char *, PSID);
+BOOL __stdcall is_grp_member (__uid32_t uid, __gid32_t gid);
 int set_process_privilege (const char *privilege, BOOL enable = TRUE);
 
 /* shared.cc: */
@@ -199,10 +247,23 @@ SECURITY_DESCRIPTOR *__stdcall get_null_sd (void);
 
 /* Various types of security attributes for use in Create* functions. */
 extern SECURITY_ATTRIBUTES sec_none, sec_none_nih, sec_all, sec_all_nih;
-extern SECURITY_ATTRIBUTES *__stdcall sec_user (PVOID sa_buf, PSID sid2 = NULL, BOOL inherit = TRUE);
-extern SECURITY_ATTRIBUTES *__stdcall sec_user_nih (PVOID sa_buf, PSID sid2 = NULL);
+extern SECURITY_ATTRIBUTES *__stdcall __sec_user (PVOID sa_buf, PSID sid2, BOOL inherit)
+  __attribute__ ((regparm (3)));
+extern BOOL sec_acl (PACL acl, BOOL admins, PSID sid1 = NO_SID, PSID sid2 = NO_SID);
 
 int __stdcall NTReadEA (const char *file, const char *attrname, char *buf, int len);
 BOOL __stdcall NTWriteEA (const char *file, const char *attrname, const char *buf, int len);
-PSECURITY_DESCRIPTOR alloc_sd (uid_t uid, gid_t gid, const char *logsrv, int attribute,
-          PSECURITY_DESCRIPTOR sd_ret, DWORD *sd_size_ret);
+PSECURITY_DESCRIPTOR alloc_sd (__uid32_t uid, __gid32_t gid, int attribute,
+	  PSECURITY_DESCRIPTOR sd_ret, DWORD *sd_size_ret);
+
+extern inline SECURITY_ATTRIBUTES *
+sec_user_nih (char sa_buf[], PSID sid = NULL)
+{
+  return allow_ntsec ? __sec_user (sa_buf, sid, FALSE) : &sec_none_nih;
+}
+
+extern inline SECURITY_ATTRIBUTES *
+sec_user (char sa_buf[], PSID sid = NULL)
+{
+  return allow_ntsec ? __sec_user (sa_buf, sid, TRUE) : &sec_none_nih;
+}