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#13925: ERRMAX in lib-src/pop.c Date: Tue, 12 Mar 2013 13:00:47 -0700 Message-ID: <513F896F.4030804@cs.ucla.edu> References: <513DB8CC.2060900@gmx.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1363118656 6452 80.91.229.3 (12 Mar 2013 20:04:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Mar 2013 20:04:16 +0000 (UTC) To: 13925@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 12 21:04:41 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UFVR9-0006B3-SZ for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Mar 2013 21:04:39 +0100 Original-Received: from localhost ([::1]:47765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFVQn-0002of-Fi for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Mar 2013 16:04:17 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFVPf-0002Co-M4 for bug-gnu-emacs@gnu.org; Tue, 12 Mar 2013 16:04:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFVOb-0006fE-JS for bug-gnu-emacs@gnu.org; Tue, 12 Mar 2013 16:03:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFVOb-0006f9-Gp for bug-gnu-emacs@gnu.org; Tue, 12 Mar 2013 16:02:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UFVPa-0004Hq-Bk for bug-gnu-emacs@gnu.org; Tue, 12 Mar 2013 16:03:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <513DB8CC.2060900@gmx.net> Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Mar 2013 20:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 13925 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 13925-submit@debbugs.gnu.org id=B13925.136311852216377 (code B ref 13925); Tue, 12 Mar 2013 20:03:02 +0000 Original-Received: (at 13925) by debbugs.gnu.org; 12 Mar 2013 20:02:02 +0000 Original-Received: from localhost ([127.0.0.1]:49365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UFVOZ-0004Fz-7J for submit@debbugs.gnu.org; Tue, 12 Mar 2013 16:02:01 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:40151) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UFVOW-0004Fl-03 for 13925@debbugs.gnu.org; Tue, 12 Mar 2013 16:01:57 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id B23D2A6000C; Tue, 12 Mar 2013 13:00:48 -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 u0C05I+UpW5M; Tue, 12 Mar 2013 13:00:48 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 05317A60007; Tue, 12 Mar 2013 13:00:48 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130219 Thunderbird/17.0.3 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-Spam-Score: -6.8 (------) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:72387 Archived-At: Sorry about the typo; it didn't trigger on my compilation platforms. Here's the obvious patch. Glenn, should I install this into the emacs-24 branch or into the trunk? I'm a bit fuzzy on the branch status now that 24.3 has been released. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-03-11 02:35:23 +0000 +++ lib-src/ChangeLog 2013-03-12 19:57:55 +0000 @@ -1,3 +1,9 @@ +2013-03-12 Paul Eggert + + * pop.c: Fix ERRMAX typo (Bug#13925). + (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: + Use ERROR_MAX, not ERRMAX. + 2013-03-11 Glenn Morris * Version 24.3 released. === modified file 'lib-src/pop.c' --- lib-src/pop.c 2013-01-01 09:11:05 +0000 +++ lib-src/pop.c 2013-03-12 19:56:43 +0000 @@ -1198,7 +1198,7 @@ } #elif defined HAVE_KRB5_ERROR_E_TEXT if (err_ret && err_ret->e_text && **err_ret->e_text) - snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len, + snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len, " [server says '%s']", *err_ret->e_text); #endif if (err_ret)