Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-04 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

ixed SmbUtil::changePermissions()
improved SmbUtil::checkValidShareName()

ixed SmbUtil::changePermissions()
improved SmbUtil::checkValidShareName()

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:477
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/556/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/178

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/556/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Small nag: Commit message should be "Fixed" not "ixed".

review: Approve

Unmerged revisions

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp'
--- src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-10-04 16:04:23 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp	2015-10-04 16:04:23 +0000
@@ -342,7 +342,7 @@
     Smb::FileHandler fd = 0;
     ::memset(st, 0, sizeof(struct stat));
     if ((fd=openDir(context, smb_path)) )
-        {
+    {
         ret = guessDirType(context,fd);
         closeHandle(context, fd);
         if (ret == StatDir)
@@ -356,7 +356,7 @@
         }
     }
     else if (errno != EACCES && errno != ECONNREFUSED) // perhaps is a file
-            {
+    {
         errno = 0;
         ret = getStat(context, smb_path,st);
     }
@@ -636,6 +636,10 @@
     {
       return false;
     }
+    if (::strcmp(shareName, "ADMIN$") == 0)
+    {
+      return false;
+    }
 
     return true;
 }
@@ -727,7 +731,7 @@
 
 bool SmbUtil::changePermissions(Smb::Context context, const QString& smb_path, mode_t mode)
 {
-    int ret = ::smbc_getFunctionChmod(context)(context, smb_path.toLocal8Bit().constBegin(), mode);
+    int ret = ::smbc_getFunctionChmod(context)(context, smb_path.toLocal8Bit().constData(), mode);
     if (ret < 0)
     {
         SHOW_ERRNO(smb_path);