r22282: Fix last few name -> servicename changes.

Jeremy.
(This used to be commit f5c22f26f7ec7e8139fbf11a75820336db3d55c0)

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index bfc30eac78a4dd96b07db3bdd66d40d99222eb14..354111f6092ef293de86aaee1d2a72e1b6ad1222 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -102,7 +102,7 @@ static int show_share(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
        }
 
        d_printf("%-10.10s   %s   %-12s  %s",
-              crec.name,procid_str_static(&crec.pid),
+              crec.servicename,procid_str_static(&crec.pid),
               crec.machine,
               time_to_asc(crec.start));
 
@@ -168,7 +168,7 @@ static int show_share_parseable(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
        }
 
        d_printf("%s\\%s\\%s\\%s\\%s\\%s\\%s",
-                crec.name,procid_str_static(&crec.pid),
+                crec.servicename,procid_str_static(&crec.pid),
                 guest ? "" : uidtoname(ids->entries[i].uid),
                 guest ? "" : gidtoname(ids->entries[i].gid),
                 crec.machine, 

diff --git a/source3/utils/status.c b/source3/utils/status.c
index deba6a9523bad0aa61cefea67fbeb475baa04ce4..df742f73e7935a298c8f5256e2ed51a541c365c0 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -205,7 +205,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st
        }
 
        d_printf("%-10s   %s   %-12s  %s",
-              crec.name,procid_str_static(&crec.pid),
+              crec.servicename,procid_str_static(&crec.pid),
               crec.machine,
               time_to_asc(crec.start));
 

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index a88e5debd0e3a9c636b4d87764d5ba409401dd15..e4d726c4fd2321ad0b22d2a0246f63d0f2746a0d 100644 (file)
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -230,7 +230,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
                return 0;
 
        printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
-              crec.name,uidtoname(crec.uid),
+              crec.servicename,uidtoname(crec.uid),
               gidtoname(crec.gid),procid_str_static(&crec.pid),
               crec.machine,
               tstring(crec.start));