[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f7adf53... s3: For "smbcontrol <pid> pool-usage", print the first 50 bytes of a string
       via  a101505... s3: Fix some nonempty blank lines
      from  98a495f... Modification of fix for bug 6876 - Delete of an object whose parent folder does not have delete rights fails even if the delete right is set on the object

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


- Log -----------------------------------------------------------------
commit f7adf534fdc8b0028028538d264e65d7dd45aa58
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jan 17 14:57:54 2010 +0100

    s3: For "smbcontrol <pid> pool-usage", print the first 50 bytes of a string

commit a1015051c054428482efe1810025728a8987a2a0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jan 17 13:52:53 2010 +0100

    s3: Fix some nonempty blank lines

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

Summary of changes:
 source3/lib/tallocmsg.c |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index b4bea5a..3cfd118 100644
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -1,17 +1,17 @@
 /* 
    samba -- Unix SMB/CIFS implementation.
    Copyright (C) 2001, 2002 by Martin Pool
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -51,6 +51,23 @@ static void msg_pool_usage_helper(const void *ptr, int depth, int max_depth, int
 		return;
 	}
 
+	if (strcmp(name, "char") == 0) {
+		/*
+		 * Print out the first 50 bytes of the string
+		 */
+		sprintf_append(state->mem_ctx, &state->s, &state->len,
+			       &state->buflen,
+			       "%*s%-30s contains %6lu bytes in %3lu blocks "
+			       "(ref %d): %*s\n", depth*4, "",
+			       name,
+			       (unsigned long)talloc_total_size(ptr),
+			       (unsigned long)talloc_total_blocks(ptr),
+			       talloc_reference_count(ptr),
+			       MIN(50, talloc_get_size(ptr)),
+			       (char *)ptr);
+		return;
+	}
+
 	sprintf_append(state->mem_ctx, &state->s, &state->len, &state->buflen,
 		       "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d)\n", 
 		       depth*4, "",
@@ -73,7 +90,7 @@ static void msg_pool_usage(struct messaging_context *msg_ctx,
 	struct msg_pool_usage_state state;
 
 	SMB_ASSERT(msg_type == MSG_REQ_POOL_USAGE);
-	
+
 	DEBUG(2,("Got POOL_USAGE\n"));
 
 	state.mem_ctx = talloc_init("msg_pool_usage");
@@ -90,7 +107,7 @@ static void msg_pool_usage(struct messaging_context *msg_ctx,
 		talloc_destroy(state.mem_ctx);
 		return;
 	}
-	
+
 	messaging_send_buf(msg_ctx, src, MSG_POOL_USAGE,
 			   (uint8 *)state.s, strlen(state.s)+1);
 


-- 
Samba Shared Repository