[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b93f07e... Fix trailing whitespace errors I added (sorry).
      from  913a9f4... s3: Fix malformed require_membership_of_sid.

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


- Log -----------------------------------------------------------------
commit b93f07ef41fedf9cdb3f48fe77ed070c69ec3608
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 5 22:51:11 2010 -0800

    Fix trailing whitespace errors I added (sorry).
    
    Jeremy.

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

Summary of changes:
 source3/smbd/blocking.c |    4 ++--
 source3/smbd/server.c   |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 6c7c167..04e28a9 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -76,7 +76,7 @@ static bool recalc_brl_timeout(void)
 
 	TALLOC_FREE(brl_timeout);
 
-	next_timeout = timeval_zero();	
+	next_timeout = timeval_zero();
 
 	for (blr = blocking_lock_queue; blr; blr = blr->next) {
 		if (timeval_is_zero(&blr->expire_time)) {
@@ -117,7 +117,7 @@ static bool recalc_brl_timeout(void)
 
 	if (max_brl_timeout > 0) {
 		struct timeval min_to = timeval_current_ofs(max_brl_timeout, 0);
-		next_timeout = timeval_min(&next_timeout, &min_to);             
+		next_timeout = timeval_min(&next_timeout, &min_to);
 	}
 
 	if (DEBUGLVL(10)) {
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 37716c4..ea1ef2e 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -239,7 +239,7 @@ static void cleanup_timeout_fn(struct event_context *event_ctx,
 
 	DEBUG(1,("Cleaning up brl and lock database after unclean shutdown\n"));
 	message_send_all(smbd_messaging_context(), MSG_SMB_UNLOCK, NULL, 0, NULL);
-	messaging_send_buf(smbd_messaging_context(), procid_self(), 
+	messaging_send_buf(smbd_messaging_context(), procid_self(),
 				MSG_SMB_BRL_VALIDATE, NULL, 0);
 	/* mark the cleanup as having been done */
 	(*cleanup_te) = NULL;
@@ -255,14 +255,14 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown)
 		   processes to see if they can grab any of the
 		   pending locks
                 */
-		DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", 
+		DEBUG(3,(__location__ " Unclean shutdown of pid %u\n",
 			(unsigned int)pid));
 		if (!cleanup_te) {
 			/* call the cleanup timer, but not too often */
 			int cleanup_time = lp_parm_int(-1, "smbd", "cleanuptime", 20);
 			cleanup_te = event_add_timed(smbd_event_context(), NULL,
 						timeval_current_ofs(cleanup_time, 0),
-						cleanup_timeout_fn, 
+						cleanup_timeout_fn,
 						&cleanup_te);
 			DEBUG(1,("Scheduled cleanup of brl and lock database after unclean shutdown\n"));
 		}


-- 
Samba Shared Repository