[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fdb98fb Nulling out the op_mid is never the right thing to do. We depend on this value when searching for specific share mode entries.
       via  3d6a92a Fix compiler warning in debug message.
      from  ef07830 s3:Makefile.in: make sure we rebuild bin/smbtorture4 if there where changes

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


- Log -----------------------------------------------------------------
commit fdb98fbdd84362b9c586fdebf83fc2db5722a44e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 17 10:35:51 2011 -0700

    Nulling out the op_mid is never the right thing to do. We depend on
    this value when searching for specific share mode entries.
    
    Jeremy.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Mar 17 19:59:51 CET 2011 on sn-devel-104

commit 3d6a92a37bead8df3c7704a2f33614cac0201748
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 17 10:35:10 2011 -0700

    Fix compiler warning in debug message.

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

Summary of changes:
 source3/locking/locking.c |    1 -
 source3/passdb/pdb_ads.c  |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 15c53d4..32d1b34 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1374,7 +1374,6 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 		return False;
 	}
 
-	e->op_mid = 0;
 	if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
 		/*
 		 * Going from exclusive or batch,
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 9960d38..654bc5d 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -2231,7 +2231,7 @@ static bool pdb_ads_sid_to_id(struct pdb_methods *m, const struct dom_sid *sid,
 	}
 	if (talloc_array_length(msg) != 1) {
 		DEBUG(10, ("Got %d objects, expected 1\n",
-			   talloc_array_length(msg)));
+			   (int)talloc_array_length(msg)));
 		goto fail;
 	}
 	if (!tldap_pull_uint32(msg[0], "samAccountType", &atype)) {


-- 
Samba Shared Repository