[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-52-g520cf54

[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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=520cf54a3e6b1ef0474a93262b880714f4b3e6df

The branch, master has been updated
       via  520cf54a3e6b1ef0474a93262b880714f4b3e6df (commit)
       via  01a88f21c9447fb73a01453b17e2f7f701b95200 (commit)
       via  25dc6662e269f8aa1f6459cb7504f84e3eb5a389 (commit)
      from  ea038effe891515af6c979ed39765229ce53a915 (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 520cf54a3e6b1ef0474a93262b880714f4b3e6df
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:45:56 2009 +0100

    Fix compile error.
    
    Tiny patch by Brad Hards <address@hidden> in
    <http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3943>.

commit 01a88f21c9447fb73a01453b17e2f7f701b95200
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:42:19 2009 +0100

    Fix compile errors.
    
    Tiny patch from Brad Hards <address@hidden>
    in <http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3942>.

commit 25dc6662e269f8aa1f6459cb7504f84e3eb5a389
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 5 08:40:36 2009 +0100

    Fix compile errors.
    
    Tiny patch from Brad Hards <address@hidden>
    in <http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3941>.

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

Summary of changes:
 gl/m4/inet_ntop.m4  |    3 ++-
 gl/m4/inet_pton.m4  |    3 ++-
 lib/auth_cert.c     |    1 +
 lib/ext_signature.c |    3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gl/m4/inet_ntop.m4 b/gl/m4/inet_ntop.m4
index 85a6bb6..ea645f2 100644
--- a/gl/m4/inet_ntop.m4
+++ b/gl/m4/inet_ntop.m4
@@ -18,7 +18,8 @@ AC_DEFUN([gl_INET_NTOP],
     [AC_REPLACE_FUNCS([inet_ntop])])
   LIBS=$gl_save_LIBS
   INET_NTOP_LIB=
-  if test "$ac_cv_search_inet_ntop" != "none needed"; then
+  if test "$ac_cv_search_inet_ntop" != "none needed" &&
+     test "$ac_cv_search_inet_ntop" != "none required"; then
     INET_NTOP_LIB="$ac_cv_search_inet_ntop"
   fi
   AC_SUBST([INET_NTOP_LIB])
diff --git a/gl/m4/inet_pton.m4 b/gl/m4/inet_pton.m4
index f071801..068deee 100644
--- a/gl/m4/inet_pton.m4
+++ b/gl/m4/inet_pton.m4
@@ -18,7 +18,8 @@ AC_DEFUN([gl_INET_PTON],
     [AC_REPLACE_FUNCS([inet_pton])])
   LIBS=$gl_save_LIBS
   INET_PTON_LIB=
-  if test "$ac_cv_search_inet_pton" != "none needed"; then
+  if test "$ac_cv_search_inet_pton" != "none needed" &&
+     test "$ac_cv_search_inet_pton" != "none required"; then
     INET_PTON_LIB="$ac_cv_search_inet_pton"
   fi
   AC_SUBST([INET_PTON_LIB])
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index d637316..2cd8b58 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -35,6 +35,7 @@
 #include "gnutls_num.h"
 #include "libtasn1.h"
 #include "gnutls_datum.h"
+#include "ext_signature.h"
 #include <gnutls_pk.h>
 #include <gnutls_algorithms.h>
 #include <gnutls_global.h>
diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index cd12fc7..ffece50 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -41,7 +41,6 @@ int _gnutls_sign_algorithm_write_params(gnutls_session_t 
session, opaque *data,
 {
 opaque* p = data;
 int len, i ,j;
-int ret;
 sign_algorithm_st aid;
 
           len = session->internals.priorities.sign_algo.algorithms * 2;


hooks/post-receive
-- 
GNU gnutls