Changeset 989 for vendor/current/source3/lib

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source3/lib

Files:

• dbwrap/dbwrap_ctdb.c (modified) (5 diffs)
• dumpcore.c (modified) (1 diff)
• events.c (deleted)
• gencache.c (modified) (1 diff)
• msghdr.c (modified) (1 diff)
• poll_funcs/poll_funcs_tevent.c (modified) (2 diffs)
• server_contexts.c (modified) (1 diff)
• substitute.c (modified) (2 diffs)
• sysquotas_4B.c (modified) (1 diff)
• util_event.c (added)

vendor/current/source3/lib/dbwrap/dbwrap_ctdb.c

@@ -1217 +1217 @@
         bool ask_for_readonly_copy;
         bool done;
+        bool empty_record;
 };
 
@@ -1236 +1237 @@
 
         if (db_ctdb_can_use_local_hdr(header, true)) {
-                state->parser(key, data, state->private_data);
+                /*
+                 * A record consisting only of the ctdb header can be
+                 * a validly created empty record or a tombstone
+                 * record of a deleted record (not vacuumed yet). Mark
+                 * it accordingly.
+                 */
+                state->empty_record = (data.dsize == 0);
+                if (!state->empty_record) {
+                        state->parser(key, data, state->private_data);
+                }
                 state->done = true;
         } else {
@@ -1262 +1272 @@
         state.parser = parser;
         state.private_data = private_data;
+        state.empty_record = false;
 
         if (ctx->transaction != NULL) {
@@ -1293 +1304 @@
                 ctx, key, db_ctdb_parse_record_parser_nonpersistent, &state);
         if (NT_STATUS_IS_OK(status) && state.done) {
+                if (state.empty_record) {
+                        /*
+                         * We know authoritatively, that this is an empty
+                         * record. Since ctdb does not distinguish between empty
+                         * and deleted records, this can be a record stored as
+                         * empty or a not-yet-vacuumed tombstone record of a
+                         * deleted record. Now Samba right now can live without
+                         * empty records, so we can safely report this record
+                         * as non-existing.
+                         *
+                         * See bugs 10008 and 12005.
+                         */
+                        return NT_STATUS_NOT_FOUND;
+                }
                 return NT_STATUS_OK;
         }
@@ -1299 +1324 @@
                           state.ask_for_readonly_copy, parser, private_data);
         if (ret != 0) {
+                if (ret == ENOENT) {
+                        /*
+                         * This maps to
+                         * NT_STATUS_OBJECT_NAME_NOT_FOUND. Our upper
+                         * layers expect NT_STATUS_NOT_FOUND for "no
+                         * record around". We need to convert dbwrap
+                         * to 0/errno away from NTSTATUS ... :-)
+                         */
+                        return NT_STATUS_NOT_FOUND;
+                }
                 return map_nt_error_from_unix(ret);
         }

vendor/current/source3/lib/dumpcore.c

@@ -252 +252 @@
         }
 
-
-#ifdef HAVE_GETRLIMIT
-#ifdef RLIMIT_CORE
-        {
-                struct rlimit rlp;
-                getrlimit(RLIMIT_CORE, &rlp);
-                rlp.rlim_cur = MAX(16*1024*1024,rlp.rlim_cur);
-                setrlimit(RLIMIT_CORE, &rlp);
-                getrlimit(RLIMIT_CORE, &rlp);
-                DEBUG(3,("Maximum core file size limits now %d(soft) %d(hard)\n",
-                         (int)rlp.rlim_cur,(int)rlp.rlim_max));
-        }
-#endif
-#endif
-
         /* FIXME: if we have a core-plus-pid facility, configurably set
          * this up here.

vendor/current/source3/lib/gencache.c

@@ -671 +671 @@
         }
 
-        res = tdb_lockall(cache_notrans->tdb);
+        res = tdb_lockall_nonblock(cache_notrans->tdb);
         if (res != 0) {
                 tdb_transaction_cancel(cache->tdb);

vendor/current/source3/lib/msghdr.c

@@ -205 +205 @@
                 msgsize - offsetof(struct msghdr_buf, buf) : 0;
 
-        fd_len = msghdr_prep_fds(&msg->msg, msg->buf, bufsize, fds, num_fds);
+        if (msg != NULL) {
+                msg->msg = (struct msghdr) { 0 };
+
+                fd_len = msghdr_prep_fds(&msg->msg, msg->buf, bufsize,
+                                         fds, num_fds);
+        } else {
+                fd_len = msghdr_prep_fds(NULL, NULL, bufsize, fds, num_fds);
+        }
 
         if (fd_len == -1) {

vendor/current/source3/lib/poll_funcs/poll_funcs_tevent.c

@@ -303 +303 @@
                 TALLOC_FREE(state->watches[i]);
         }
+        for (i=0; i<state->num_contexts; i++) {
+                TALLOC_FREE(state->contexts[i]);
+        }
         return 0;
 }
@@ -316 +319 @@
         unsigned i;
 
+        /* Look for an existing match first. */
         for (i=0; i<state->num_contexts; i++) {
                 struct poll_funcs_tevent_context *ctx = state->contexts[i];
 
-                if ((ctx == NULL) || (ctx->ev == ev)) {
+                if (ctx != NULL && ctx->ev == ev) {
                         *slot = i;
                         return true;
                 }
         }
+
+        /* Now look for a free slot. */
+        for (i=0; i<state->num_contexts; i++) {
+                struct poll_funcs_tevent_context *ctx = state->contexts[i];
+
+                if (ctx == NULL) {
+                        *slot = i;
+                        return true;
+                }
+        }
+
 
         contexts = talloc_realloc(state, state->contexts,

vendor/current/source3/lib/server_contexts.c

@@ -32 +32 @@
                  * children exiting.
                  */
-                server_event_ctx = s3_tevent_context_init(NULL);
+                server_event_ctx = samba_tevent_context_init(NULL);
         }
         if (!server_event_ctx) {

vendor/current/source3/lib/substitute.c

@@ -500 +500 @@
                 case 'G' : {
                         struct passwd *pass;
+                        bool is_domain_name = false;
+                        const char *sep = lp_winbind_separator();
 
                         if (domain_name != NULL && domain_name[0] != '\0' &&
-                            !strequal(domain_name, my_sam_name()))
-                        {
+                            (lp_security() == SEC_ADS ||
+                             lp_security() == SEC_DOMAIN)) {
                                 r = talloc_asprintf(tmp_ctx,
                                                     "%s%c%s",
                                                     domain_name,
-                                                    *lp_winbind_separator(),
+                                                    *sep,
                                                     smb_name);
+                                is_domain_name = true;
                         } else {
                                 r = talloc_strdup(tmp_ctx, smb_name);
@@ -518 +521 @@
                         pass = Get_Pwnam_alloc(tmp_ctx, r);
                         if (pass != NULL) {
-                                a_string = realloc_string_sub(
-                                        a_string, "%G",
-                                        gidtoname(pass->pw_gid));
+                                char *group_name;
+
+                                group_name = gidtoname(pass->pw_gid);
+                                if (is_domain_name) {
+                                        p = strchr_m(group_name, *sep);
+                                        if (p != NULL) {
+                                                group_name = p + 1;
+                                        }
+                                }
+                                a_string = realloc_string_sub(a_string,
+                                                              "%G",
+                                                              group_name);
                         }
                         TALLOC_FREE(pass);

vendor/current/source3/lib/sysquotas_4B.c

@@ -82 +82 @@
         dp->curblocks = XLATE_TO_BLOCKS(qblk->dqb_curbytes);
 #undef XLATE_TO_BLOCKS
+#else
+        dp->bsize = DEV_BSIZE;
+
+        dp->softlimit = qblk->dqb_bsoftlimit;
+        dp->hardlimit = qblk->dqb_bhardlimit;
+        dp->curblocks = qblk->dqb_curblocks;
 #endif