This commit was manufactured by cvs2svn to create tag 'cygwin-64bit-cygwin-64bit-postmerge

postmerge'.

Sprout from cygwin-64bit-premerge-branch 2013-04-22 17:11:23 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2013-04-23 09:44:36 UTC Corinna Vinschen <corinna@vinschen.de> '	* Merge in cygwin-64bit-branch.':
    newlib/ChangeLog
    newlib/libc/ctype/ctype_.c
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/reent.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/sys/stat.h
    winsup/cygserver/ChangeLog
    winsup/cygserver/ChangeLog.64bit
    winsup/cygserver/Makefile.in
    winsup/cygserver/bsd_helper.cc
    winsup/cygserver/bsd_helper.h
    winsup/cygserver/bsd_log.cc
    winsup/cygserver/bsd_log.h
    winsup/cygserver/bsd_mutex.cc
    winsup/cygserver/client.cc
    winsup/cygserver/cygserver.cc
    winsup/cygserver/msg.cc
    winsup/cygserver/process.h
    winsup/cygserver/sem.cc
    winsup/cygserver/shm.cc
    winsup/cygserver/sysv_shm.cc
    winsup/cygserver/threaded_queue.h
    winsup/cygwin/ChangeLog
    winsup/cygwin/ChangeLog.64bit
    winsup/cygwin/Makefile.in
    winsup/cygwin/aclocal.m4
    winsup/cygwin/advapi32.cc
    winsup/cygwin/autoload.cc
    winsup/cygwin/automode.c
    winsup/cygwin/binmode.c
    winsup/cygwin/child_info.h
    winsup/cygwin/configure
    winsup/cygwin/configure.ac
    winsup/cygwin/cpuid.h
    winsup/cygwin/cygerrno.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygmagic
    winsup/cygwin/cygmalloc.h
    winsup/cygwin/cygserver.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc.in
    winsup/cygwin/cygwin64.din
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/debug.h
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.h
    winsup/cygwin/devices.in
    winsup/cygwin/dir.cc
    winsup/cygwin/dlfcn.cc
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dll_init.h
    winsup/cygwin/dtable.cc
    winsup/cygwin/environ.cc
    winsup/cygwin/environ.h
    winsup/cygwin/errno.cc
    winsup/cygwin/exception.h
    winsup/cygwin/exceptions.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fcntl.cc
    winsup/cygwin/fenv.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_dev.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_fifo.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_mailslot.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_netdrive.cc
    winsup/cygwin/fhandler_proc.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_procnet.cc
    winsup/cygwin/fhandler_procsys.cc
    winsup/cygwin/fhandler_procsysvipc.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_virtual.h
    winsup/cygwin/fhandler_zero.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/glob.cc
    winsup/cygwin/globals.cc
    winsup/cygwin/grp.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/hookapi.cc
    winsup/cygwin/include/a.out.h
    winsup/cygwin/include/asm/byteorder.h
    winsup/cygwin/include/bits/wordsize.h
    winsup/cygwin/include/cygwin/acl.h
    winsup/cygwin/include/cygwin/config.h
    winsup/cygwin/include/cygwin/cygwin_dll.h
    winsup/cygwin/include/cygwin/grp.h
    winsup/cygwin/include/cygwin/ipc.h
    winsup/cygwin/include/cygwin/msg.h
    winsup/cygwin/include/cygwin/sem.h
    winsup/cygwin/include/cygwin/shm.h
    winsup/cygwin/include/cygwin/signal.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/stat.h
    winsup/cygwin/include/cygwin/sysproto.h
    winsup/cygwin/include/cygwin/time.h
    winsup/cygwin/include/cygwin/types.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/fts.h
    winsup/cygwin/include/ftw.h
    winsup/cygwin/include/glob.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/io.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/cygwin.h
    winsup/cygwin/include/sys/dirent.h
    winsup/cygwin/include/sys/resource.h
    winsup/cygwin/include/sys/strace.h
    winsup/cygwin/init.cc
    winsup/cygwin/ioctl.cc
    winsup/cygwin/ipc.cc
    winsup/cygwin/kernel32.cc
    winsup/cygwin/lc_msg.h
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/lib/cygwin_attach_dll.c
    winsup/cygwin/lib/premain0.c
    winsup/cygwin/lib/premain1.c
    winsup/cygwin/lib/premain2.c
    winsup/cygwin/lib/premain3.c
    winsup/cygwin/libc/bsdlib.cc
    winsup/cygwin/libc/fts.c
    winsup/cygwin/libc/ftw.c
    winsup/cygwin/libc/inet_network.c
    winsup/cygwin/libc/minires-os-if.c
    winsup/cygwin/libc/minires.c
    winsup/cygwin/libc/nftw.c
    winsup/cygwin/libc/rcmd.cc
    winsup/cygwin/libc/rexec.cc
    winsup/cygwin/libstdcxx_wrapper.cc
    winsup/cygwin/localtime.cc
    winsup/cygwin/malloc_wrapper.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mkimport
    winsup/cygwin/mktemp.cc
    winsup/cygwin/mmap.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/msg.cc
    winsup/cygwin/mtinfo.h
    winsup/cygwin/net.cc
    winsup/cygwin/netdb.cc
    winsup/cygwin/nfs.h
    winsup/cygwin/nlsfuncs.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/perprocess.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pinfo.h
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/profil.c
    winsup/cygwin/profil.h
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/pwdgrp.h
    winsup/cygwin/regex/engine.c
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/regparm.h
    winsup/cygwin/resource.cc
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_acl.cc
    winsup/cygwin/sec_auth.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/sem.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/shm.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/speclib
    winsup/cygwin/strace.cc
    winsup/cygwin/strsig.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/textmode.c
    winsup/cygwin/textreadmode.c
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/timer.cc
    winsup/cygwin/times.cc
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/tlsoffsets64.h
    winsup/cygwin/tty.cc
    winsup/cygwin/tty.h
    winsup/cygwin/uinfo.cc
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/cygwin/wow64.cc
    winsup/cygwin/wow64.h
    winsup/doc/ChangeLog
    winsup/doc/faq-what.xml
    winsup/lsaauth/ChangeLog
    winsup/lsaauth/ChangeLog.64bit
    winsup/lsaauth/Makefile.in
    winsup/lsaauth/configure
    winsup/lsaauth/configure.ac
    winsup/utils/ChangeLog
    winsup/utils/ChangeLog.64bit
    winsup/utils/aclocal.m4
    winsup/utils/configure
    winsup/utils/cygcheck.cc
    winsup/utils/dumper.cc
    winsup/utils/dumper.h
    winsup/utils/kill.cc
    winsup/utils/ldd.cc
    winsup/utils/locale.cc
    winsup/utils/mkgroup.c
    winsup/utils/mkpasswd.c
    winsup/utils/module_info.cc
    winsup/utils/mount.cc
    winsup/utils/parse_pe.cc
    winsup/utils/passwd.c
    winsup/utils/path.cc
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/ssp.c
    winsup/utils/strace.cc
    winsup/utils/tzset.c
Delete:
    COPYING3
    COPYING3.LIB
    config.rpath
    configure.ac
    ltgcc.m4
    newlib/libc/machine/aarch64/Makefile.am
    newlib/libc/machine/aarch64/Makefile.in
    newlib/libc/machine/aarch64/aclocal.m4
    newlib/libc/machine/aarch64/configure
    newlib/libc/machine/aarch64/configure.in
    newlib/libc/machine/aarch64/memcmp-stub.c
    newlib/libc/machine/aarch64/memcmp.S
    newlib/libc/machine/aarch64/memcpy-stub.c
    newlib/libc/machine/aarch64/memcpy.S
    newlib/libc/machine/aarch64/memmove-stub.c
    newlib/libc/machine/aarch64/memmove.S
    newlib/libc/machine/aarch64/memset-stub.c
    newlib/libc/machine/aarch64/memset.S
    newlib/libc/machine/aarch64/setjmp.S
    newlib/libc/machine/aarch64/strcmp-stub.c
    newlib/libc/machine/aarch64/strcmp.S
    newlib/libc/machine/aarch64/strlen-stub.c
    newlib/libc/machine/aarch64/strlen.S
    newlib/libc/machine/aarch64/strncmp-stub.c
    newlib/libc/machine/aarch64/strncmp.S
    newlib/libc/machine/aarch64/strnlen-stub.c
    newlib/libc/machine/aarch64/strnlen.S
    newlib/libc/machine/epiphany/Makefile.am
    newlib/libc/machine/epiphany/Makefile.in
    newlib/libc/machine/epiphany/aclocal.m4
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/epiphany/configure.in
    newlib/libc/machine/epiphany/machine/stdlib.h
    newlib/libc/machine/epiphany/setjmp.S
    newlib/libc/sys/epiphany/Makefile.am
    newlib/libc/sys/epiphany/Makefile.in
    newlib/libc/sys/epiphany/aclocal.m4
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/epiphany/configure.in
    newlib/libc/sys/epiphany/e_printf.c
    newlib/libm/machine/aarch64/Makefile.am
    newlib/libm/machine/aarch64/Makefile.in
    newlib/libm/machine/aarch64/aclocal.m4
    newlib/libm/machine/aarch64/configure
    newlib/libm/machine/aarch64/configure.in
    newlib/libm/machine/aarch64/s_ceil.c
    newlib/libm/machine/aarch64/s_floor.c
    newlib/libm/machine/aarch64/s_fma.c
    newlib/libm/machine/aarch64/s_fmax.c
    newlib/libm/machine/aarch64/s_fmin.c
    newlib/libm/machine/aarch64/s_llrint.c
    newlib/libm/machine/aarch64/s_llround.c
    newlib/libm/machine/aarch64/s_lrint.c
    newlib/libm/machine/aarch64/s_lround.c
    newlib/libm/machine/aarch64/s_nearbyint.c
    newlib/libm/machine/aarch64/s_rint.c
    newlib/libm/machine/aarch64/s_round.c
    newlib/libm/machine/aarch64/s_trunc.c
    newlib/libm/machine/aarch64/sf_ceil.c
    newlib/libm/machine/aarch64/sf_floor.c
    newlib/libm/machine/aarch64/sf_fma.c
    newlib/libm/machine/aarch64/sf_fmax.c
    newlib/libm/machine/aarch64/sf_fmin.c
    newlib/libm/machine/aarch64/sf_llrint.c
    newlib/libm/machine/aarch64/sf_llround.c
    newlib/libm/machine/aarch64/sf_lrint.c
    newlib/libm/machine/aarch64/sf_lround.c
    newlib/libm/machine/aarch64/sf_nearbyint.c
    newlib/libm/machine/aarch64/sf_rint.c
    newlib/libm/machine/aarch64/sf_round.c
    newlib/libm/machine/aarch64/sf_trunc.c
    winsup/cygwin/cygwin.sc

1 files changed, 21 insertions, 30 deletions

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 95e7d0bf1..dd5ee0627 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -1,7 +1,7 @@
 /* sec_auth.cc: NT authentication functions
 
    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
+   2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -87,7 +87,7 @@ get_full_privileged_inheritable_token (HANDLE token)
 void
 set_imp_token (HANDLE token, int type)
 {
-  debug_printf ("set_imp_token (%d, %d)", token, type);
+  debug_printf ("set_imp_token (%p, %d)", token, type);
   cygheap->user.external_token = (token == INVALID_HANDLE_VALUE
 				  ? NO_IMPERSONATION : token);
   cygheap->user.ext_token_is_restricted = (type == CW_TOKEN_RESTRICTED);
@@ -108,7 +108,7 @@ extract_nt_dom_user (const struct passwd *pw, PWCHAR domain, PWCHAR user)
   DWORD dlen = MAX_DOMAIN_NAME_LEN + 1;
   SID_NAME_USE use;
 
-  debug_printf ("pw_gecos %x (%s)", pw->pw_gecos, pw->pw_gecos);
+  debug_printf ("pw_gecos %p (%s)", pw->pw_gecos, pw->pw_gecos);
 
   if (psid.getfrompw (pw)
       && LookupAccountSidW (NULL, psid, user, &ulen, domain, &dlen, &use))
@@ -283,7 +283,7 @@ get_user_groups (WCHAR *logonserver, cygsidlist &grp_list,
       else if (legal_sid_type (use))
 	grp_list += gsid;
       else
-	debug_printf ("Global group %W invalid. Use: %d", dgroup, use);
+	debug_printf ("Global group %W invalid. Use: %u", dgroup, use);
     }
 
   NetApiBufferFree (buf);
@@ -332,7 +332,7 @@ get_user_local_groups (PWCHAR logonserver, PWCHAR domain,
 	  else if (legal_sid_type (use))
 	    grp_list += gsid;
 	  else
-	    debug_printf ("Rejecting local %W. use: %d", dg_ptr, use);
+	    debug_printf ("Rejecting local %W. use: %u", dg_ptr, use);
 	}
       else if (GetLastError () == ERROR_NONE_MAPPED)
 	{
@@ -360,7 +360,7 @@ get_user_local_groups (PWCHAR logonserver, PWCHAR domain,
 				      dom, &domlen, &use))
 		{
 		  if (!legal_sid_type (use))
-		    debug_printf ("Rejecting local %W. use: %d", dg_ptr, use);
+		    debug_printf ("Rejecting local %W. use: %u", dg_ptr, use);
 		  else
 		    grp_list *= gsid;
 		}
@@ -389,12 +389,12 @@ sid_in_token_groups (PTOKEN_GROUPS grps, cygpsid sid)
 static void
 get_unix_group_sidlist (struct passwd *pw, cygsidlist &grp_list)
 {
-  struct __group32 *gr;
+  struct group *gr;
   cygsid gsid;
 
   for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
     {
-      if (gr->gr_gid == (__gid32_t) pw->pw_gid)
+      if (gr->gr_gid == pw->pw_gid)
 	goto found;
       else if (gr->gr_mem)
 	for (int gi = 0; gr->gr_mem[gi]; ++gi)
@@ -689,7 +689,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
       status = NtQueryInformationToken (token, TokenSource, &ts, sizeof ts,
 					&size);
       if (!NT_SUCCESS (status))
-	debug_printf ("NtQueryInformationToken(), %p", status);
+	debug_printf ("NtQueryInformationToken(), %y", status);
       else
 	*pintern = intern = !memcmp (ts.SourceName, "Cygwin.1", 8);
     }
@@ -698,7 +698,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
   status = NtQueryInformationToken (token, TokenUser, &tok_usersid,
 				    sizeof tok_usersid, &size);
   if (!NT_SUCCESS (status))
-    debug_printf ("NtQueryInformationToken(), %p", status);
+    debug_printf ("NtQueryInformationToken(), %y", status);
   if (usersid != tok_usersid)
     return false;
 
@@ -713,14 +713,14 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
       status = NtQuerySecurityObject (token, GROUP_SECURITY_INFORMATION,
 				      sd_buf, sd_buf_siz, &size);
       if (!NT_SUCCESS (status))
-	debug_printf ("NtQuerySecurityObject(), %p", status);
+	debug_printf ("NtQuerySecurityObject(), %y", status);
       else
 	{
 	  BOOLEAN dummy;
 	  status = RtlGetGroupSecurityDescriptor (sd_buf, (PSID *) &gsid,
 						  &dummy);
 	  if (!NT_SUCCESS (status))
-	    debug_printf ("RtlGetGroupSecurityDescriptor(), %p", status);
+	    debug_printf ("RtlGetGroupSecurityDescriptor(), %y", status);
 	}
       if (well_known_null_sid != gsid)
 	return gsid == groups.pgsid;
@@ -731,14 +731,14 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
   status = NtQueryInformationToken (token, TokenGroups, NULL, 0, &size);
   if (!NT_SUCCESS (status) && status != STATUS_BUFFER_TOO_SMALL)
     {
-      debug_printf ("NtQueryInformationToken(token, TokenGroups), %p", status);
+      debug_printf ("NtQueryInformationToken(token, TokenGroups), %y", status);
       return false;
     }
   my_grps = (PTOKEN_GROUPS) alloca (size);
   status = NtQueryInformationToken (token, TokenGroups, my_grps, size, &size);
   if (!NT_SUCCESS (status))
     {
-      debug_printf ("NtQueryInformationToken(my_token, TokenGroups), %p",
+      debug_printf ("NtQueryInformationToken(my_token, TokenGroups), %y",
 		    status);
       return false;
     }
@@ -748,7 +748,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
   if (groups.issetgroups ()) /* setgroups was called */
     {
       cygsid gsid;
-      struct __group32 *gr;
+      struct group *gr;
       bool saw[groups.sgsids.count ()];
       memset (saw, 0, sizeof(saw));
 
@@ -851,7 +851,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
 					    &stats, sizeof stats, &size);
 	  if (!NT_SUCCESS (status))
 	    debug_printf ("NtQueryInformationToken(hProcToken, "
-			  "TokenStatistics), %p", status);
+			  "TokenStatistics), %y", status);
 	  else
 	    auth_luid = stats.AuthenticationId;
 	}
@@ -861,7 +861,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
       status = NtQueryInformationToken (hProcToken, TokenGroups, NULL, 0,
 					&size);
       if (!NT_SUCCESS (status) && status != STATUS_BUFFER_TOO_SMALL)
-	debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), %p",
+	debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), %y",
 		      status);
       else if (!(my_tok_gsids = (PTOKEN_GROUPS) malloc (size)))
 	debug_printf ("malloc (my_tok_gsids) failed.");
@@ -872,7 +872,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
 	  if (!NT_SUCCESS (status))
 	    {
 	      debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), "
-			    "%p", status);
+			    "%y", status);
 	      free (my_tok_gsids);
 	      my_tok_gsids = NULL;
 	    }
@@ -995,7 +995,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
   status = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode);
   if (status != STATUS_SUCCESS)
     {
-      debug_printf ("LsaRegisterLogonProcess: %p", status);
+      debug_printf ("LsaRegisterLogonProcess: %y", status);
       __seterrno_from_nt_status (status);
       goto out;
     }
@@ -1009,7 +1009,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
   status = LsaLookupAuthenticationPackage (lsa_hdl, &name, &package_id);
   if (status != STATUS_SUCCESS)
     {
-      debug_printf ("LsaLookupAuthenticationPackage: %p", status);
+      debug_printf ("LsaLookupAuthenticationPackage: %y", status);
       __seterrno_from_nt_status (status);
       goto out;
     }
@@ -1033,11 +1033,6 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
   else if (!get_initgroups_sidlist (tmp_gsids, usersid, new_groups.pgsid, pw,
 				    NULL, auth_luid, auth_pos))
     goto out;
-  /* The logon SID entry is not generated automatically on Windows 2000
-     and earlier for some reason.  So add fake logon sid here, which is
-     filled with logon id values in the authentication package. */
-  if (wincap.needs_logon_sid_in_sid_list ())
-    tmp_gsids += fake_logon_sid;
 
   tmp_gsids.debug_print ("tmp_gsids");
 
@@ -1131,10 +1126,6 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
       gsids->Groups[i].Attributes = SE_GROUP_MANDATORY
 				    | SE_GROUP_ENABLED_BY_DEFAULT
 				    | SE_GROUP_ENABLED;
-      /* Mark logon SID as logon SID :) */
-      if (wincap.needs_logon_sid_in_sid_list ()
-	  && tmp_gsids.sids[tmpidx] == fake_logon_sid)
-	gsids->Groups[i].Attributes += SE_GROUP_LOGON_ID;
       RtlCopySid (RtlLengthSid (tmp_gsids.sids[tmpidx]),
 		  (PSID) ((PBYTE) &authinf->inf + sids_offset),
 		  tmp_gsids.sids[tmpidx]);
@@ -1171,7 +1162,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
 			 &sub_status);
   if (status != STATUS_SUCCESS)
     {
-      debug_printf ("LsaLogonUser: %p (sub-status %p)", status, sub_status);
+      debug_printf ("LsaLogonUser: %y (sub-status %y)", status, sub_status);
       __seterrno_from_nt_status (status);
       goto out;
     }