add gdds query, and update gusl and glsn to take a second arg, "domain_sid".

diff --git a/server/queries2.c b/server/queries2.c
index 48c4e308d3395e9742f45179df950adbe370da79..ca8a1538b645629b918df237524796a36fb86786 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -2946,7 +2946,7 @@ static struct validate _sdl_validate =
 };
 
 static char *gusl_fields[] = {
-  "login",
+  "login", "domain_sid", 
   "login", "sid", "created",
 };
 
@@ -2964,7 +2964,7 @@ static struct validate gusl_validate =
 };
 
 static char *glsn_fields[] = {
-  "name",
+  "name", "domain_sid",
   "name", "sid", "created",
 };
 
@@ -3015,6 +3015,10 @@ static struct validate alsn_validate =
   0,
 };
 
+static char *gdds_fields[] = {
+  "sid",
+};
+
 \f
 /* Generalized Query Definitions */
 
@@ -6191,9 +6195,9 @@ struct query Queries[] = {
     "u.login, us.sid, TO_CHAR(us.created, 'YYYY-MM-DD HH24:MI:SS') FROM users u, usersids us",
     gusl_fields,
     3,
-    "us.users_id = %d AND u.users_id = us.users_id",
-    1,
-    "us.created",
+    "us.users_id = %d AND u.users_id = us.users_id AND SUBSTR(us.sid, 1, LENGTH(us.sid)-8) = '%s'",
+    2,
+    NULL,
     &gusl_validate,
   },
 
@@ -6225,9 +6229,9 @@ struct query Queries[] = {
     "l.name, ls.sid, TO_CHAR(ls.created, 'YYYY-MM-DD HH24:MI:SS') FROM list l, listsids ls",
     glsn_fields,
     3,
-    "ls.list_id = %d AND l.list_id = ls.list_id",
-    1,
-    "created",
+    "ls.list_id = %d AND l.list_id = ls.list_id AND SUBSTR(ls.sid, 1, LENGTH(ls.sid)-8) = '%s'",
+    2,
+    NULL,
     &glsn_validate,
   },
 
@@ -6248,6 +6252,23 @@ struct query Queries[] = {
     &alsn_validate,
   },
 
+  {
+    /* Q_GDDS - GET_DISTINCT_DOMAIN_SIDS, v4 */
+    "get_distinct_domain_sids",
+    "gdds",
+    4,
+    RETRIEVE,
+    "s",
+    USERSIDS_TABLE,
+    "DISTINCT SUBSTR(sid, 1, LENGTH(sid)-8) FROM usersids",
+    gdds_fields,
+    1,
+    NULL,
+    0,
+    NULL,
+    NULL,
+  },
+
 };
 
 int QueryCount = (sizeof(Queries) / sizeof(struct query));