[SCM] GNU shishi branch, master, updated. shishi-0-0-42-34-gb5d4db8

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=b5d4db8464ed88442b5f030cd793a23183b8588f

The branch, master has been updated
       via  b5d4db8464ed88442b5f030cd793a23183b8588f (commit)
      from  440862afb3f731bbc66ade452a39d26a9c045019 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5d4db8464ed88442b5f030cd793a23183b8588f
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 23 11:13:39 2010 +0100

    Need to do SO_REUSEADDR before bind.

-----------------------------------------------------------------------

Summary of changes:
 src/shishid.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/shishid.c b/src/shishid.c
index 6d8551f..35e3614 100644
--- a/src/shishid.c
+++ b/src/shishid.c
@@ -63,13 +63,6 @@ kdc_listen (void)
          goto error;
        }
 
-      if (bind (ls->sockfd, ls->ai.ai_addr, ls->ai.ai_addrlen) != 0)
-       {
-         error (0, errno, "Cannot listen on %s because bind %s failed",
-                ls->str, ls->addrname);
-         goto errorclose;
-       }
-
       yes = 1;
       if (setsockopt (ls->sockfd, SOL_SOCKET, SO_REUSEADDR,
                      (char *) &yes, sizeof (yes)) < 0)
@@ -79,6 +72,13 @@ kdc_listen (void)
          goto errorclose;
        }
 
+      if (bind (ls->sockfd, ls->ai.ai_addr, ls->ai.ai_addrlen) != 0)
+       {
+         error (0, errno, "Cannot listen on %s because bind %s failed",
+                ls->str, ls->addrname);
+         goto errorclose;
+       }
+
       if (ls->ai.ai_socktype == SOCK_STREAM
          && listen (ls->sockfd, SOMAXCONN) != 0)
        {


hooks/post-receive
-- 
GNU shishi