From 51521b2a6edbb65c975785f3672b0f5a67aba6b3 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 21 Oct 2014 19:17:09 +0000
Subject: 	* sec_auth.cc (get_user_groups): Remove experimental exception
 handler 	added 2014-09-05. 	(get_user_local_groups): Ditto.

---
 winsup/cygwin/sec_auth.cc | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'winsup/cygwin/sec_auth.cc')

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index eda0f826d..3615588ef 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -20,7 +20,6 @@ details. */
 #include "fhandler.h"
 #include "dtable.h"
 #include "cygheap.h"
-#include "exception.h"
 #include "ntdll.h"
 #include "tls_pbuf.h"
 #include <lm.h>
@@ -256,13 +255,9 @@ get_user_groups (WCHAR *logonserver, cygsidlist &grp_list,
   DWORD cnt, tot, len;
   NET_API_STATUS ret;
 
-  {
-    /* Experimental SEH */
-    exception protect;
-    /* Look only on logonserver */
-    ret = NetUserGetGroups (logonserver, user, 0, (LPBYTE *) &buf,
-			    MAX_PREFERRED_LENGTH, &cnt, &tot);
-  }
+  /* Look only on logonserver */
+  ret = NetUserGetGroups (logonserver, user, 0, (LPBYTE *) &buf,
+			  MAX_PREFERRED_LENGTH, &cnt, &tot);
   if (ret)
     {
       __seterrno_from_win_error (ret);
@@ -311,14 +306,9 @@ get_user_local_groups (PWCHAR logonserver, PWCHAR domain,
   DWORD cnt, tot;
   NET_API_STATUS ret;
 
-  {
-    /* Experimental SEH */
-    exception protect;
-
-    ret = NetUserGetLocalGroups (logonserver, user, 0, LG_INCLUDE_INDIRECT,
-				 (LPBYTE *) &buf, MAX_PREFERRED_LENGTH,
-				 &cnt, &tot);
-  }
+  ret = NetUserGetLocalGroups (logonserver, user, 0, LG_INCLUDE_INDIRECT,
+			       (LPBYTE *) &buf, MAX_PREFERRED_LENGTH,
+			       &cnt, &tot);
   if (ret)
     {
       __seterrno_from_win_error (ret);
-- 
cgit v1.2.3