From c01cc085bfae23a916b2282f3a1d41008af1f87c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 29 Jun 2006 15:52:19 +0000 Subject: r16674: After removing each individual post-3.0.23rc3 change: This pulls is what I considered safe fixes from SAMBA_3_0. This boiled down to either Klocwork fixes or obvious compiler warning fixes. I did not include any changes to fnuction signatures not the version change to the passdb API. Also pulled in the 3 nmbd fixes requested by Jeremy and the wildcard delete fix. This code will sit for a few days in the cooker and then become 3.0.23 if nothing blows up. I don't care how many more compile warning fixes people throw into SAMBA_3_0. --- source/locking/locking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/locking/locking.c') diff --git a/source/locking/locking.c b/source/locking/locking.c index 01f12bbb58d..9d3ca956014 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -1274,7 +1274,7 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, const char *sharepath; const char *fname; int i; - void (*traverse_callback)(struct share_mode_entry *, const char *, const char *) = state; + LOCKING_FN(traverse_callback) = (LOCKING_FN_CAST())state; /* Ensure this is a locking_key record. */ if (kbuf.dsize != sizeof(struct locking_key)) -- cgit