[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1446-g798389c

[Steven Danneman]

The branch, master has been updated
       via  798389c49aa7167157d052f1513f1c81f77e10f7 (commit)
      from  386a5d99b32fa1296618f59f9a9072d9faf2c8ac (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 798389c49aa7167157d052f1513f1c81f77e10f7
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Tue May 5 14:42:19 2009 -0700

    s3:onefs.so Change system function names
    
    Addendum to c49730e1.  Use newer cookie conversion names.

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/onefs_dir.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 8c056d9..47da33f 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -431,7 +431,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset)
 	}
 
 	/* Convert offset to resume_cookie */
-	resume_cookie = rdp_offset2cookie(offset);
+	resume_cookie = rdp_offset31_to_cookie63(offset);
 
 	DEBUG(9, ("Seek DIR %p, offset: %ld, resume_cookie: %#llx\n",
 		 dsp->dirp, offset, resume_cookie));
@@ -487,11 +487,11 @@ onefs_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
 	}
 
 	/* Convert resume_cookie to offset */
-	offset = rdp_cookie2offset(dsp->resume_cookie);
+	offset = rdp_cookie63_to_offset31(dsp->resume_cookie);
 	if (offset < 0) {
 		DEBUG(1, ("Unable to convert resume_cookie: %#llx to a "
-			 "suitable 32-bit offset value.\n",
-			 dsp->resume_cookie));
+			 "suitable 32-bit offset value. Error: %s\n",
+			 dsp->resume_cookie, strerror(errno)));
 		return -1;
 	}
 


-- 
Samba Shared Repository