generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation on windows with clang, indentation cleanups

Browse Source 
R=henrike@webrtc.org, thakis@chromium.org
TBR=hellner@chromium.org

Review URL: https://webrtc-codereview.appspot.com/18849004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6779 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org 2014-07-25 17:28:25 +00:00
parent 190d269c0f
commit a44fce5920
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/base/httpcommon.cc
View File

@ -1007,7 +1007,9 @@ HttpAuthResult HttpAuthenticate(
} }
CredHandle cred; CredHandle cred;
ret = AcquireCredentialsHandleA(0, want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A, SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); ret = AcquireCredentialsHandleA(
0, const_cast<char*>(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A),
SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime);
//LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now); //LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now);
if (ret != SEC_E_OK) { if (ret != SEC_E_OK) {
LOG(LS_ERROR) << "AcquireCredentialsHandle error: " LOG(LS_ERROR) << "AcquireCredentialsHandle error: "

5
talk/base/schanneladapter.cc
View File

@ -149,8 +149,9 @@ SChannelAdapter::BeginSSL() {
//sc_cred.dwMinimumCipherStrength = 128; // Note: use system default //sc_cred.dwMinimumCipherStrength = 128; // Note: use system default
sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION; sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION;
ret = AcquireCredentialsHandle(NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, ret = AcquireCredentialsHandle(NULL, const_cast<char*>(UNISP_NAME),
&sc_cred, NULL, NULL, &impl_->cred, NULL); SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL,
NULL, &impl_->cred, NULL);
if (ret != SEC_E_OK) { if (ret != SEC_E_OK) {
LOG(LS_ERROR) << "AcquireCredentialsHandle error: " LOG(LS_ERROR) << "AcquireCredentialsHandle error: "
<< ErrorName(ret, SECURITY_ERRORS); << ErrorName(ret, SECURITY_ERRORS);

4
webrtc/base/httpcommon.cc
View File

@ -990,7 +990,9 @@ HttpAuthResult HttpAuthenticate(
} }
CredHandle cred; CredHandle cred;
ret = AcquireCredentialsHandleA(0, want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A, SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); ret = AcquireCredentialsHandleA(
0, const_cast<char*>(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A),
SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime);
//LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now); //LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now);
if (ret != SEC_E_OK) { if (ret != SEC_E_OK) {
LOG(LS_ERROR) << "AcquireCredentialsHandle error: " LOG(LS_ERROR) << "AcquireCredentialsHandle error: "

5
webrtc/base/schanneladapter.cc
View File

@ -132,8 +132,9 @@ SChannelAdapter::BeginSSL() {
//sc_cred.dwMinimumCipherStrength = 128; // Note: use system default //sc_cred.dwMinimumCipherStrength = 128; // Note: use system default
sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION; sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION;
ret = AcquireCredentialsHandle(NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, ret = AcquireCredentialsHandle(NULL, const_cast<char*>(UNISP_NAME),
&sc_cred, NULL, NULL, &impl_->cred, NULL); SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL,
NULL, &impl_->cred, NULL);
if (ret != SEC_E_OK) { if (ret != SEC_E_OK) {
LOG(LS_ERROR) << "AcquireCredentialsHandle error: " LOG(LS_ERROR) << "AcquireCredentialsHandle error: "
<< ErrorName(ret, SECURITY_ERRORS); << ErrorName(ret, SECURITY_ERRORS);