check that imap poboxes exist, and are of type IMAP. Do nfsphys checks

[moira.git] / dbck / phase1.pc

diff --git a/dbck/phase1.pc b/dbck/phase1.pc
index 026020ef8e3fa1d3bdbfbb3e94846bbfb21c3c97..38a16a5f5b66f4edbf4262da35057de100ea35be 100644 (file)
--- a/dbck/phase1.pc
+++ b/dbck/phase1.pc
@@ -348,7 +348,7 @@ void phase1(void)
 
   EXEC SQL DECLARE csr102 CURSOR FOR
     SELECT users_id, login, last, first, status, potype, pop_id, box_id,
-    modby, fmodby, pmodby, comments, sigwho FROM users
+    imap_id, modby, fmodby, pmodby, comments, sigwho FROM users
     ORDER BY users_id;
   EXEC SQL OPEN csr102;
   while (1)
@@ -357,13 +357,13 @@ void phase1(void)
       char login[USERS_LOGIN_SIZE], nbuf[USERS_FIRST_SIZE + USERS_LAST_SIZE];
       char last[USERS_LAST_SIZE], first[USERS_FIRST_SIZE];
       char potype[USERS_POTYPE_SIZE];
-      int users_id, status, pop_id, box_id, modby, fmodby, pmodby;
+      int users_id, status, pop_id, box_id, imap_id, modby, fmodby, pmodby;
       int comments, sigwho;
       EXEC SQL END DECLARE SECTION;
 
       EXEC SQL FETCH csr102 INTO :users_id, :login, :last, :first,
-       :status, :potype, :pop_id, :box_id, :modby, :fmodby, :pmodby,
-       :comments, :sigwho;
+       :status, :potype, :pop_id, :box_id, :imap_id, :modby, :fmodby,
+       :pmodby, :comments, :sigwho;
       if (sqlca.sqlcode)
        break;
 
@@ -390,6 +390,9 @@ void phase1(void)
          /*  If potype is SMTP, box_id is a string_id for the strings tbl */
          u->pobox_id = box_id;
          break;
+       case 'I':
+         u->pobox_id = imap_id;
+         break;
        default:
          u->pobox_id = 0;
        }