Changeset 745 for trunk/server/source3/modules/vfs_recycle.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_recycle.c (modified) (15 diffs)

trunk/server/source3/modules/vfs_recycle.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "auth.h"
 
 #define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
@@ -62 +66 @@
 {
         const char *tmp_str = NULL;
-        
 
         tmp_str = lp_parm_const_string(SNUM(handle->conn), "recycle", "repository",".recycle");
 
         DEBUG(10, ("recycle: repository = %s\n", tmp_str));
-        
+
         return tmp_str;
 }
@@ -74 +77 @@
 {
         bool ret;
-        
+
         ret = lp_parm_bool(SNUM(handle->conn), "recycle", "keeptree", False);
 
         DEBUG(10, ("recycle_bin: keeptree = %s\n", ret?"True":"False"));
-        
+
         return ret;
 }
@@ -89 +92 @@
 
         DEBUG(10, ("recycle: versions = %s\n", ret?"True":"False"));
-        
+
         return ret;
 }
@@ -100 +103 @@
 
         DEBUG(10, ("recycle: touch = %s\n", ret?"True":"False"));
-        
+
         return ret;
 }
@@ -111 +114 @@
 
         DEBUG(10, ("recycle: touch_mtime = %s\n", ret?"True":"False"));
-        
+
         return ret;
 }
@@ -118 +121 @@
 {
         const char **tmp_lp;
-        
+
         tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "exclude", NULL);
 
         DEBUG(10, ("recycle: exclude = %s ...\n", tmp_lp?*tmp_lp:""));
-        
+
         return tmp_lp;
 }
@@ -129 +132 @@
 {
         const char **tmp_lp;
-        
+
         tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "exclude_dir", NULL);
 
         DEBUG(10, ("recycle: exclude_dir = %s ...\n", tmp_lp?*tmp_lp:""));
-        
+
         return tmp_lp;
 }
@@ -140 +143 @@
 {
         const char **tmp_lp;
-        
+
         tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "noversions", NULL);
 
         DEBUG(10, ("recycle: noversions = %s\n", tmp_lp?*tmp_lp:""));
-        
+
         return tmp_lp;
 }
@@ -151 +154 @@
 {
         SMB_OFF_T maxsize;
-        
+
         maxsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
                                             "recycle", "maxsize", NULL));
 
         DEBUG(10, ("recycle: maxsize = %lu\n", (long unsigned int)maxsize));
-        
+
         return maxsize;
 }
@@ -163 +166 @@
 {
         SMB_OFF_T minsize;
-        
+
         minsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
                                             "recycle", "minsize", NULL));
 
         DEBUG(10, ("recycle: minsize = %lu\n", (long unsigned int)minsize));
-        
+
         return minsize;
 }
@@ -465 +468 @@
 
         repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)),
-                                        conn->server_info->unix_name,
+                                        conn->session_info->unix_name,
                                         conn->connectpath,
-                                        conn->server_info->utok.gid,
-                                        conn->server_info->sanitized_username,
-                                        pdb_get_domain(conn->server_info->sam_account),
+                                        conn->session_info->utok.gid,
+                                        conn->session_info->sanitized_username,
+                                        conn->session_info->info3->base.domain.string,
                                         recycle_repository(handle));
         ALLOC_CHECK(repository, done);
@@ -475 +478 @@
         /* Yes :-). JRA. */
         trim_char(repository, '\0', '/');
-        
+
         if(!repository || *(repository) == '\0') {
                 DEBUG(3, ("recycle: repository path not set, purging %s...\n",
@@ -674 +677 @@
         if (!NT_STATUS_IS_OK(ret))
                 return ret;
-        
+
         vfs_recycle_debug_level = debug_add_class("recycle");
         if (vfs_recycle_debug_level == -1) {
@@ -682 +685 @@
                 DEBUG(10, ("vfs_recycle: Debug class number of 'recycle': %d\n", vfs_recycle_debug_level));
         }
-        
+
         return ret;
 }