Fix bug in SMB2 rename implementation which fails to rename directory

Author: miketeo

CHANGELOG

@@ -1,4 +1,10 @@
 
+pysmb-1.1.13, 18 Oct 2014
+=========================
+
+- Add missing methods and improve compatibility with python3
+- Fix bug in SMB2 rename implementation which fails to rename directory
+
 pysmb-1.1.12, 21 Sep 2014
 =========================
 

python2/smb/SMBConnection.py

@@ -302,7 +302,7 @@ def eb(failure):
         return results[0]
 
     def storeFile(self, service_name, path, file_obj, timeout = 30):
-        self.storeFileFromOffset(service_name, path, file_obj, 0L, timeout)
+        return self.storeFileFromOffset(service_name, path, file_obj, 0L, timeout)
 
     def storeFileFromOffset(self, service_name, path, file_obj, offset = 0L, timeout = 30):
         """

python2/smb/base.py

@@ -1225,15 +1225,15 @@ def _rename_SMB2(self, service_name, old_path, new_path, callback, errback, time
             old_path = old_path[1:]
         if old_path.endswith('\\'):
             old_path = old_path[:-1]
-
+            
         def sendCreate(tid):
             create_context_data = binascii.unhexlify("""
-20 00 00 00 10 00 04 00 00 00 18 00 08 00 00 00
-4d 78 41 63 00 00 00 00 00 00 00 00 ff 01 1f 00
-00 00 00 00 10 00 04 00 00 00 18 00 20 00 00 00
-51 46 69 64 00 00 00 00 14 e7 01 00 00 00 50 00
-30 e0 4c 0b 80 fa ff ff 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
+28 00 00 00 10 00 04 00 00 00 18 00 10 00 00 00
+44 48 6e 51 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 18 00 00 00 10 00 04 00
+00 00 18 00 00 00 00 00 4d 78 41 63 00 00 00 00
+00 00 00 00 10 00 04 00 00 00 18 00 00 00 00 00
+51 46 69 64 00 00 00 00
 """.replace(' ', '').replace('\n', ''))
             m = SMB2Message(SMB2CreateRequest(old_path,
                                               file_attributes = 0,

python3/smb/SMBConnection.py

@@ -302,7 +302,7 @@ def eb(failure):
         return results[0]
 
     def storeFile(self, service_name, path, file_obj, timeout = 30):
-        self.storeFileFromOffset(service_name, path, file_obj, 0, timeout)
+        return self.storeFileFromOffset(service_name, path, file_obj, 0, timeout)
 
     def storeFileFromOffset(self, service_name, path, file_obj, offset = 0, timeout = 30):    
         """

python3/smb/base.py

@@ -1222,12 +1222,12 @@ def _rename_SMB2(self, service_name, old_path, new_path, callback, errback, time
 
         def sendCreate(tid):
             create_context_data = binascii.unhexlify(b"""
-20 00 00 00 10 00 04 00 00 00 18 00 08 00 00 00
-4d 78 41 63 00 00 00 00 00 00 00 00 ff 01 1f 00
-00 00 00 00 10 00 04 00 00 00 18 00 20 00 00 00
-51 46 69 64 00 00 00 00 14 e7 01 00 00 00 50 00
-30 e0 4c 0b 80 fa ff ff 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00
+28 00 00 00 10 00 04 00 00 00 18 00 10 00 00 00
+44 48 6e 51 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 18 00 00 00 10 00 04 00
+00 00 18 00 00 00 00 00 4d 78 41 63 00 00 00 00
+00 00 00 00 10 00 04 00 00 00 18 00 00 00 00 00
+51 46 69 64 00 00 00 00
 """.replace(b' ', b'').replace(b'\n', b''))
             m = SMB2Message(SMB2CreateRequest(old_path,
                                               file_attributes = 0,

setup.py

@@ -8,13 +8,13 @@
 
 setup(
     name = "pysmb",
-    version = "1.1.12",
+    version = "1.1.13",
     author = "Michael Teo",
     author_email = "[email protected]",
     license = "zlib/libpng",
     description = "pysmb is an experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines",
     keywords = "windows samba cifs sharing ftp smb linux",
-    url = "http://miketeo.net/projects/pysmb",
+    url = "https://miketeo.net/projects/pysmb",
     package_dir = pkgdir,
     packages = [ 'smb', 'smb.utils', 'nmb' ],
     install_requires = [ 'pyasn1' ],