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.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8779494..7a61f48 100644 (file)
--- 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 8881780..2d73e11 100644 (file)
--- 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 83cf707..ec361fe 100644 (file)
--- 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
+;\r
+; Definition file of Secur32.dll\r
+; Automatic generated by gendef\r
+; written by Kai Tietz 2008\r
+;\r
+LIBRARY "Secur32.dll"\r
+EXPORTS\r
+CloseLsaPerformanceData\r
+CollectLsaPerformanceData@16\r
+OpenLsaPerformanceData@4\r
+AcceptSecurityContext@36\r
+AcquireCredentialsHandleA@36\r
+AcquireCredentialsHandleW@36\r
+AddCredentialsA@32\r
+AddCredentialsW@32\r
+AddSecurityPackageA@8\r
+AddSecurityPackageW@8\r
+ApplyControlToken@8\r
+ChangeAccountPasswordA@32\r
+ChangeAccountPasswordW@32\r
+CompleteAuthToken@8\r
+CredMarshalTargetInfo@12\r
+CredParseUserNameWithType@16\r
+CredUnmarshalTargetInfo@16\r
+DecryptMessage@16\r
+DeleteSecurityContext@4\r
+DeleteSecurityPackageA@4\r
+DeleteSecurityPackageW@4\r
+EncryptMessage@16\r
+EnumerateSecurityPackagesA@8\r
+EnumerateSecurityPackagesW@8\r
+ExportSecurityContext@16\r
+FreeContextBuffer@4\r
+FreeCredentialsHandle@4\r
+GetComputerObjectNameA@12\r
+GetComputerObjectNameW@12\r
+GetSecurityUserInfo@12\r
+GetUserNameExA@12\r
+GetUserNameExW@12\r
+ImpersonateSecurityContext@4\r
+ImportSecurityContextA@16\r
+ImportSecurityContextW@16\r
+InitSecurityInterfaceA@0\r
+InitSecurityInterfaceW@0\r
+InitializeSecurityContextA@48\r
+InitializeSecurityContextW@48\r
+LsaCallAuthenticationPackage@28\r
+LsaConnectUntrusted@4\r
+LsaDeregisterLogonProcess@4\r
+LsaEnumerateLogonSessions@8\r
+LsaFreeReturnBuffer@4\r
+LsaGetLogonSessionData@8\r
+LsaLogonUser@56\r
+LsaLookupAuthenticationPackage@12\r
+LsaRegisterLogonProcess@12\r
+LsaRegisterPolicyChangeNotification@8\r
+LsaUnregisterPolicyChangeNotification@8\r
+MakeSignature@16\r
+QueryContextAttributesA@12\r
+QueryContextAttributesW@12\r
+QueryCredentialsAttributesA@12\r
+QueryCredentialsAttributesW@12\r
+QuerySecurityContextToken@8\r
+QuerySecurityPackageInfoA@8\r
+QuerySecurityPackageInfoW@8\r
+RevertSecurityContext@4\r
+SaslAcceptSecurityContext@36\r
+SaslEnumerateProfilesA@8\r
+SaslEnumerateProfilesW@8\r
+SaslGetContextOption@20\r
+SaslGetProfilePackageA@8\r
+SaslGetProfilePackageW@8\r
+SaslIdentifyPackageA@8\r
+SaslIdentifyPackageW@8\r
+SaslInitializeSecurityContextA@48\r
+SaslInitializeSecurityContextW@48\r
+SaslSetContextOption@16\r
+SealMessage@16\r
+SeciAllocateAndSetCallFlags@8\r
+SeciAllocateAndSetIPAddress@12\r
+SeciFreeCallContext@0\r
+SecpFreeMemory@4\r
+SecpTranslateName@24\r
+SecpTranslateNameEx@24\r
+SetContextAttributesA@16\r
+SetContextAttributesW@16\r
+SetCredentialsAttributesA@16\r
+SetCredentialsAttributesW@16\r
+SspiCompareAuthIdentities@16\r
+SspiCopyAuthIdentity@8\r
+SspiDecryptAuthIdentity@4\r
+SspiEncodeAuthIdentityAsStrings@16\r
+SspiEncodeStringsAsAuthIdentity@16\r
+SspiEncryptAuthIdentity@4\r
+SspiExcludePackage@12\r
+SspiFreeAuthIdentity@4\r
+SspiGetComputerNameForSPN@8\r
+SspiGetTargetHostName@8\r
+SspiIsAuthIdentityEncrypted@4\r
+SspiLocalFree@4\r
+SspiMarshalAuthIdentity@12\r
+SspiPrepareForCredRead@16\r
+SspiPrepareForCredWrite@28\r
+SspiUnmarshalAuthIdentity@12\r
+SspiValidateAuthIdentity@4\r
+SspiZeroAuthIdentity@4\r
+TranslateNameA@20\r
+TranslateNameW@20\r
+UnsealMessage@16\r
+VerifySignature@16\r