Don't create mailboxes for deactivated users.

diff --git a/gen/postoffice.pc b/gen/postoffice.pc
index 0a1fa20b8649918ed41cd6ab3d43f7c45e04f8eb..5d7cd7b2c93271e847c9de2328b6fe06637bcdae 100644 (file)
--- a/gen/postoffice.pc
+++ b/gen/postoffice.pc
@@ -183,10 +183,11 @@ void pobox(char *path)
 
       EXEC SQL DECLARE filsys_cursor CURSOR FOR
        SELECT f.label, f.lockertype, p.dir, q.quota
-       FROM filesys f, nfsphys p, quota q
+       FROM filesys f, nfsphys p, quota q, users u
        WHERE f.mach_id=:mid AND f.type='IMAP' AND f.createflg!=0
        AND f.filsys_id=q.filsys_id
        AND f.mach_id=p.mach_id AND f.phys_id=p.nfsphys_id
+       AND f.owner = u.users_id AND u.status != 3
        ORDER BY f.label, p.dir, q.quota;
       EXEC SQL OPEN filsys_cursor;
 

diff --git a/gen/postoffice.sh b/gen/postoffice.sh
index eb8bc2ea0b67372bcfd996e8fa9bdd4ae8fe7b54..c6078cdf7bea3b0097eb7ba4b19240b7bc3065c2 100644 (file)
--- a/gen/postoffice.sh
+++ b/gen/postoffice.sh
@@ -76,10 +76,6 @@ if [ $? != 0 ]; then
        exit ${MR_NOCRED}
 fi
 
-if [ -r {$IMAP_MBOXES} ]; then
-       egrep "\..*\." ${IMAP_CONFIG}/mailboxes >> ${IMAP_MBOXES}
-fi
-
 sort -o ${IMAP_MBOXES} ${IMAP_MBOXES}
 
 
@@ -106,7 +102,7 @@ cp ${IMAP_CONFIG}/mailboxes ${IMAP_CONFIG}/mailboxes.save
 LD_LIBRARY_PATH=/usr/local/tcl/lib
 export LD_LIBRARY_PATH
 
-${IMAP_BIN}/cyradm -file ${IMAP_BIN}/sync.cyradm sync -d
+${IMAP_BIN}/sync.pl
 if [ $? != 0 ]; then
        exit ${MR_MKCRED}
 fi