Changeset 745 for trunk/server/source3/modules/vfs_scannedonly.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_scannedonly.c (modified) (11 diffs)

trunk/server/source3/modules/vfs_scannedonly.c

@@ -2 +2 @@
  * scannedonly VFS module for Samba 3.5
  *
- * Copyright 2007,2008,2009 (C) Olivier Sessink
+ * Copyright 2007,2008,2009,2010 (C) Olivier Sessink
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49 +49 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
 
 #include "config.h"
@@ -378 +380 @@
         TALLOC_CTX *ctx=talloc_tos();
         char *cachefile;
-        int retval;
+        int retval = -1;
         int didloop;
         DEBUG(SCANNEDONLY_DEBUG,
@@ -477 +479 @@
                 while (retval != 0      /*&& errno == ENOENT */
                        && i < recheck_tries) {
-                        struct timespec req = { 0, recheck_time * 10000 };
                         DEBUG(SCANNEDONLY_DEBUG,
                               ("scannedonly_allow_access, wait (try=%d "
@@ -483 +484 @@
                                i, recheck_tries,
                                recheck_time, cache_smb_fname->base_name));
-                        nanosleep(&req, NULL);
+                        smb_msleep(recheck_time);
                         retval = SMB_VFS_NEXT_STAT(handle, cache_smb_fname);
                         i++;
@@ -527 +528 @@
         return (SMB_STRUCT_DIR *) sDIR;
 }
+
+static SMB_STRUCT_DIR *scannedonly_fdopendir(vfs_handle_struct * handle,
+                                           files_struct *fsp,
+                                           const char *mask, uint32 attr)
+{
+        SMB_STRUCT_DIR *DIRp;
+        struct scannedonly_DIR *sDIR;
+        const char *fname;
+
+        DIRp = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+        if (!DIRp) {
+                return NULL;
+        }
+
+        fname = (const char *)fsp->fsp_name->base_name;
+
+        sDIR = TALLOC_P(NULL, struct scannedonly_DIR);
+        if (fname[0] != '/') {
+                sDIR->base = construct_full_path(sDIR,handle, fname, true);
+        } else {
+                sDIR->base = name_w_ending_slash(sDIR, fname);
+        }
+        DEBUG(SCANNEDONLY_DEBUG,
+                        ("scannedonly_fdopendir, fname=%s, base=%s\n",fname,sDIR->base));
+        sDIR->DIR = DIRp;
+        sDIR->notify_loop_done = 0;
+        return (SMB_STRUCT_DIR *) sDIR;
+}
+
 
 static SMB_STRUCT_DIRENT *scannedonly_readdir(vfs_handle_struct *handle,
@@ -767 +797 @@
         struct smb_filename *smb_fname_dst_tmp = NULL;
         char *cachefile_src, *cachefile_dst;
+        bool needscandst=false;
+        int ret;
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -778 +810 @@
                 smb_fname_dst->base_name,
                 STRUCTSCANO(handle->data)->p_scanned);
-
         create_synthetic_smb_fname(ctx, cachefile_src,NULL,NULL,
                                    &smb_fname_src_tmp);
@@ -784 +815 @@
                                    &smb_fname_dst_tmp);
 
-        if (SMB_VFS_NEXT_RENAME(handle, smb_fname_src_tmp, smb_fname_dst_tmp)
-            != 0) {
+        ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src_tmp, smb_fname_dst_tmp);
+        if (ret == ENOENT) {
+                needscandst=true;
+        } else if (ret != 0) {
                 DEBUG(SCANNEDONLY_DEBUG,
-                      ("failed to rename %s into %s\n", cachefile_src,
-                       cachefile_dst));
-        }
-        return SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst);
+                      ("failed to rename %s into %s error %d: %s\n", cachefile_src,
+                       cachefile_dst, ret, strerror(ret)));
+                needscandst=true;
+        }
+        ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst);
+        if (ret == 0 && needscandst) {
+                notify_scanner(handle, smb_fname_dst->base_name);
+                flush_sendbuffer(handle);
+        }
+        return ret;
 }
 
@@ -979 +1018 @@
 static struct vfs_fn_pointers vfs_scannedonly_fns = {
         .opendir = scannedonly_opendir,
+        .fdopendir = scannedonly_fdopendir,
         .readdir = scannedonly_readdir,
         .seekdir = scannedonly_seekdir,
@@ -987 +1027 @@
         .stat = scannedonly_stat,
         .lstat = scannedonly_lstat,
-        .open = scannedonly_open,
+        .open_fn = scannedonly_open,
         .close_fn = scannedonly_close,
         .rename = scannedonly_rename,