sockaddr: Fix erroneous conflict resolution

When rebasing e3aecaf against master
with 005f103 applied (which got rid of
a bunch of unnecessary "else" keywords), I accidentally applied the
wrong conflict resolution and stripped an "else" in a location where it
still needs to be.

To make sure I didn't mess up other things during conflict resolution, I
carefully reviewed the diff of sockaddr.cc to make sure this is the only
location where it went wrong.

Fortunately, we do have tests for that functionality, so fixing the
erroneous conflict resolution now also lets our tests pass again.

Signed-off-by: aszlig <[email protected]>

src/sockaddr.cc

@@ -185,7 +185,7 @@ bool SockAddr::set_port(uint16_t port)
 {
     if (this->is_inet4())
         this->cast4()->sin_port = htons(port);
-    if (this->is_inet6())
+    else if (this->is_inet6())
         this->cast6()->sin6_port = htons(port);
     else
         return false;