gmnm should return both machine and container name.

diff --git a/server/queries2.c b/server/queries2.c
index 046ae23a22831a09453fe38927526e8e3503ac26..d340da8bbb86a9e03105378b51208eac124ee5e7 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -3243,6 +3243,11 @@ static struct validate dmcn_validate = /* for amtn and dmfn */
   set_mach_modtime_by_id,
 };
 
+static char *gmnm_fields[] = {
+  "machine",
+  "machine", "container",
+};
+
 static char *gmoc_fields[] = {
   "container",
   "isrecursive",
@@ -6709,9 +6714,9 @@ struct query Queries[] = {
     RETRIEVE,
     "mcn",
     MCNTMAP_TABLE,
-    "c.name FROM machine m, containers c, mcntmap mcn",
-    amcn_fields,
-    1,
+    "m.name, c.name FROM machine m, containers c, mcntmap mcn",
+    gmnm_fields,
+    2,
     "m.name = UPPER('%s') AND mcn.cnt_id = c.cnt_id AND mcn.mach_id = m.mach_id",
     1,
     NULL,