[SCM] GNU shishi branch, master, updated. shishi-0-0-42-27-ge0b79e3

[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=e0b79e339778b13166a988188b29d7f1ede06166

The branch, master has been updated
       via  e0b79e339778b13166a988188b29d7f1ede06166 (commit)
       via  13f500bdc20df5ec4e37696ce257800b8837f1cf (commit)
       via  d4c7556bcb278df578a199c9483494d780c355cc (commit)
       via  2ccdddd95fdd0fab5ce125d2dfcb9034688df2c6 (commit)
      from  48f5fca48b06aa8d34e0000940e25cf8b8cce18f (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 e0b79e339778b13166a988188b29d7f1ede06166
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 22 23:57:39 2010 +0100

    Remove failed listeners from list properly.

commit 13f500bdc20df5ec4e37696ce257800b8837f1cf
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 22 23:08:25 2010 +0100

    Fix lintian typo.

commit d4c7556bcb278df578a199c9483494d780c355cc
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 22 23:06:16 2010 +0100

    Fix lintian typo.

commit 2ccdddd95fdd0fab5ce125d2dfcb9034688df2c6
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 22 22:56:45 2010 +0100

    Add.

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

Summary of changes:
 NEWS          |    2 ++
 db/config.c   |    2 +-
 lib/tkts.c    |    4 ++--
 src/shishid.c |   10 +++++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 14200df..8269ac2 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ See the end for copying conditions.
 ** doc: Fix spelling typos noticed by lintian.
 
 ** Update gnulib files.
+Including moving the 'stat' module from db/ to gl/ so that libshishi
+builds properly.
 
 ** API and ABI modifications:
 No changes since last version.
diff --git a/db/config.c b/db/config.c
index f89d7c2..cacf4c1 100644
--- a/db/config.c
+++ b/db/config.c
@@ -122,7 +122,7 @@ shisa_cfg (Shisa * dbh, const char *option)
  *
  * Configure shisa library using configuration file.
  *
- * Return Value: Returns %SHISA_OK iff succesful.
+ * Return Value: Returns %SHISA_OK iff successful.
  **/
 int
 shisa_cfg_from_file (Shisa * dbh, const char *cfg)
diff --git a/lib/tkts.c b/lib/tkts.c
index 2962f8d..8879334 100644
--- a/lib/tkts.c
+++ b/lib/tkts.c
@@ -208,8 +208,8 @@ shishi_tkts_nth (Shishi_tkts * tkts, int ticketno)
  *
  * Remove a ticket, indexed by @ticketno, in ticket set.
  *
- * Return value: Returns SHISHI_OK if succesful or if ticketno larger
- *   than size of ticket set.
+ * Return value: %SHISHI_OK if successful or if @ticketno larger than
+ *   size of ticket set.
  **/
 int
 shishi_tkts_remove (Shishi_tkts * tkts, int ticketno)
diff --git a/src/shishid.c b/src/shishid.c
index 3076659..09ce675 100644
--- a/src/shishid.c
+++ b/src/shishid.c
@@ -45,14 +45,15 @@ gnutls_certificate_credentials x509cred;
 static void
 kdc_listen (void)
 {
-  struct listenspec *ls, *tmp;
+  struct listenspec *ls, *tmp, *last;
   int maxfd = 0;
   int yes;
 
-  for (ls = listenspec; ls; ls = ls->next)
+  for (last = NULL, ls = listenspec; ls; last = ls, ls = ls->next)
     {
       struct addrinfo *rp;
 
+    restart:
       for (rp = ls->ai; rp != NULL; rp = rp->ai_next)
        {
          ls->sockfd = socket (ls->family, rp->ai_socktype, rp->ai_protocol);
@@ -111,13 +112,16 @@ kdc_listen (void)
       close (ls->sockfd);
     error:
       tmp = ls->next;
-      if (listenspec == ls)
+      if (last == NULL)
        listenspec = tmp;
+      else
+       last->next = tmp;
       free (ls->str);
       free (ls);
       ls = tmp;
       if (!ls)
        break;
+      goto restart;
     }
 
   if (maxfd == 0)


hooks/post-receive
-- 
GNU shishi