Changeset 427 for vendor/current/lib

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

Location:

vendor/current/lib

Files:

• tevent/tevent.c (modified) (1 diff)
• tevent/tevent_internal.h (modified) (1 diff)
• tevent/tevent_signal.c (modified) (3 diffs)
• util/talloc_stack.c (modified) (2 diffs)
• util/util_tdb.c (modified) (1 diff)
• util/util_tdb.h (modified) (1 diff)

vendor/current/lib/tevent/tevent.c

@@ -177 +177 @@
                 se->event_ctx = NULL;
                 DLIST_REMOVE(ev->signal_events, se);
+                /*
+                 * This is important, Otherwise signals
+                 * are handled twice in child. eg, SIGHUP.
+                 * one added in parent, and another one in
+                 * the child. -- BoYang
+                 */
+                tevent_cleanup_pending_signal_handlers(se);
         }
 

vendor/current/lib/tevent/tevent_internal.h

@@ -300 +300 @@
                                                const char *location);
 int tevent_common_check_signal(struct tevent_context *ev);
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se);
 
 bool tevent_standard_init(void);

vendor/current/lib/tevent/tevent_signal.c

@@ -134 +134 @@
 static int tevent_common_signal_list_destructor(struct tevent_common_signal_list *sl)
 {
-        DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl);
+        if (sig_state->sig_handlers[sl->se->signum]) {
+                DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl);
+        }
         return 0;
 }
@@ -155 +157 @@
         if (sig_state->sig_handlers[se->signum] == NULL) {
                 /* restore old handler, if any */
-                sigaction(se->signum, sig_state->oldact[se->signum], NULL);
-                sig_state->oldact[se->signum] = NULL;
+                if (sig_state->oldact[se->signum]) {
+                        sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+                        sig_state->oldact[se->signum] = NULL;
+                }
 #ifdef SA_SIGINFO
                 if (se->sa_flags & SA_SIGINFO) {
-                        talloc_free(sig_state->sig_info[se->signum]);
-                        sig_state->sig_info[se->signum] = NULL;
+                        if (sig_state->sig_info[se->signum]) {
+                                talloc_free(sig_state->sig_info[se->signum]);
+                                sig_state->sig_info[se->signum] = NULL;
+                        }
                 }
 #endif
@@ -399 +405 @@
         return 1;
 }
+
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se)
+{
+        struct tevent_common_signal_list *sl;
+        sl = talloc_get_type(se->additional_data,
+                             struct tevent_common_signal_list);
+
+        tevent_common_signal_list_destructor(sl);
+
+        if (sig_state->sig_handlers[se->signum] == NULL) {
+                if (sig_state->oldact[se->signum]) {
+                        sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+                        sig_state->oldact[se->signum] = NULL;
+                }
+        }
+        return;
+}

vendor/current/lib/util/talloc_stack.c

@@ -104 +104 @@
                 }
                 talloc_free(ts->talloc_stack[i]);
+                ts->talloc_stack[i] = NULL;
         }
 
+        ts->talloc_stack[i] = NULL;
         ts->talloc_stacksize = i;
         return 0;
@@ -182 +184 @@
                 (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts);
 
-        if (ts == NULL) {
+        if (ts == NULL || ts->talloc_stacksize == 0) {
                 talloc_stackframe();
                 ts = (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts);

vendor/current/lib/util/util_tdb.c

@@ -39 +39 @@
 }
 
+bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2)
+{
+        if (t1.dsize != t2.dsize) {
+                return false;
+        }
+        return (memcmp(t1.dptr, t2.dptr, t1.dsize) == 0);
+}
+
 TDB_DATA string_tdb_data(const char *string)
 {

vendor/current/lib/util/util_tdb.h

@@ -7 +7 @@
 ****************************************************************/
 TDB_DATA make_tdb_data(const uint8_t *dptr, size_t dsize);
+bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2);
 TDB_DATA string_tdb_data(const char *string);
 TDB_DATA string_term_tdb_data(const char *string);