[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  7d5adf8... s3: Show share path in swat statuspage
      from  971f6a4... s3: Fix the format string for smbcontrol pool-usage

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


- Log -----------------------------------------------------------------
commit 7d5adf8dec81aa5b7863550aaa7b579b82e3ab80
Author: Marcin Gryszkalis <mg at fork.pl>
Date:   Mon Jan 18 10:15:29 2010 +0100

    s3: Show share path in swat statuspage

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

Summary of changes:
 source3/web/statuspage.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 590be1d..f94ffb7 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -123,6 +123,7 @@ static void print_share_mode(const struct share_mode_entry *e,
 			     void *dummy)
 {
 	char           *utf8_fname;
+	char           *utf8_sharepath;
 	int deny_mode;
 	size_t converted_size;
 
@@ -172,8 +173,10 @@ static void print_share_mode(const struct share_mode_entry *e,
 	printf("</td>");
 
 	push_utf8_talloc(talloc_tos(), &utf8_fname, fname, &converted_size);
-	printf("<td>%s</td><td>%s</td></tr>\n",
-	       utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
+	push_utf8_talloc(talloc_tos(), &utf8_sharepath, sharepath,
+			 &converted_size);
+	printf("<td>%s</td><td>%s</td><td>%s</td></tr>\n",
+	       utf8_sharepath,utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
 	TALLOC_FREE(utf8_fname);
 }
 
@@ -427,8 +430,8 @@ void status_page(void)
 
 	printf("<h3>%s</h3>\n", _("Open Files"));
 	printf("<table border=1>\n");
-	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
-		_("PID"), _("UID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
+		_("PID"), _("UID"), _("Sharing"), _("R/W"), _("Oplock"), _("Share"), _("File"), _("Date"));
 
 	locking_init_readonly();
 	share_mode_forall(print_share_mode, NULL);


-- 
Samba Shared Repository