s3:smbd: remove old comment about scavenger timer from vfs_default_durable_reconnect()

[obnox/samba/samba-obnox.git] / source3 / smbd / durable.c

diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c
index 32fa8187e5d80013db1029efdad56665d5e56f47..9b05d48680e7894c238911df27635ae486fac6e2 100644 (file)
--- a/source3/smbd/durable.c
+++ b/source3/smbd/durable.c
@@ -173,10 +173,6 @@ NTSTATUS vfs_default_durable_disconnect(struct files_struct *fsp,
                return NT_STATUS_NOT_SUPPORTED;
        }
 
-       if (fsp->num_pending_break_messages > 0) {
-               return NT_STATUS_NOT_SUPPORTED;
-       }
-
        /*
         * For now let it be simple and do not keep
         * delete on close files durable open
@@ -616,12 +612,10 @@ NTSTATUS vfs_default_durable_reconnect(struct connection_struct *conn,
        }
 
        /* Create an smb_filename with stream_name == NULL. */
-       status = create_synthetic_smb_fname(talloc_tos(),
-                                           cookie.base_name,
-                                           NULL, NULL,
-                                           &smb_fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       smb_fname = synthetic_smb_fname(talloc_tos(), cookie.base_name,
+                                       NULL, NULL);
+       if (smb_fname == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        ret = SMB_VFS_LSTAT(conn, smb_fname);
@@ -701,20 +695,6 @@ NTSTATUS vfs_default_durable_reconnect(struct connection_struct *conn,
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       /*
-        * TODO:
-        * add scavenger timer functionality
-        *
-        * For now we always allow the reconnect
-        */
-#if 0
-       expire_time = op->global->disconnect_time;
-       expire_time += NTTIME_MAGIC(op->global->durable_timeout_msec);
-       if (expire < now) {
-               //TODO reopen and close before telling the client...
-       }
-#endif
-
        /*
         * 2. proceed with opening file
         */