diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-03 16:42:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-03 16:42:24 +0000 |
| commit | d0d8f99a31800c45bbda6b14c28abeb93819f031 (patch) | |
| tree | 72d5573b1bef3f0ecd277701b9f47d3bf95e22e0 /ucb/source/ucp/webdav/NeonSession.cxx | |
| parent | a6aafcb54ea1cfd70d17a0c2bf1d92e46735d989 (diff) | |
CWS-TOOLING: integrate CWS tkr20
2009-05-08 08:31:10 +0200 tkr r271700 : ##i97329# fixed merge conflict during rebase
2009-05-07 08:30:15 +0200 tkr r271622 : CWS-TOOLING: rebase CWS tkr20 to trunk@271427 (milestone: DEV300:m47)
2009-04-17 14:36:42 +0200 tkr r270947 : #i73893# implemented the XCommandProcessor:Abort method
2009-03-20 14:08:15 +0100 tkr r269806 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:15:26 +0100 tkr r269754 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:09:04 +0100 tkr r269753 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 15:57:05 +0100 tkr r269752 : #i97003# Ask password container if persistent storage should be used
2009-03-19 15:53:18 +0100 tkr r269751 : #i97003# ask if password container should use the persistent storage
2009-03-19 09:08:18 +0100 tkr r269726 : #i99774# ucb: patch to silence warnings in gcc 4.4
2009-03-19 09:05:38 +0100 tkr r269725 : #i99046# remove mime-type
2009-03-19 09:04:56 +0100 tkr r269724 : #i97329# fixed truncated text on buttons
2009-03-19 09:03:50 +0100 tkr r269723 : #i97542# Warning errors in uui / empty bodys in for loops
Diffstat (limited to 'ucb/source/ucp/webdav/NeonSession.cxx')
| -rw-r--r-- | ucb/source/ucp/webdav/NeonSession.cxx | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 165824a44c93..4ceeef476d66 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -60,6 +60,7 @@ #include <com/sun/star/security/CertificateContainerStatus.hpp> #include <com/sun/star/security/CertificateContainer.hpp> #include <com/sun/star/security/XCertificateContainer.hpp> +#include <com/sun/star/task/XMasterPasswordHandling.hpp> #ifndef _SIMPLECERTIFICATIONVALIDATIONREQUEST_HXX_ @@ -329,11 +330,19 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, //thePassWord = rtl::OUString::createFromAscii( inoutPassWord ); } + //i97003 (tkr): Ask XMasterPasswordHandling if we should store the credentials persistently and give this information to the SimpleAuthenticationRequest + uno::Reference< ::com::sun::star::task::XMasterPasswordHandling > xMasterPasswordHandling = + uno::Reference< ::com::sun::star::task::XMasterPasswordHandling >( + theSession->getMSF().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.task.PasswordContainer" )), uno::UNO_QUERY ); + // - + int theRetVal = pListener->authenticate( rtl::OUString::createFromAscii( inRealm ), theSession->getHostName(), theUserName, - thePassWord ); + thePassWord, + xMasterPasswordHandling.is() ? xMasterPasswordHandling->isPersistentStoringAllowed() : sal_False); + rtl::OString aUser( rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) ) @@ -1250,6 +1259,16 @@ void NeonSession::POST( const rtl::OUString & inPath, } // ------------------------------------------------------------------- +// ABORT +// ------------------------------------------------------------------- +void NeonSession::ABORT() + throw ( DAVException ) +{ + if (NULL !=m_pHttpSession) + ne_close_connection(m_pHttpSession); +} + +// ------------------------------------------------------------------- // MKCOL // ------------------------------------------------------------------- void NeonSession::MKCOL( const rtl::OUString & inPath, |