r24809: Consolidate the use of temporary talloc contexts.

This adds the two functions talloc_stackframe() and talloc_tos().

 * When a new talloc stackframe is allocated with talloc_stackframe(), then
 * the TALLOC_CTX returned with talloc_tos() is reset to that new
 * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse
 * happens: The previous talloc_tos() is restored.
 *
 * This API is designed to be robust in the sense that if someone forgets to
 * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and
 * resets the talloc_tos().

The original motivation for this patch was to get rid of the
sid_string_static & friends buffers. Explicitly passing talloc context
everywhere clutters code too much for my taste, so an implicit
talloc_tos() is introduced here. Many of these static buffers are
replaced by a single static pointer.

The intended use would thus be that low-level functions can rather
freely push stuff to talloc_tos, the upper layers clean up by freeing
the stackframe. The more of these stackframes are used and correctly
freed the more exact the memory cleanup happens.

This patch removes the main_loop_talloc_ctx, tmp_talloc_ctx and
lp_talloc_ctx (did I forget any?)

So, never do a

tmp_ctx = talloc_init("foo");

anymore, instead, use

tmp_ctx = talloc_stackframe()

:-)

Volker
(This used to be commit 6585ea2cb7f417e14540495b9c7380fe9c8c717b)

2 files changed, 8 insertions, 9 deletions

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index ecc30e140a..d7368a3d34 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -755,11 +755,6 @@ static int process_loop(int listen_sock, int listen_priv_sock)
 
 	rescan_trusted_domains();
 
-	/* Free up temporary memory */
-
-	lp_TALLOC_FREE();
-	main_loop_TALLOC_FREE();
-
 	/* Initialise fd lists for select() */
 
 	maxfd = MAX(listen_sock, listen_priv_sock);
@@ -938,12 +933,14 @@ static void winbindd_process_loop(enum smb_server_mode server_mode)
 	}
 
 	for (;;) {
+		TALLOC_CTX *frame = talloc_stackframe();
 		int clients = process_loop(listen_public, listen_priv);
 
 		/* Don't bother figuring out the idle time if we won't be
 		 * timing out anyway.
 		 */
 		if (idle_timeout_sec < 0) {
+			TALLOC_FREE(frame);
 			continue;
 		}
 
@@ -960,6 +957,7 @@ static void winbindd_process_loop(enum smb_server_mode server_mode)
 		} else {
 			starttime = timeval_current();
 		}
+		TALLOC_FREE(frame);
 	}
 }
 
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index b79445ee86..4263d722a1 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -1048,10 +1048,7 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 		struct timeval t;
 		struct timeval *tp;
 		struct timeval now;
-
-		/* free up any talloc memory */
-		lp_TALLOC_FREE();
-		main_loop_TALLOC_FREE();
+		TALLOC_CTX *frame = talloc_stackframe();
 
 		run_events(winbind_event_context(), 0, NULL, NULL);
 
@@ -1082,16 +1079,19 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 
 		if (ret == 0) {
 			DEBUG(11,("nothing is ready yet, continue\n"));
+			TALLOC_FREE(frame);
 			continue;
 		}
 
 		if (ret == -1 && errno == EINTR) {
 			/* We got a signal - continue. */
+			TALLOC_FREE(frame);
 			continue;
 		}
 
 		if (ret == -1 && errno != EINTR) {
 			DEBUG(0,("select error occured\n"));
+			TALLOC_FREE(frame);
 			perror("select");
 			return False;
 		}
@@ -1127,5 +1127,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 			DEBUG(0, ("Could not write result\n"));
 			exit(1);
 		}
+		TALLOC_FREE(frame);
 	}
 }