From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Network Security Manager merge time? Date: Thu, 20 Nov 2014 18:16:59 +0200 Message-ID: <83y4r56e4k.fsf@gnu.org> References: <87lhn7cfe0.fsf@lifelogs.com> <83ioia7wbd.fsf@gnu.org> <83h9xu7uu5.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416500259 1128 80.91.229.3 (20 Nov 2014 16:17:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 16:17:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 17:17:32 2014 Return-path: Envelope-to: ged-emacs-devel@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 1XrUQE-0008HJ-6H for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 17:17:30 +0100 Original-Received: from localhost ([::1]:36115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrUQD-0005ox-Fy for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 11:17:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrUPq-0005oc-RX for emacs-devel@gnu.org; Thu, 20 Nov 2014 11:17:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrUPk-0003a1-RJ for emacs-devel@gnu.org; Thu, 20 Nov 2014 11:17:06 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:47232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrUPk-0003Zp-KN for emacs-devel@gnu.org; Thu, 20 Nov 2014 11:17:00 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NFC00H00I8PBF00@mtaout27.012.net.il> for emacs-devel@gnu.org; Thu, 20 Nov 2014 18:12:23 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFC00A0QICNIG70@mtaout27.012.net.il>; Thu, 20 Nov 2014 18:12:23 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177879 Archived-At: > From: Lars Magne Ingebrigtsen > Cc: emacs-devel@gnu.org > Date: Thu, 20 Nov 2014 09:42:42 +0100 > > Eli Zaretskii writes: > > >> I can't see any such calls on the branch, but perhaps my grep-fu isn't > >> looking for the right thing. Which calls in particular? > > [...] > > > gnutls_x509_crt_get_issuer_unique_id > > The call for that is, for instance: > > err = fn_gnutls_x509_crt_get_issuer_unique_id (cert, NULL, &buf_size); > if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { > char *buf = malloc (buf_size); > err = fn_gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size); > > (And the same with the other functions in the list.) Obviously, that's not what I saw. I copy/pasted the functions from the diffs. > >> (And have you updated the branch? The cargo culting happened in a > >> commit earlier today.) > > > > I said "git diff ...origin/nsm", I hope that's the right command to > > see the diffs against the trunk. > > Perhaps a "git pull" is missing? No, I did the diff immediately after pulling. However, it takes time to review the diffs, and if you kept committing changes during that time, and never said "forget what you saw until now 'cause I changed all of it", then I couldn't possibly know I'm staring at stale code. Anyway, it looks fine now that I repeat the procedure.