s3: Add connections_forall_read()

[ira/wip.git] / source3 / utils / net_status.c

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 4e4debda5eb64412a2f482e68410b161ec90cb8a..47860cb5849dc591d9b60d6ac1b2031de148d53a 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -21,10 +21,10 @@
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {
-       d_printf("  net status sessions [parseable] "
-                "Show list of open sessions\n");
-       d_printf("  net status shares [parseable]   "
-                "Show list of open shares\n");
+       d_printf(_("  net status sessions [parseable] "
+                  "Show list of open sessions\n"));
+       d_printf(_("  net status shares [parseable]   "
+                  "Show list of open shares\n"));
        return -1;
 }
 
@@ -63,11 +63,13 @@ static int net_status_sessions(struct net_context *c, int argc, const char **arg
        bool parseable;
 
        if (c->display_usage) {
-               d_printf("Usage:\n"
-                        "net status sessions [parseable]\n"
-                        "    Display open user sessions.\n"
-                        "    If parseable is specified, output is machine-"
-                        "readable.\n");
+               d_printf(  "%s\n"
+                          "net status sessions [parseable]\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Display open user sessions.\n"
+                          "    If parseable is specified, output is machine-"
+                          "readable."));
                return 0;
        }
 
@@ -80,16 +82,17 @@ static int net_status_sessions(struct net_context *c, int argc, const char **arg
        }
 
        if (!parseable) {
-               d_printf("PID     Username      Group         Machine"
-                        "                        \n");
-               d_printf("-------------------------------------------"
-                        "------------------------\n");
+               d_printf(_("PID     Username      Group         Machine"
+                          "                        \n"
+                          "-------------------------------------------"
+                          "------------------------\n"));
        }
 
        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
        if (db == NULL) {
-               d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+               d_fprintf(stderr, _("%s not initialised\n"),
+                         lock_path("sessionid.tdb"));
                return -1;
        }
 
@@ -148,8 +151,7 @@ static int collect_pid(struct db_record *rec, void *private_data)
        return 0;
 }
 
-static int show_share_parseable(struct db_record *rec,
-                               const struct connections_key *key,
+static int show_share_parseable(const struct connections_key *key,
                                const struct connections_data *crec,
                                void *state)
 {
@@ -194,14 +196,15 @@ static int net_status_shares_parseable(struct net_context *c, int argc, const ch
        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
        if (db == NULL) {
-               d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+               d_fprintf(stderr, _("%s not initialised\n"),
+                         lock_path("sessionid.tdb"));
                return -1;
        }
 
        db->traverse_read(db, collect_pid, &ids);
        TALLOC_FREE(db);
 
-       connections_forall(show_share_parseable, &ids);
+       connections_forall_read(show_share_parseable, &ids);
 
        SAFE_FREE(ids.entries);
 
@@ -211,20 +214,22 @@ static int net_status_shares_parseable(struct net_context *c, int argc, const ch
 static int net_status_shares(struct net_context *c, int argc, const char **argv)
 {
        if (c->display_usage) {
-               d_printf("Usage:\n"
-                        "net status shares [parseable]\n"
-                        "    Display open user shares.\n"
-                        "    If parseable is specified, output is machine-"
-                        "readable.\n");
+               d_printf(  "%s\n"
+                          "net status shares [parseable]\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Display open user shares.\n"
+                          "    If parseable is specified, output is machine-"
+                          "readable."));
                return 0;
        }
 
        if (argc == 0) {
 
-               d_printf("\nService      pid     machine       "
-                        "Connected at\n");
-               d_printf("-------------------------------------"
-                        "------------------\n");
+               d_printf(_("\nService      pid     machine       "
+                          "Connected at\n"
+                          "-------------------------------------"
+                          "------------------\n"));
 
                connections_forall(show_share, NULL);
 
@@ -245,19 +250,19 @@ int net_status(struct net_context *c, int argc, const char **argv)
                        "sessions",
                        net_status_sessions,
                        NET_TRANSPORT_LOCAL,
-                       "Show list of open sessions",
-                       "net status sessions [parseable]\n"
-                       "    If parseable is specified, output is presented "
-                       "in a machine-parseable fashion."
+                       N_("Show list of open sessions"),
+                       N_("net status sessions [parseable]\n"
+                          "    If parseable is specified, output is presented "
+                          "in a machine-parseable fashion.")
                },
                {
                        "shares",
                        net_status_shares,
                        NET_TRANSPORT_LOCAL,
-                       "Show list of open shares",
-                       "net status shares [parseable]\n"
-                       "    If parseable is specified, output is presented "
-                       "in a machine-parseable fashion."
+                       N_("Show list of open shares"),
+                       N_("net status shares [parseable]\n"
+                          "    If parseable is specified, output is presented "
+                          "in a machine-parseable fashion.")
                },
                {NULL, NULL, 0, NULL, NULL}
        };