* environ.cc (subauth_id_init): Remove.

	(parse_thing): Drop "subauth_id" option.
	* security.cc (get_token_group_sidlist): Drop comments concerning
	subauthentication.
	(create_token): Back out subauthentication related changes.
	(subauth): Remove.
	* security.h (create_token): Remove declaration.
	(subauth): Ditto.
	* syscalls.cc (seteuid32): Drop subauthentication handling entirely.

1 files changed, 1 insertions, 25 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index d126e79c2..addb11ea0 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -2227,38 +2227,14 @@ seteuid32 (__uid32_t uid)
     {
       if (!(new_token = lsaauth (usersid, groups, pw_new)))
 	{
-#if 0
-	  new_token = subauth (pw_new);
-	  debug_printf ("subauth %s, try create_token.",
-			new_token == INVALID_HANDLE_VALUE ? "failed" : "succeeded");
-	  HANDLE new_token2 = create_token (usersid, groups, pw_new, new_token);
-	  if (new_token2 == INVALID_HANDLE_VALUE)
-	    {
-	      if (new_token == INVALID_HANDLE_VALUE)
-		{
-		  debug_printf ("create_token failed, bail out of here");
-		  cygheap->user.reimpersonate ();
-		  return -1;
-		}
-	      debug_printf ("create_token failed, use original subauth token");
-	    }
-	  else
-	    {
-	      debug_printf ("create_token succeeded");
-	      if (new_token != INVALID_HANDLE_VALUE)
-		CloseHandle (new_token);
-	      new_token = new_token2;
-	    }
-#else
 	  debug_printf ("lsaauth failed, try create_token.");
-	  new_token = create_token (usersid, groups, pw_new, NULL);
+	  new_token = create_token (usersid, groups, pw_new);
 	  if (new_token == INVALID_HANDLE_VALUE)
 	    {
 	      debug_printf ("create_token failed, bail out of here");
 	      cygheap->user.reimpersonate ();
 	      return -1;
 	    }
-#endif
 	}
 
       /* Keep at most one internal token */