Changeset 740 for vendor/current/source3/web/statuspage.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/web/statuspage.c (modified) (10 diffs)

vendor/current/source3/web/statuspage.c

@@ -20 +20 @@
 #include "includes.h"
 #include "web/swat_proto.h"
+#include "libcli/security/security.h"
+#include "locking/proto.h"
 
 #define _(x) lang_msg_rotate(talloc_tos(),x)
@@ -124 +126 @@
 {
         char           *utf8_fname;
+        char           *utf8_sharepath;
         int deny_mode;
         size_t converted_size;
@@ -173 +176 @@
 
         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);
 }
@@ -180 +185 @@
 
 /* kill off any connections chosen by the user */
-static int traverse_fn1(struct db_record *rec,
-                        const struct connections_key *key,
+static int traverse_fn1(const struct connections_key *key,
                         const struct connections_data *crec,
                         void *private_data)
@@ -197 +201 @@
 
 /* traversal fn for showing machine connections */
-static int traverse_fn2(struct db_record *rec,
-                        const struct connections_key *key,
+static int traverse_fn2(const struct connections_key *key,
                         const struct connections_data *crec,
                         void *private_data)
@@ -222 +225 @@
 
 /* traversal fn for showing share connections */
-static int traverse_fn3(struct db_record *rec,
-                        const struct connections_key *key,
+static int traverse_fn3(const struct connections_key *key,
                         const struct connections_data *crec,
                         void *private_data)
@@ -328 +330 @@
         }
 
-        connections_forall(traverse_fn1, NULL);
+        connections_forall_read(traverse_fn1, NULL);
 
         initPid2Machine ();
@@ -420 +422 @@
         printf("</tr>\n");
 
-        connections_forall(traverse_fn2, NULL);
+        connections_forall_read(traverse_fn2, NULL);
 
         printf("</table><p>\n");
@@ -429 +431 @@
                 _("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
 
-        connections_forall(traverse_fn3, NULL);
+        connections_forall_read(traverse_fn3, NULL);
 
         printf("</table><p>\n");
@@ -435 +437 @@
         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();