[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-684-g6c5ebc6

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  6c5ebc66a4feea1a92570d847fbef28657d57b46 (commit)
       via  67f61e7b9c20c45a7af1c99e93c6e47fa149bda2 (commit)
       via  0c4251368e0d2bc1a2d46638df95ae2bf44f9e60 (commit)
       via  0f54b81eb77ac7dd0f85b2cc8f983ce2ffc52255 (commit)
      from  618de2b3f29f035ee99f74f8239a81c1e443e5f5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 6c5ebc66a4feea1a92570d847fbef28657d57b46
Author: Michael Adam <obnox at samba.org>
Date:   Sat Apr 12 00:12:25 2008 +0200

    libnetapi: fix dependency problem by linking libnetapi statically (internally)
    
    This is a workaround until we have isolated enough internal libraries
    as shared libraries.
    
    Michael
    (cherry picked from commit 8a87e402701494ba1c9d56a9febe3e5c25dc2bf7)

commit 67f61e7b9c20c45a7af1c99e93c6e47fa149bda2
Author: Michael Adam <obnox at samba.org>
Date:   Sat Apr 12 02:05:25 2008 +0200

    libnetapi: fix interactive logging by preventing setup_logging from closing stderr.
    
    Michael
    (cherry picked from commit 563b837b76e3a6086051fc56e0522b841939d37f)

commit 0c4251368e0d2bc1a2d46638df95ae2bf44f9e60
Author: Michael Adam <obnox at samba.org>
Date:   Sat Apr 12 01:36:10 2008 +0200

    util_tdb: fix a segfault caused by a fatal typo.
    
    In tdb_wrap_log(), in on occurrence of "debug_level = 0"
    instead of "debuglevel = 0" caused me segfaults when
    accessing DEBUGLEVEL (which is defined as "*debug_level"...)
    
    Michael
    (cherry picked from commit d9bd894c2ec4faf87e8ff96e27c7e2b8175f9387)

commit 0f54b81eb77ac7dd0f85b2cc8f983ce2ffc52255
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 11 15:39:39 2008 +0200

    update WHATSNEW
    
    Michael
    (cherry picked from commit 07a9da0243f6f963108ea17d39c2daa3f7787b6a)

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt               |    9 +++++++++
 source/configure.in        |    7 +++++++
 source/lib/netapi/netapi.c |    3 +++
 source/lib/util_tdb.c      |    2 +-
 4 files changed, 20 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1338ea1..7687c0d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -204,6 +204,15 @@ o   Michael Adam <obnox at samba.org>
     * Fix build of bin/net on Solaris.
     * Reformat the parm table of loadparm to use named initializers.
     * Fix %I macro expansion for IPv4 mapped IPv6 addresses.
+    * Convert registry.tdb to use dbwrap and fix memleaks.
+    * Several make test fixes and improvements.
+    * Rename libnet_conf to libsmbconf and introduce backend abstraction layer.
+    * Add text backend to libsmbconf, based on params.c.
+    * Fix handling of includes in registry libsmbconf backend.
+    * Fix net conf import by reading from text backend.
+    * Add a "net registry" command to locally access the registry.
+    * Add testsuites for libsmbconf and "net registry".
+    * Fix Coverity IDs 517, 536, 545.
 
 
 o   Jeremy Allison <jra at samba.org>
diff --git a/source/configure.in b/source/configure.in
index 8487bbc..8e12919 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -4700,6 +4700,13 @@ AC_ARG_WITH([static-libs],
 		done], [])],
 	[])
 
+#
+# WORKAROUND:
+#   until we have organized other internal subsystems (as util, registrt
+#   and smbconf) into shared libraries, we CAN NOT link libnetapi
+#   dynamically to samba programs.
+#
+LINK_LIBNETAPI=STATIC
 
 SMB_LIBRARY(talloc)
 SMB_LIBRARY(tdb)
diff --git a/source/lib/netapi/netapi.c b/source/lib/netapi/netapi.c
index 2478a8d..cb218f0 100644
--- a/source/lib/netapi/netapi.c
+++ b/source/lib/netapi/netapi.c
@@ -54,6 +54,9 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 	if (!DEBUGLEVEL) {
 		DEBUGLEVEL = 0;
 	}
+
+	/* prevent setup_logging() from closing x_stderr... */
+	dbf = 0;
 	setup_logging("libnetapi", true);
 
 	dbf = x_stderr;
diff --git a/source/lib/util_tdb.c b/source/lib/util_tdb.c
index ce5e77f..8257232 100644
--- a/source/lib/util_tdb.c
+++ b/source/lib/util_tdb.c
@@ -862,7 +862,7 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level,
 
 	switch (level) {
 	case TDB_DEBUG_FATAL:
-		debug_level = 0;
+		debuglevel = 0;
 		break;
 	case TDB_DEBUG_ERROR:
 		debuglevel = 1;


-- 
Samba Shared Repository