2010-08-25 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

        * include/sspi.h (QuerySecurityContextToken): Define.
        * lib/secur32.def: Regenerate using gendef on a Win7 machine.

        Thank you to Magnus Hagander for reporting the issue.

3 files changed, 120 insertions, 41 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 87794947f..7a61f4895 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-25  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* include/sspi.h (QuerySecurityContextToken): Define.
+	* lib/secur32.def: Regenerate using gendef on a Win7 machine.
+
+	Thank you to Magnus Hagander for reporting the issue.
+
 2010-08-25  Ali Sabil  <asabil@users.sourceforge.net>
 
 	* include/ocidl.h: Define COBJMACROS for IPropertyBag and IPropertyBag2.
diff --git a/winsup/w32api/include/sspi.h b/winsup/w32api/include/sspi.h
index 8881780cc..2d73e11e5 100644
--- a/winsup/w32api/include/sspi.h
+++ b/winsup/w32api/include/sspi.h
@@ -264,6 +264,9 @@ SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle,ULONG,PVOID);
 SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle,ULONG,PVOID);
 SECURITY_STATUS WINAPI QueryCredentialsAttributesA(PCredHandle,ULONG,PVOID);
 SECURITY_STATUS WINAPI QueryCredentialsAttributesW(PCredHandle,ULONG,PVOID);
+#if (_WIN32_WINNT >= 0x0500)
+SECURITY_STATUS WINAPI QuerySecurityContextToken(PCtxtHandle,HANDLE*);
+#endif
 SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
 SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
 SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle);
diff --git a/winsup/w32api/lib/secur32.def b/winsup/w32api/lib/secur32.def
index 83cf707cf..ec361fe1c 100644
--- a/winsup/w32api/lib/secur32.def
+++ b/winsup/w32api/lib/secur32.def
@@ -1,41 +1,110 @@
-LIBRARY SECUR32.dll
-EXPORTS
-AcceptSecurityContext@36
-AcquireCredentialsHandleA@36
-AcquireCredentialsHandleW@36
-ApplyControlTokenA@8
-ApplyControlTokenW@8
-CompleteAuthToken@8
-DecryptMessage@16
-DeleteSecurityContext@4
-EncryptMessage@16
-EnumerateSecurityPackagesA@8
-EnumerateSecurityPackagesW@8
-FreeContextBuffer@4
-FreeCredentialsHandle@4
-GetComputerObjectNameA@12
-GetComputerObjectNameW@12
-GetUserNameExA@12
-GetUserNameExW@12
-ImpersonateSecurityContext@4
-InitSecurityInterfaceA@0
-InitSecurityInterfaceW@0
-InitializeSecurityContextA@48
-InitializeSecurityContextW@48
-LsaCallAuthenticationPackage@28
-LsaDeregisterLogonProcess@4
-LsaFreeReturnBuffer@4
-LsaLogonUser@56
-LsaLookupAuthenticationPackage@12
-LsaRegisterLogonProcess@12
-MakeSignature@16
-QueryContextAttributesA@12
-QueryContextAttributesW@12
-QueryCredentialsAttributesA@12
-QueryCredentialsAttributesW@12
-QuerySecurityPackageInfoA@8
-QuerySecurityPackageInfoW@8
-RevertSecurityContext@4
-TranslateNameA@20
-TranslateNameW@20
-VerifySignature@16
+;

+; Definition file of Secur32.dll

+; Automatic generated by gendef

+; written by Kai Tietz 2008

+;

+LIBRARY "Secur32.dll"

+EXPORTS

+CloseLsaPerformanceData

+CollectLsaPerformanceData@16

+OpenLsaPerformanceData@4

+AcceptSecurityContext@36

+AcquireCredentialsHandleA@36

+AcquireCredentialsHandleW@36

+AddCredentialsA@32

+AddCredentialsW@32

+AddSecurityPackageA@8

+AddSecurityPackageW@8

+ApplyControlToken@8

+ChangeAccountPasswordA@32

+ChangeAccountPasswordW@32

+CompleteAuthToken@8

+CredMarshalTargetInfo@12

+CredParseUserNameWithType@16

+CredUnmarshalTargetInfo@16

+DecryptMessage@16

+DeleteSecurityContext@4

+DeleteSecurityPackageA@4

+DeleteSecurityPackageW@4

+EncryptMessage@16

+EnumerateSecurityPackagesA@8

+EnumerateSecurityPackagesW@8

+ExportSecurityContext@16

+FreeContextBuffer@4

+FreeCredentialsHandle@4

+GetComputerObjectNameA@12

+GetComputerObjectNameW@12

+GetSecurityUserInfo@12

+GetUserNameExA@12

+GetUserNameExW@12

+ImpersonateSecurityContext@4

+ImportSecurityContextA@16

+ImportSecurityContextW@16

+InitSecurityInterfaceA@0

+InitSecurityInterfaceW@0

+InitializeSecurityContextA@48

+InitializeSecurityContextW@48

+LsaCallAuthenticationPackage@28

+LsaConnectUntrusted@4

+LsaDeregisterLogonProcess@4

+LsaEnumerateLogonSessions@8

+LsaFreeReturnBuffer@4

+LsaGetLogonSessionData@8

+LsaLogonUser@56

+LsaLookupAuthenticationPackage@12

+LsaRegisterLogonProcess@12

+LsaRegisterPolicyChangeNotification@8

+LsaUnregisterPolicyChangeNotification@8

+MakeSignature@16

+QueryContextAttributesA@12

+QueryContextAttributesW@12

+QueryCredentialsAttributesA@12

+QueryCredentialsAttributesW@12

+QuerySecurityContextToken@8

+QuerySecurityPackageInfoA@8

+QuerySecurityPackageInfoW@8

+RevertSecurityContext@4

+SaslAcceptSecurityContext@36

+SaslEnumerateProfilesA@8

+SaslEnumerateProfilesW@8

+SaslGetContextOption@20

+SaslGetProfilePackageA@8

+SaslGetProfilePackageW@8

+SaslIdentifyPackageA@8

+SaslIdentifyPackageW@8

+SaslInitializeSecurityContextA@48

+SaslInitializeSecurityContextW@48

+SaslSetContextOption@16

+SealMessage@16

+SeciAllocateAndSetCallFlags@8

+SeciAllocateAndSetIPAddress@12

+SeciFreeCallContext@0

+SecpFreeMemory@4

+SecpTranslateName@24

+SecpTranslateNameEx@24

+SetContextAttributesA@16

+SetContextAttributesW@16

+SetCredentialsAttributesA@16

+SetCredentialsAttributesW@16

+SspiCompareAuthIdentities@16

+SspiCopyAuthIdentity@8

+SspiDecryptAuthIdentity@4

+SspiEncodeAuthIdentityAsStrings@16

+SspiEncodeStringsAsAuthIdentity@16

+SspiEncryptAuthIdentity@4

+SspiExcludePackage@12

+SspiFreeAuthIdentity@4

+SspiGetComputerNameForSPN@8

+SspiGetTargetHostName@8

+SspiIsAuthIdentityEncrypted@4

+SspiLocalFree@4

+SspiMarshalAuthIdentity@12

+SspiPrepareForCredRead@16

+SspiPrepareForCredWrite@28

+SspiUnmarshalAuthIdentity@12

+SspiValidateAuthIdentity@4

+SspiZeroAuthIdentity@4

+TranslateNameA@20

+TranslateNameW@20

+UnsealMessage@16

+VerifySignature@16