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

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

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

trunk/server/source3/modules/vfs_catia.c

@@ -11 +11 @@
  * Copyright (C) Volker Lendecke, 2005
  * Copyright (C) Aravind Srinivasan, 2009
+ * Copyright (C) Guenter Kukkukk, 2013
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29 +30 @@
 #include "includes.h"
 #include "smbd/smbd.h"
+
+static int vfs_catia_debug_level = DBGC_VFS;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS vfs_catia_debug_level
 
 #define GLOBAL_SNUM     0xFFFFFFF
@@ -296 +302 @@
         char *name = NULL;
         char *mapped_name;
-        NTSTATUS ret;
+        NTSTATUS status, ret;
 
         /*
@@ -309 +315 @@
                 return NT_STATUS_NO_MEMORY;
         }
-        ret = catia_string_replace_allocate(handle->conn, name,
+        status = catia_string_replace_allocate(handle->conn, name,
                         &mapped_name, direction);
 
         TALLOC_FREE(name);
-        if (!NT_STATUS_IS_OK(ret)) {
-                return ret;
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
         }
 
@@ -322 +328 @@
         if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
                 *pmapped_name = talloc_move(mem_ctx, &mapped_name);
+                /* we need to return the former translation result here */
+                ret = status;
         } else {
                 TALLOC_FREE(mapped_name);
@@ -1021 +1029 @@
 NTSTATUS vfs_catia_init(void)
 {
-        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
+        NTSTATUS ret;
+
+        ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
                                 &vfs_catia_fns);
-}
+        if (!NT_STATUS_IS_OK(ret))
+                return ret;
+
+        vfs_catia_debug_level = debug_add_class("catia");
+        if (vfs_catia_debug_level == -1) {
+                vfs_catia_debug_level = DBGC_VFS;
+                DEBUG(0, ("vfs_catia: Couldn't register custom debugging "
+                          "class!\n"));
+        } else {
+                DEBUG(10, ("vfs_catia: Debug class number of "
+                           "'catia': %d\n", vfs_catia_debug_level));
+        }
+
+        return ret;
+
+}