update: just tested your new testcase with my patch...and it passes...
i.e the test does not expose any problem in my patch

/Jonas

On Thu, Mar 5, 2015 at 1:22 PM, Jonas Oreland <jonaso@google.com> wrote:
great thx! (was on my TODO...but got stuck on other things today).
I'll write a new patch, that passes this test too

/Jonas

On Thu, Mar 5, 2015 at 9:54 AM, Kristian Nielsen <knielsen@knielsen-hq.org> wrote:
Jonas Oreland <jonaso@google.com> writes:

> I wrote attached patch (so that i would understand what code actually does)
> and found myself while refactoring also doing a change, namely that
> i removed the check for server_id in a couple of places.
>
> it still passes all tests...

It is somewhat surprising (and bad) that there were no test cases that caught
this.

So I pushed a suitable test case:

    http://lists.askmonty.org/pipermail/commits/2015-March/007520.html

Maybe it can help you...

 - Kristian.