[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kioslave/smb
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-02-22 19:10:36
Message-ID: 20040222191036.D66D29959 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

Making KDE Enterprise-Ready in redirecting in case the user name changed
CCMAIL: 68893-done@bugs.kde.org


  M +13 -11    kio_smb_browse.cpp   1.30


--- kdebase/kioslave/smb/kio_smb_browse.cpp  #1.29:1.30
@@ -44,6 +44,6 @@ using namespace KIO;
 int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st )
 {
-    int result = smbc_stat(url.toSmbcUrl(), st);
-    kdDebug(KIO_SMB) << "smbc_stat " << url.toSmbcUrl() << " " << errno << " " << \
result << endl; +    int result = smbc_stat( url.toSmbcUrl(), st);
+    kdDebug(KIO_SMB) << "smbc_stat " << url.prettyUrl() << " " << errno << " " << \
result << endl;  return result;
 }
@@ -57,5 +57,4 @@ bool SMBSlave::browse_stat_path(const SM
     SMBUrl url = _url;
 
- again:
    if(cache_stat(url, &st) == 0)
    {
@@ -115,6 +114,8 @@ bool SMBSlave::browse_stat_path(const SM
        if (!ignore_errors) {
            if (errno == EPERM || errno == EACCES)
-               if (checkPassword(url))
-                   goto again;
+               if (checkPassword(url)) {
+                   redirection( url );
+                   return false;
+               }
 
            reportError(url);
@@ -140,5 +141,4 @@ void SMBSlave::stat( const KURL& kurl )
     {
         redirection(url);
-        finished();
         return;
     }
@@ -280,5 +280,5 @@ void SMBSlave::reportError(const SMBUrl 
 void SMBSlave::listDir( const KURL& kurl )
 {
-   kdDebug(KIO_SMB) << "SMBSlave::listDir on " << kurl << endl;
+   kdDebug(KIO_SMB) << "SMBSlave::listDir on " << kurl.url() << endl;
 
    // check (correct) URL
@@ -299,5 +299,4 @@ void SMBSlave::listDir( const KURL& kurl
    UDSAtom     atom;
 
- again:
    dirfd = smbc_opendir( m_current_url.toSmbcUrl() );
    kdDebug(KIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " \
<< m_current_url.getType() << " " << dirfd << endl; @@ -406,6 +405,9 @@ void \
SMBSlave::listDir( const KURL& kurl  {
        if (errno == EPERM || errno == EACCES)
-           if (checkPassword(m_current_url))
-               goto again;
+           if (checkPassword(m_current_url)) {
+               redirection( m_current_url );
+               finished();
+               return;
+           }
 
        reportError(m_current_url);


[prev in list] [next in list] [prev in thread] [next in thread]