from dongq:

     * initialize pointer in InsertSortedImapPart

     * prevent loop in CreateImapBox

diff --git a/clients/moira/pobox.c b/clients/moira/pobox.c
index 4fc105a3434fefa2c489745ca1cc772dac9b4ddf..dc820cabc51f0062fa9c69082730fda1c2878073 100644 (file)
--- a/clients/moira/pobox.c
+++ b/clients/moira/pobox.c
@@ -149,7 +149,8 @@ static char *GetNewLocalPOBox(char *local_user)
 
 static int InsertSortedImapPart(int argc, char **argv, void *arg)
 {
-  struct mqelem *new, *elem, *prev, **parts = arg;
+  struct mqelem *new = NULL;
+  struct mqelem *elem, *prev, **parts = arg;
   int avail = atoi(argv[NFS_SIZE]) - atoi(argv[NFS_ALLOC]);
 
   /* Dup the argv into a new mqelem. */
@@ -333,6 +334,7 @@ char *CreateImapBox(char *user)
              char **pargv = elem->q_data;
              if (!strcmp(partition, pargv[NFS_DIR]))
                break;
+             elem = elem->q_forw;
            }
          if (!elem)
            {