lib: Add lib/util/server_id.h

[kai/samba-autobuild/.git] / source3 / utils / net_status.c

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index d6027433a29c3708a4bc94ea5b64a525aa297f4d..0d658a0c36e0eb632a925fb4b1f2a204a802e461 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -17,9 +17,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "utils/net.h"
 #include "session.h"
 #include "messages.h"
+#include "lib/conn_tdb.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {
@@ -33,6 +35,7 @@ int net_status_usage(struct net_context *c, int argc, const char **argv)
 static int show_session(const char *key, struct sessionid *session,
                        void *private_data)
 {
+       struct server_id_buf tmp;
        bool *parseable = (bool *)private_data;
 
        if (!process_exists(session->pid)) {
@@ -41,13 +44,13 @@ static int show_session(const char *key, struct sessionid *session,
 
        if (*parseable) {
                d_printf("%s\\%s\\%s\\%s\\%s\n",
-                        procid_str_static(&session->pid),
+                        server_id_str_buf(session->pid, &tmp),
                         uidtoname(session->uid),
                         gidtoname(session->gid),
                         session->remote_machine, session->hostname);
        } else {
                d_printf("%7s   %-12s  %-12s  %-12s (%s)\n",
-                        procid_str_static(&session->pid),
+                        server_id_str_buf(session->pid, &tmp),
                         uidtoname(session->uid),
                         gidtoname(session->gid),
                         session->remote_machine, session->hostname);
@@ -90,12 +93,13 @@ static int net_status_sessions(struct net_context *c, int argc, const char **arg
        return 0;
 }
 
-static int show_share(struct db_record *rec,
-                     const struct connections_key *key,
+static int show_share(const struct connections_key *key,
                      const struct connections_data *crec,
                      void *state)
 {
-       if (crec->cnum == -1)
+       struct server_id_buf tmp;
+
+       if (crec->cnum == TID_FIELD_INVALID)
                return 0;
 
        if (!process_exists(crec->pid)) {
@@ -103,7 +107,7 @@ static int show_share(struct db_record *rec,
        }
 
        d_printf("%-10.10s   %s   %-12s  %s",
-              crec->servicename, procid_str_static(&crec->pid),
+              crec->servicename, server_id_str_buf(crec->pid, &tmp),
               crec->machine,
               time_to_asc(crec->start));
 
@@ -139,10 +143,11 @@ static int show_share_parseable(const struct connections_key *key,
                                void *state)
 {
        struct sessionids *ids = (struct sessionids *)state;
+       struct server_id_buf tmp;
        int i;
        bool guest = true;
 
-       if (crec->cnum == -1)
+       if (crec->cnum == TID_FIELD_INVALID)
                return 0;
 
        if (!process_exists(crec->pid)) {
@@ -151,14 +156,14 @@ static int show_share_parseable(const struct connections_key *key,
 
        for (i=0; i<ids->num_entries; i++) {
                struct server_id id = ids->entries[i].pid;
-               if (procid_equal(&id, &crec->pid)) {
+               if (serverid_equal(&id, &crec->pid)) {
                        guest = false;
                        break;
                }
        }
 
        d_printf("%s\\%s\\%s\\%s\\%s\\%s\\%s",
-                crec->servicename,procid_str_static(&crec->pid),
+                crec->servicename, server_id_str_buf(crec->pid, &tmp),
                 guest ? "" : uidtoname(ids->entries[i].uid),
                 guest ? "" : gidtoname(ids->entries[i].gid),
                 crec->machine,
@@ -204,7 +209,7 @@ static int net_status_shares(struct net_context *c, int argc, const char **argv)
                           "-------------------------------------"
                           "------------------\n"));
 
-               connections_forall(show_share, NULL);
+               connections_forall_read(show_share, NULL);
 
                return 0;
        }