Support EXCHANGE poboxes.

[moira.git] / dbck / phase1.pc

diff --git a/dbck/phase1.pc b/dbck/phase1.pc
index f89a618df173d7c8764a8e0930cc1c3fb861d922..d1c432b9388061ec9235ea33a84804c851801bda 100644 (file)
--- a/dbck/phase1.pc
+++ b/dbck/phase1.pc
@@ -358,7 +358,8 @@ void phase1(void)
 
   EXEC SQL DECLARE csr102 CURSOR FOR
     SELECT users_id, login, last, first, status, potype, pop_id, box_id,
-    imap_id, modby, fmodby, pmodby, comments, sigwho, sponsor_type, sponsor_id
+    imap_id, exchange_id, modby, fmodby, pmodby, comments, sigwho, 
+    sponsor_type, sponsor_id
     FROM users ORDER BY users_id;
   EXEC SQL OPEN csr102;
   while (1)
@@ -367,13 +368,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], sponsor_type[USERS_SPONSOR_TYPE_SIZE];
-      int users_id, status, pop_id, box_id, imap_id, modby, fmodby, pmodby;
-      int comments, sigwho, sponsor_id;
+      int users_id, status, pop_id, box_id, imap_id, exchange_id, modby;
+      int fmodby, pmodby, comments, sigwho, sponsor_id;
       EXEC SQL END DECLARE SECTION;
 
       EXEC SQL FETCH csr102 INTO :users_id, :login, :last, :first,
-       :status, :potype, :pop_id, :box_id, :imap_id, :modby, :fmodby,
-       :pmodby, :comments, :sigwho, :sponsor_type, :sponsor_id;
+       :status, :potype, :pop_id, :box_id, :imap_id, :exchange_id, :modby, 
+       :fmodby, :pmodby, :comments, :sigwho, :sponsor_type, :sponsor_id;
       if (sqlca.sqlcode)
        break;
 
@@ -405,6 +406,8 @@ void phase1(void)
        case 'I':
          u->pobox_id = imap_id;
          break;
+       case 'E':
+         u->pobox_id = exchange_id;
        default:
          u->pobox_id = 0;
        }