[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-362-g99b3289

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  99b3289aa44c94c16f5330eba841fd9c21c6303b (commit)
       via  8d8cb8f9ccbc013b97c252d27c3af4e2eb10d56a (commit)
       via  89e2984a84951373d0e93fe06d0c69c8a62bc777 (commit)
       via  e8b866ad87476ef69c06993d255269ce9fba3121 (commit)
       via  4c992e4340eda31e686a2d2a8db6364aaa456c11 (commit)
      from  660ea443364e949ed06c28b00f0e1c3757f0da27 (commit)

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


- Log -----------------------------------------------------------------
commit 99b3289aa44c94c16f5330eba841fd9c21c6303b
Author: Volker Lendecke <vl at sernet.de>
Date:   Thu Nov 22 15:48:47 2007 +0100

    Do not link in SOCKET_WRAPPER_OBJ twice

commit 8d8cb8f9ccbc013b97c252d27c3af4e2eb10d56a
Author: Volker Lendecke <vl at sernet.de>
Date:   Wed Nov 7 20:18:38 2007 +0100

    Cosmetic fix

commit 89e2984a84951373d0e93fe06d0c69c8a62bc777
Author: Volker Lendecke <vl at sernet.de>
Date:   Tue Nov 13 11:43:48 2007 +0100

    Add a missing prototype

commit e8b866ad87476ef69c06993d255269ce9fba3121
Author: Volker Lendecke <vl at sernet.de>
Date:   Mon Nov 12 17:36:34 2007 +0100

    Fix an uninitialized variable

commit 4c992e4340eda31e686a2d2a8db6364aaa456c11
Author: Volker Lendecke <vl at sernet.de>
Date:   Fri Nov 16 14:48:26 2007 +0100

    Fix a type-punned warning

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

Summary of changes:
 source/Makefile.in                  |    2 +-
 source/include/dbwrap.h             |    6 +++---
 source/lib/ctdbd_conn.c             |    1 +
 source/lib/tdb/common/tdb_private.h |    1 +
 source/lib/util_unistr.c            |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index db6f123..4cec671 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -735,7 +735,7 @@ MOUNT_OBJ = client/smbmount.o \
 
 MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
 
-UMOUNT_OBJ = client/smbumount.o $(SOCKET_WRAPPER_OBJ) $(PARAM_OBJ) $(LIBSMB_OBJ) \
+UMOUNT_OBJ = client/smbumount.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	     $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
 
 CIFS_MOUNT_OBJ = client/mount.cifs.o
diff --git a/source/include/dbwrap.h b/source/include/dbwrap.h
index 5737835..c175f69 100644
--- a/source/include/dbwrap.h
+++ b/source/include/dbwrap.h
@@ -17,8 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FILEDB_H__
-#define __FILEDB_H__
+#ifndef __DBWRAP_H__
+#define __DBWRAP_H__
 
 struct db_record {
 	TDB_DATA key, value;
@@ -51,4 +51,4 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
 			   int open_flags, mode_t mode);
 
 
-#endif /* __FILEDB_H__ */
+#endif /* __DBWRAP_H__ */
diff --git a/source/lib/ctdbd_conn.c b/source/lib/ctdbd_conn.c
index b43aec7..47693ec 100644
--- a/source/lib/ctdbd_conn.c
+++ b/source/lib/ctdbd_conn.c
@@ -634,6 +634,7 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		DEBUG(0, ("ndr_push_struct_blob failed: %s\n",
 			  ndr_errstr(ndr_err)));
+		status = ndr_map_error2ntstatus(ndr_err);
 		goto fail;
 	}
 
diff --git a/source/lib/tdb/common/tdb_private.h b/source/lib/tdb/common/tdb_private.h
index 00bd0eb..58c30c1 100644
--- a/source/lib/tdb/common/tdb_private.h
+++ b/source/lib/tdb/common/tdb_private.h
@@ -173,6 +173,7 @@ struct tdb_context {
 int tdb_munmap(struct tdb_context *tdb);
 void tdb_mmap(struct tdb_context *tdb);
 int tdb_lock(struct tdb_context *tdb, int list, int ltype);
+int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype);
 int tdb_unlock(struct tdb_context *tdb, int list, int ltype);
 int tdb_brlock(struct tdb_context *tdb, tdb_off_t offset, int rw_type, int lck_type, int probe, size_t len);
 int tdb_transaction_lock(struct tdb_context *tdb, int ltype);
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index 45f09da..bd2cd73 100644
--- a/source/lib/util_unistr.c
+++ b/source/lib/util_unistr.c
@@ -365,7 +365,7 @@ char *rpcstr_pull_unistr2_talloc(TALLOC_CTX *ctx, const UNISTR2 *src)
 				CH_UNIX,
 				src->buffer,
 				src->uni_str_len * 2,
-				(void **)&dest,
+				(void *)&dest,
 				true);
 	if (dest_len == (size_t)-1) {
 		return NULL;


-- 
Samba Shared Repository