Changeset 745 for trunk/server/source3/modules/vfs_catia.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_catia.c (modified) (6 diffs)

trunk/server/source3/modules/vfs_catia.c

@@ -28 +28 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #define GLOBAL_SNUM     0xFFFFFFF
@@ -236 +237 @@
 
         if ((push_ucs2_talloc(ctx, &tmpbuf, name_in,
-                              &converted_size)) == -1) {
+                              &converted_size)) == false) {
                 return map_nt_error_from_unix(errno);
         }
@@ -253 +254 @@
 
         if ((pull_ucs2_talloc(ctx, mapped_name, tmpbuf,
-                              &converted_size)) == -1) {
+                              &converted_size)) == false) {
                 TALLOC_FREE(tmpbuf);
                 return map_nt_error_from_unix(errno);
@@ -635 +636 @@
 
 static char *
-catia_realpath(vfs_handle_struct *handle, const char *path,
-               char *resolved_path)
+catia_realpath(vfs_handle_struct *handle, const char *path)
 {
         char *mapped_name = NULL;
@@ -649 +649 @@
         }
 
-        ret = SMB_VFS_NEXT_REALPATH(handle, mapped_name, resolved_path);
+        ret = SMB_VFS_NEXT_REALPATH(handle, mapped_name);
         TALLOC_FREE(mapped_name);
 
@@ -991 +991 @@
         .rmdir = catia_rmdir,
         .opendir = catia_opendir,
-        .open = catia_open,
+        .open_fn = catia_open,
         .rename = catia_rename,
         .stat = catia_stat,