Changeset 988 for vendor/current/source3/libsmb/smb_share_modes.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/smb_share_modes.c (modified) (22 diffs)

vendor/current/source3/libsmb/smb_share_modes.c

@@ -2 +2 @@
    Samba share mode database library external interface library.
    Used by non-Samba products needing access to the Samba share mode db.
+
+
+
+
+
+
+
+
 
    Copyright (C) Jeremy Allison 2005 - 2006
@@ -29 +37 @@
 #include "smb_share_modes.h"
 #include <tdb.h>
+
 
 /* Database context handle. */
@@ -40 +49 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 int smb_create_share_mode_entry_ex(struct smbdb_ctx *db_ctx, uint64_t dev,
                                 uint64_t ino, uint64_t extid,
@@ -69 +107 @@
         memset(smb_db, '\0', sizeof(struct smbdb_ctx));
 
+
         smb_db->smb_tdb = tdb_open(db_path,
-                                0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
-                                O_RDWR|O_CREAT,
-                                0644);
+                                0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+                                O_RDWR|O_CREAT,
+                                0644);
 
         if (!smb_db->smb_tdb) {
@@ -106 +145 @@
         lk->inode = (SMB_INO_T)ino;
         lk->extid = extid;
-        ld.dptr = (uint8 *)lk;
+        ld.dptr = (uint8 *)lk;
         ld.dsize = sizeof(*lk);
         return ld;
@@ -122 +161 @@
         struct locking_key lk;
         return tdb_chainlock(db_ctx->smb_tdb, get_locking_key(&lk, dev, ino,
-                                                              extid));
+                                                              extid));
 }
 
@@ -131 +170 @@
 {
         struct locking_key lk;
-        return tdb_chainunlock(db_ctx->smb_tdb,
-                               get_locking_key(&lk, dev, ino, extid));
+        tdb_chainunlock(db_ctx->smb_tdb,
+                        get_locking_key(&lk, dev, ino, extid));
+        return 0;
 }
 
@@ -172 +212 @@
         out->id.inode = in->ino;
         out->id.extid = in->extid;
-        out->uid = (uint32)geteuid();
+        out->uid = (uint32)geteuid();
         out->flags = 0;
         out->name_hash = name_hash;
@@ -201 +241 @@
         *p_delete_on_close = 0;
 
-        db_data = tdb_fetch(db_ctx->smb_tdb, get_locking_key(&lk, dev, ino,
-                                                             extid));
+        db_data = tdb_fetch(db_ctx->smb_tdb,
+                         extid));
         if (!db_data.dptr) {
                 return 0;
@@ -234 +274 @@
                 if (kill(sharemodes_procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
                         continue; /* No longer exists. */
-                }
-
-                /* Ignore deferred open entries. */
-                if (share->op_type == DEFERRED_OPEN_ENTRY) {
-                        continue;
                 }
 
@@ -268 +303 @@
 static uint32_t smb_name_hash(const char *sharepath, const char *filename, int *err)
 {
-        TDB_DATA key;
         char *fullpath = NULL;
         size_t sharepath_size = strlen(sharepath);
         size_t filename_size = strlen(filename);
         uint32_t name_hash;
+
 
         *err = 0;
@@ -284 +319 @@
         memcpy(&fullpath[sharepath_size + 1], filename, filename_size + 1);
 
-        key.dptr = (uint8_t *)fullpath;
-        key.dsize = strlen(fullpath) + 1;
+        key
+        ;
         name_hash = tdb_jenkins_hash(&key);
         free(fullpath);
@@ -309 +344 @@
         struct locking_data *ld = NULL; /* internal samba db state. */
         struct share_mode_entry *shares = NULL;
-        uint8 *new_data_p = NULL;
+        uint8 *new_data_p = NULL;
         size_t new_data_size = 0;
         int err = 0;
@@ -321 +356 @@
         if (!db_data.dptr) {
                 /* We must create the entry. */
-                db_data.dptr = (uint8 *)malloc(
+                db_data.dptr = (uint8 *)malloc(
                         sizeof(struct locking_data) +
                         sizeof(struct share_mode_entry) +
@@ -347 +382 @@
                                         strlen(sharepath) + 1 +
                                         strlen(filename) + 1;
-                if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_INSERT) == -1) {
+                if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_INSERT) ) {
                         free(db_data.dptr);
                         return -1;
@@ -356 +391 @@
 
         /* Entry exists, we must add a new entry. */
-        new_data_p = (uint8 *)malloc(
+        new_data_p = (uint8 *)malloc(
                 db_data.dsize + sizeof(struct share_mode_entry));
         if (!new_data_p) {
@@ -390 +425 @@
         db_data.dsize = new_data_size;
 
-        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) == -1) {
+        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) ) {
                 free(db_data.dptr);
                 return -1;
@@ -430 +465 @@
         struct locking_data *ld = NULL; /* internal samba db state. */
         struct share_mode_entry *shares = NULL;
-        uint8 *new_data_p = NULL;
+        uint8 *new_data_p = NULL;
         size_t remaining_size = 0;
         size_t i, num_share_modes;
-        const uint8 *remaining_ptr = NULL;
+        const uint8 *remaining_ptr = NULL;
 
         db_data = tdb_fetch(db_ctx->smb_tdb, locking_key);
@@ -453 +488 @@
                 /* It's ours - just remove the entire record. */
                 free(db_data.dptr);
-                return tdb_delete(db_ctx->smb_tdb, locking_key);
+                return tdb_delete(db_ctx->smb_tdb, locking_key);
         }
 
         /* More than one - allocate a new record minus the one we'll delete. */
-        new_data_p = (uint8 *)malloc(
+        new_data_p = (uint8 *)malloc(
                 db_data.dsize - sizeof(struct share_mode_entry));
         if (!new_data_p) {
@@ -492 +527 @@
                 free(db_data.dptr);
                 free(new_data_p);
-                return tdb_delete(db_ctx->smb_tdb, locking_key);
+                return tdb_delete(db_ctx->smb_tdb, locking_key);
         }
 
@@ -513 +548 @@
         db_data.dsize = sizeof(struct locking_data) + (num_share_modes * sizeof(struct share_mode_entry)) + remaining_size;
 
-        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) == -1) {
+        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) ) {
                 free(db_data.dptr);
                 return -1;
@@ -568 +603 @@
 
         /* Save modified data. */
-        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) == -1) {
+        if (tdb_store(db_ctx->smb_tdb, locking_key, db_data, TDB_REPLACE) ) {
                 free(db_data.dptr);
                 return -1;