Changeset 740 for vendor/current/source4/ntvfs/common

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/ntvfs/common

Files:

• brlock.c (modified) (2 diffs)
• brlock.h (modified) (1 diff)
• brlock_tdb.c (modified) (7 diffs)
• config.mk (deleted)
• notify.c (modified) (9 diffs)
• opendb_tdb.c (modified) (3 diffs)
• wscript_build (added)

vendor/current/source4/ntvfs/common/brlock.c

@@ -27 +27 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
 #include "lib/messaging/irpc.h"
@@ -126 +126 @@
         return ops->brl_close(brl, brlh);
 }
+
+/*
+ Get a number of locks associated with a open file.
+*/
+NTSTATUS brl_count(struct brl_context *brl,
+                   struct brl_handle *brlh,
+                   int *count)
+{
+        return ops->brl_count(brl, brlh, count);
+}

vendor/current/source4/ntvfs/common/brlock.h

@@ -47 +47 @@
         NTSTATUS (*brl_close)(struct brl_context *,
                               struct brl_handle *);
+        NTSTATUS (*brl_count)(struct brl_context *,
+                              struct brl_handle *,
+                              int *count);
 };
 

vendor/current/source4/ntvfs/common/brlock_tdb.c

@@ -27 +27 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
-#include "tdb_wrap.h"
+#include "lib/util/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/libcli.h"
@@ -81 +81 @@
 };
 
+/* see if we have wrapped locks, which are no longer allowed (windows
+ * changed this in win7 */
+static bool brl_invalid_lock_range(uint64_t start, uint64_t size)
+{
+        return (size > 1 && (start + size < start));
+}
+
 /*
   Open up the brlock.tdb database. Close it down using
@@ -299 +306 @@
         kbuf.dptr = brlh->key.data;
         kbuf.dsize = brlh->key.length;
+
+        if (brl_invalid_lock_range(start, size)) {
+                return NT_STATUS_INVALID_LOCK_RANGE;
+        }
 
         if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
@@ -449 +460 @@
         kbuf.dptr = brlh->key.data;
         kbuf.dsize = brlh->key.length;
+
+        if (brl_invalid_lock_range(start, size)) {
+                return NT_STATUS_INVALID_LOCK_RANGE;
+        }
 
         if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
@@ -621 +636 @@
         kbuf.dsize = brlh->key.length;
 
+        if (brl_invalid_lock_range(start, size)) {
+                return NT_STATUS_INVALID_LOCK_RANGE;
+        }
+
         dbuf = tdb_fetch(brl->w->tdb, kbuf);
         if (dbuf.dptr == NULL) {
@@ -720 +739 @@
 }
 
+static NTSTATUS brl_tdb_count(struct brl_context *brl, struct brl_handle *brlh,
+                              int *count)
+{
+        TDB_DATA kbuf, dbuf;
+
+        kbuf.dptr = brlh->key.data;
+        kbuf.dsize = brlh->key.length;
+        *count = 0;
+
+        if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
+                return NT_STATUS_INTERNAL_DB_CORRUPTION;
+        }
+
+        dbuf = tdb_fetch(brl->w->tdb, kbuf);
+        if (!dbuf.dptr) {
+                tdb_chainunlock(brl->w->tdb, kbuf);
+                return NT_STATUS_OK;
+        }
+
+        *count = dbuf.dsize / sizeof(struct lock_struct);
+
+        free(dbuf.dptr);
+        tdb_chainunlock(brl->w->tdb, kbuf);
+
+        return NT_STATUS_OK;
+}
 
 static const struct brlock_ops brlock_tdb_ops = {
@@ -728 +773 @@
         .brl_remove_pending = brl_tdb_remove_pending,
         .brl_locktest       = brl_tdb_locktest,
-        .brl_close          = brl_tdb_close
+        .brl_close          = brl_tdb_close,
+        .brl_count          = brl_tdb_count
 };
 

vendor/current/source4/ntvfs/common/notify.c

@@ -26 +26 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "messaging/messaging.h"
-#include "tdb_wrap.h"
+#include "lib/util/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
-#include "librpc/gen_ndr/ndr_notify.h"
+#include "librpc/gen_ndr/ndr_s4_notify.h"
 #include "../lib/util/dlinklist.h"
 #include "ntvfs/common/ntvfs_common.h"
@@ -37 +37 @@
 #include "cluster/cluster.h"
 #include "param/param.h"
+#include "lib/util/tsort.h"
 
 struct notify_context {
@@ -46 +47 @@
         int seqnum;
         struct sys_notify_context *sys_notify_ctx;
-        struct smb_iconv_convenience *iconv_convenience;
 };
 
@@ -113 +113 @@
         notify->list = NULL;
         notify->array = NULL;
-        notify->iconv_convenience = lp_iconv_convenience(lp_ctx);
         notify->seqnum = tdb_get_seqnum(notify->w->tdb);
 
@@ -178 +177 @@
         blob.length = dbuf.dsize;
 
-        ndr_err = ndr_pull_struct_blob(&blob, notify->array, notify->iconv_convenience,
-                                       notify->array,
+        ndr_err = ndr_pull_struct_blob(&blob, notify->array, notify->array,
                                        (ndr_pull_flags_fn_t)ndr_pull_notify_array);
         free(dbuf.dptr);
@@ -227 +225 @@
         NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, notify->iconv_convenience, notify->array,
+        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, notify->array,
                                        (ndr_push_flags_fn_t)ndr_push_notify_array);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -263 +261 @@
         }
 
-        ndr_err = ndr_pull_struct_blob(data, tmp_ctx, notify->iconv_convenience, &ev,
+        ndr_err = ndr_pull_struct_blob(data, tmp_ctx, &ev,
                                       (ndr_pull_flags_fn_t)ndr_pull_notify_event);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -329 +327 @@
         d->max_mask_subdir |= e->subdir_filter;
 
-        if (d->num_entries > 1) {
-                qsort(d->entries, d->num_entries, sizeof(d->entries[0]), notify_compare);
-        }
+        TYPESAFE_QSORT(d->entries, d->num_entries, notify_compare);
 
         /* recalculate the maximum masks */
@@ -562 +558 @@
         tmp_ctx = talloc_new(notify);
 
-        ndr_err = ndr_push_struct_blob(&data, tmp_ctx, notify->iconv_convenience, &ev, (ndr_push_flags_fn_t)ndr_push_notify_event);
+        ndr_err = ndr_push_struct_blob(&data, tmp_ctx, &ev, (ndr_push_flags_fn_t)ndr_push_notify_event);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 talloc_free(tmp_ctx);

vendor/current/source4/ntvfs/common/opendb_tdb.c

@@ -41 +41 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
-#include "tdb_wrap.h"
+#include "lib/util/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_opendb.h"
@@ -247 +247 @@
         blob.length = dbuf.dsize;
 
-        ndr_err = ndr_pull_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file);
+        ndr_err = ndr_pull_struct_blob(&blob, lck, file, (ndr_pull_flags_fn_t)ndr_pull_opendb_file);
         free(dbuf.dptr);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -275 +275 @@
         }
 
-        ndr_err = ndr_push_struct_blob(&blob, lck, lp_iconv_convenience(lck->odb->ntvfs_ctx->lp_ctx), file, (ndr_push_flags_fn_t)ndr_push_opendb_file);
+        ndr_err = ndr_push_struct_blob(&blob, lck, file, (ndr_push_flags_fn_t)ndr_push_opendb_file);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 return ndr_map_error2ntstatus(ndr_err);