[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2247-g047c5ba

Michael Adam obnox at samba.org
Thu Feb 14 15:34:00 GMT 2008


The branch, v3-2-test has been updated
       via  047c5ba740c6b6c3d6bacf818dcdae8ec0af2292 (commit)
       via  1c215325d1fb90f92fbe85011ab822892d5c994b (commit)
       via  0755785d80f22fe7d8d5be682f4c7bd88c987c3c (commit)
      from  80e39330bf15cc57f2780a5b900d8a2b14d92fa9 (commit)

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


- Log -----------------------------------------------------------------
commit 047c5ba740c6b6c3d6bacf818dcdae8ec0af2292
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 14 16:32:25 2008 +0100

    Remove the regfio objects from the ldb commandlin tools object list - unused.
    
    Michael

commit 1c215325d1fb90f92fbe85011ab822892d5c994b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 14 15:35:07 2008 +0100

    Use the proper boolean constants.
    
    Michael

commit 0755785d80f22fe7d8d5be682f4c7bd88c987c3c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 14 14:21:49 2008 +0100

    Clean up LIBTDB-related Makefile variables a bit
    
    (removing commented out stuff).
    
    Michael

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

Summary of changes:
 source/Makefile.in    |   12 ++----------
 source/lib/util_reg.c |    6 +++---
 2 files changed, 5 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 0e2e22c..79863b7 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -238,15 +238,7 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
 # object file lists
 ######################################################################
 
-#TDBBASE_OBJ = lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/error.o \
-#	lib/tdb/common/freelist.o lib/tdb/common/freelistcheck.o \
-#	lib/tdb/common/io.o lib/tdb/common/lock.o \
-#	lib/tdb/common/open.o lib/tdb/common/transaction.o \
-#	lib/tdb/common/traverse.o
-
-TDBBASE_OBJ = @TDB_OBJS@
-
-LIBTDB_OBJ0 = $(TDBBASE_OBJ)
+LIBTDB_OBJ0 = @TDB_OBJS@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
 TDB_OBJ = @LIBTDB_STATIC@ lib/util_tdb.o \
@@ -1015,7 +1007,7 @@ LDB_CMDLINE_OBJ = $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
 	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
-	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
+	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
 	  $(LDB_OBJ) lib/ldb/tools/cmdline.o 
 
 
diff --git a/source/lib/util_reg.c b/source/lib/util_reg.c
index 2d7d70c..2475dca 100644
--- a/source/lib/util_reg.c
+++ b/source/lib/util_reg.c
@@ -95,7 +95,7 @@ WERROR reg_pull_multi_sz(TALLOC_CTX *mem_ctx, const void *buf, size_t len,
 		thislen = strnlen_w(p, len) + 1;
 		dstlen = convert_string_allocate(*values, CH_UTF16LE, CH_UNIX,
 						 p, thislen*2, (void *)&val,
-						 True);
+						 true);
 		if (dstlen == (size_t)-1) {
 			TALLOC_FREE(*values);
 			return WERR_NOMEM;
@@ -137,8 +137,8 @@ bool registry_smbconf_valname_forbidden(const char *valname)
 
 	for (forbidden = forbidden_valnames; *forbidden != NULL; forbidden++) {
 		if (strwicmp(valname, *forbidden) == 0) {
-			return True;
+			return true;
 		}
 	}
-	return False;
+	return false;
 }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list