Bugfixes

* libmu_sieve/sieve.y: Fix compilation of chained elsif conditions.
* sieve/sieve.c: Define the location environment item.

@@ -32,7 +32,6 @@ static struct mu_sieve_node *sieve_tree;
 
 
 static struct mu_sieve_node *node_alloc (enum mu_sieve_node_type,
 static struct mu_sieve_node *node_alloc (enum mu_sieve_node_type,
 					 struct mu_locus_range *);
 					 struct mu_locus_range *);
-static void cond_join (struct mu_sieve_node *node);
 
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)                         \
 #define YYLLOC_DEFAULT(Current, Rhs, N)                         \
   do								\
   do								\
@@ -158,17 +157,13 @@ statement    : REQUIRE stringorlist ';'
 
 
 else_part    : maybe_elsif
 else_part    : maybe_elsif
                {
                {
-		 cond_join ($1.head);
 		 $$ = $1.head;
 		 $$ = $1.head;
 	       }
 	       }
              | maybe_elsif ELSE block
              | maybe_elsif ELSE block
                {
                {
-		 $3->prev = $1.tail;
-		 if ($1.head)
+		 if ($1.tail)
 		   {
 		   {
-		     $1.tail->next = $3;
-		     $1.tail = $3;
-		     cond_join ($1.head);
+		     $1.tail->v.cond.iffalse = $3;
 		     $$ = $1.head;
 		     $$ = $1.head;
 		   }
 		   }
 		 else
 		 else
@@ -183,6 +178,8 @@ maybe_elsif  : /* empty */
              | elsif_branch
              | elsif_branch
              ;
              ;
 
 
+/* elsif branches form a singly-linked version of node_list.  Nodes in
+   this list are linked by v.cond.iffalse pointer */
 elsif_branch : ELSIF cond block
 elsif_branch : ELSIF cond block
                {
                {
 		 struct mu_sieve_node *node =
 		 struct mu_sieve_node *node =
@@ -199,10 +196,10 @@ elsif_branch : ELSIF cond block
 		 node->v.cond.expr = $3;
 		 node->v.cond.expr = $3;
 		 node->v.cond.iftrue = $4;
 		 node->v.cond.iftrue = $4;
 		 node->v.cond.iffalse = NULL;
 		 node->v.cond.iffalse = NULL;
-
-		 node->prev = $1.tail;
-		 $1.tail->next = node;
+		 
+		 $1.tail->v.cond.iffalse = node;
 		 $1.tail = node;
 		 $1.tail = node;
+
 		 $$ = $1;
 		 $$ = $1;
 	       }
 	       }
              ;
              ;
@@ -405,18 +402,6 @@ yyerror (const char *s)
   mu_i_sv_error (mu_sieve_machine);
   mu_i_sv_error (mu_sieve_machine);
   return 0;
   return 0;
 }
 }
-
-static void
-cond_join (struct mu_sieve_node *node)
-{
-  while (node && node->type == mu_sieve_node_cond)
-    {
-      struct mu_sieve_node *next = node->next;
-      node->prev = node->next = NULL;
-      node->v.cond.iffalse = next;
-      node = next;
-    }
-}
 
 
 static struct mu_sieve_node *
 static struct mu_sieve_node *
 node_alloc (enum mu_sieve_node_type type, struct mu_locus_range *lr)
 node_alloc (enum mu_sieve_node_type type, struct mu_locus_range *lr)

@@ -485,6 +485,7 @@ main (int argc, char *argv[])
       return EX_SOFTWARE;
       return EX_SOFTWARE;
     }
     }
 
 
+  sieve_setenv ("location=MS", mach);
   sieve_setenv ("phase=post", mach);
   sieve_setenv ("phase=post", mach);
   mu_list_foreach (env_list, sieve_setenv, mach);
   mu_list_foreach (env_list, sieve_setenv, mach);
   mu_list_destroy (&env_list);
   mu_list_destroy (&env_list);