[28829] in Source-Commits

home help back first fref pref prev next nref lref last post

moira commit [debian]: Remove unused and nonfunctional queries to return all poboxes.

daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Apr 25 23:50:00 2018

Date: Wed, 25 Apr 2018 23:49:56 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201804260349.w3Q3nunO024910@drugstore.mit.edu>
To: source-commits@mit.edu

https://github.com/mit-athena/moira/commit/8f9f45869676e46ef3cfa9aa0cfb5b4ed6724481
commit 8f9f45869676e46ef3cfa9aa0cfb5b4ed6724481
Author: Garry Zacheiss <zacheiss@mit.edu>
Date:   Wed May 24 16:28:48 2017 -0400

    Remove unused and nonfunctional queries to return all poboxes.

 moira/server/queries2.c |   70 -----------------------------------------------
 1 files changed, 0 insertions(+), 70 deletions(-)

diff --git a/moira/server/queries2.c b/moira/server/queries2.c
index ea0c61b..3c0bfd3 100644
--- a/moira/server/queries2.c
+++ b/moira/server/queries2.c
@@ -1530,22 +1530,6 @@ static struct validate gpob_validate = {
   followup_gpob,
 };
 
-static char *gpox_fields[] = {
-  "login", "type", "box",
-};
-
-static struct validate gpox_validate = {
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  followup_gpob,
-};
-
 static char *spob_fields[] = {
   "login", "type", "box",
 };
@@ -6524,60 +6508,6 @@ struct query Queries[] = {
   },
 
   {
-    /* Q_GAPO - GET_ALL_POBOXES */
-    "get_all_poboxes",
-    "gapo",
-    2,
-    MR_Q_RETRIEVE,
-    "u",
-    USERS_TABLE,
-    "login, potype, pop_id || ':' || box_id FROM users",
-    gpox_fields,
-    3,
-    3,
-    "potype != 'NONE'",
-    0,
-    "login",
-    &gpox_validate,
-  },
-
-  {
-    /* Q_GPOP - GET_POBOXES_POP */
-    "get_poboxes_pop",
-    "gpop",
-    2,
-    MR_Q_RETRIEVE,
-    "u",
-    USERS_TABLE,
-    "login, potype, users_id FROM users",
-    gpox_fields,
-    3,
-    3,
-    "potype = 'POP'",
-    0,
-    "login",
-    &gpox_validate
-  },
-
-  {
-    /* Q_GPOF - GET_POBOXES_SMTP */
-    "get_poboxes_smtp",
-    "gpos",
-    2,
-    MR_Q_RETRIEVE,
-    "u",
-    USERS_TABLE,
-    "login, potype, users_id FROM users",
-    gpox_fields,
-    3,
-    3,
-    "potype = 'SMTP'",
-    0,
-    "login",
-    &gpox_validate
-  },
-
-  {
     /* Q_SPOB - SET_POBOX */
     "set_pobox",
     "spob",

home help back first fref pref prev next nref lref last post