[SCM] Samba Shared Repository - branch master updated - 085e7b0b6cc882b31c11b6d6ea7834235588e1ed

[Jelmer Vernooij]

The branch, master has been updated
       via  085e7b0b6cc882b31c11b6d6ea7834235588e1ed (commit)
       via  7f826373dbea1d6421abcde6046ec53853ecaf6f (commit)
       via  069437a2faf6a8811ba511f765c5d133ed0b97a9 (commit)
       via  55a88210d8ff429f7cc86db58c8a03c6eb991b93 (commit)
      from  202affa511125cf54d86d92a9ee1b6ecd49ad5af (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 085e7b0b6cc882b31c11b6d6ea7834235588e1ed
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 14:14:55 2008 +0200

    Fix segfault when using DEBUG() in the merged build.

commit 7f826373dbea1d6421abcde6046ec53853ecaf6f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 14:03:20 2008 +0200

    Move smb.conf parser to libutil to match Samba 4.

commit 069437a2faf6a8811ba511f765c5d133ed0b97a9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 13:52:56 2008 +0200

    Just call talloc_free directly rather than through a helper function.

commit 55a88210d8ff429f7cc86db58c8a03c6eb991b93
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 13:35:37 2008 +0200

    Add vlp to TORTURE_PROGS since it's required by "make test".

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

Summary of changes:
 lib/util/debug.c    |    5 ++++-
 lib/util/params.c   |    9 ++-------
 source3/Makefile.in |    9 +++++----
 3 files changed, 11 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug.c b/lib/util/debug.c
index b6edb90..faec52a 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -33,7 +33,10 @@
  */
 int _debug_level = 0;
 _PUBLIC_ int *debug_level = &_debug_level;
-int *DEBUGLEVEL_CLASS = NULL; /* For samba 3 */
+static int debug_all_class_hack = 1;
+int *DEBUGLEVEL_CLASS = &debug_all_class_hack; /* For samba 3 */
+static bool debug_all_class_isset_hack = true;
+bool    *DEBUGLEVEL_CLASS_ISSET = &debug_all_class_isset_hack; /* For samba 3 */
 
 /* the registered mutex handlers */
 static struct {
diff --git a/lib/util/params.c b/lib/util/params.c
index c03edec..7af7ac7 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -105,11 +105,6 @@ static int mygetc(myFILE *f)
 	return (int)( *(f->p++) & 0x00FF );
 }
 
-static void myfile_close(myFILE *f)
-{
-	talloc_free(f);
-}
-
 /* -------------------------------------------------------------------------- **
  * Functions...
  */
@@ -565,7 +560,7 @@ bool pm_process( const char *FileName,
     if( NULL == InFile->bufr )
       {
       DEBUG(0,("%s memory allocation failure.\n", func));
-      myfile_close(InFile);
+      talloc_free(InFile);
       return( false );
       }
     result = Parse( InFile, sfunc, pfunc, userdata );
@@ -573,7 +568,7 @@ bool pm_process( const char *FileName,
     InFile->bSize = 0;
     }
 
-  myfile_close(InFile);
+  talloc_free(InFile);
 
   if( !result )                               /* Generic failure. */
     {
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 808bcc1..1b86c95 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -196,7 +196,7 @@ TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
 	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
 	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
 	bin/tdbtorture at EXEEXT@ \
-	bin/smbconftort at EXEEXT@
+	bin/smbconftort at EXEEXT@ bin/vlp at EXEEXT@
 
 BIN_PROGS = @EXTRA_BIN_PROGS@ \
 	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
@@ -319,7 +319,8 @@ LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
 UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
 		   ../lib/util/xfile.o ../lib/util/util_strlist.o  \
 		   ../lib/util/util_file.o ../lib/util/data_blob.o \
-		   ../lib/util/util.o ../lib/util/fsusage.o 
+		   ../lib/util/util.o ../lib/util/fsusage.o \
+		   ../lib/util/params.o 
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
 			 ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
@@ -361,7 +362,7 @@ READLINE_OBJ = lib/readline.o
 # Be sure to include them into your application
 POPT_LIB_OBJ = lib/popt_common.o
 
-PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o ../lib/util/params.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o
+PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o
 PARAM_REG_ADD_OBJ = $(REG_SMBCONF_OBJ) $(LIBSMBCONF_OBJ) $(PRIVILEGES_BASIC_OBJ)
 PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
 
@@ -1162,7 +1163,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind. at SHLIBEXT@
 
 gpext_modules:: $(GPEXT_MODULES)
 
-torture:: SHOWFLAGS $(TORTURE_PROGS)
+torture:: SHOWFLAGS $(TORTURE_PROGS) 
 
 smbtorture : SHOWFLAGS bin/smbtorture at EXEEXT@
 


-- 
Samba Shared Repository