From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#8556: recent gnutls.c changes broke build on Ubuntu 10.10 Date: Tue, 26 Apr 2011 00:18:16 -0700 Organization: UCLA Computer Science Department Message-ID: <4DB671B8.5010702@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1303803477 22130 80.91.229.12 (26 Apr 2011 07:37:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 26 Apr 2011 07:37:57 +0000 (UTC) Cc: Ted Zlatanov To: 8556@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Apr 26 09:37:51 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QEcqF-0000D0-2l for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Apr 2011 09:37:51 +0200 Original-Received: from localhost ([::1]:43413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcqB-000050-0N for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Apr 2011 03:37:47 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:56525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcq8-00004v-JJ for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:37:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEcq7-0001mY-RY for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:37:44 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcq7-0001mU-Pz for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:37:43 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QEcY1-0006O0-Sm; Tue, 26 Apr 2011 03:19:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Apr 2011 07:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 8556 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.130380231424511 (code B ref -1); Tue, 26 Apr 2011 07:19:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 26 Apr 2011 07:18:34 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QEcXa-0006NG-BW for submit@debbugs.gnu.org; Tue, 26 Apr 2011 03:18:34 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QEcXY-0006N2-Bp for submit@debbugs.gnu.org; Tue, 26 Apr 2011 03:18:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEcXS-0007nc-9m for submit@debbugs.gnu.org; Tue, 26 Apr 2011 03:18:27 -0400 Original-Received: from lists.gnu.org ([140.186.70.17]:33012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcXS-0007nY-89 for submit@debbugs.gnu.org; Tue, 26 Apr 2011 03:18:26 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:34063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcXR-0006Bh-Ae for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:18:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEcXQ-0007nB-8q for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:18:25 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:40058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEcXQ-0007mw-2U for bug-gnu-emacs@gnu.org; Tue, 26 Apr 2011 03:18:24 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 0BAB039E80F5; Tue, 26 Apr 2011 00:18:22 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AR2eXhD38iOy; Tue, 26 Apr 2011 00:18:21 -0700 (PDT) Original-Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 6F95E39E8083; Tue, 26 Apr 2011 00:18:21 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Thunderbird/3.1.8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 26 Apr 2011 03:19:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:46010 Archived-At: bzr 103998 introduced a bug in emacs_gnutls_handshake: it has a 'return;' statement in a function returning an integer, which violates the C standard. I plan to fix this with the following patch, for lack of a better idea, but it would be nice if someone with more expertise in gnutls could double-check this. * gnutls.c (emacs_gnutls_handshake): Always return a value. Expect the caller to check whether GNUTLS_STAGE_HANDSHAKE_CANDO <= proc->gnutls_initstage, if the check is needed. The check isn't needed for one caller, Fgnutls_boot. (emacs_gnutls_read): Do that check. This is the other caller. === modified file 'src/gnutls.c' --- src/gnutls.c 2011-04-26 06:17:52 +0000 +++ src/gnutls.c 2011-04-26 07:05:42 +0000 @@ -73,9 +73,6 @@ gnutls_session_t state = proc->gnutls_state; int ret; - if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO) - return; - if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET) { #ifdef WINDOWSNT @@ -179,7 +176,8 @@ if (proc->gnutls_initstage != GNUTLS_STAGE_READY) { - emacs_gnutls_handshake (proc); + if (GNUTLS_STAGE_HANDSHAKE_CANDO <= proc->gnutls_initstage) + emacs_gnutls_handshake (proc); return -1; } rtnval = gnutls_read (state, buf, nbyte);