diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/sec_auth.cc | 22 |
2 files changed, 12 insertions, 16 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 22dc84e16..04f73f839 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2014-10-21 Corinna Vinschen <corinna@vinschen.de> + + * sec_auth.cc (get_user_groups): Remove experimental exception handler + added 2014-09-05. + (get_user_local_groups): Ditto. + 2014-10-20 Corinna Vinschen <corinna@vinschen.de> * fhandler_serial.cc: Revert debug code accidentally checked in on 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); |