1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 14AB2431FBD
\r
6 for <notmuch@notmuchmail.org>; Sun, 20 Jul 2014 23:59:11 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id OpjwgvsLmxEn for <notmuch@notmuchmail.org>;
\r
16 Sun, 20 Jul 2014 23:59:02 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id E212C431FAE
\r
19 for <notmuch@notmuchmail.org>; Sun, 20 Jul 2014 23:59:01 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 3F20B100199;
\r
22 Mon, 21 Jul 2014 09:58:54 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Mark Oteiza <mvoteiza@udel.edu>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH] config: read user.name from $NAME if set
\r
26 In-Reply-To: <87r41fo1fv.fsf@holos.localdomain>
\r
27 References: <87r41fo1fv.fsf@holos.localdomain>
\r
28 User-Agent: Notmuch/0.18.1+25~gdaf4b6f (http://notmuchmail.org) Emacs/24.3.1
\r
29 (x86_64-unknown-linux-gnu)
\r
30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
31 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
32 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
33 Date: Mon, 21 Jul 2014 09:58:54 +0300
\r
34 Message-ID: <m2lhrn2o5t.fsf@guru.guru-group.fi>
\r
36 Content-Type: text/plain
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Mon, 21 Jul 2014 06:59:11 -0000
\r
51 On Mon, Jul 21 2014, Mark Oteiza <mvoteiza@udel.edu> wrote:
\r
53 > Try to read the config parameter user.name from $NAME before taking the
\r
54 > user name from /etc/passwd.
\r
56 LGTM. $NAME is used for the same purpose in
\r
58 https://www.gnu.org/software/emacs/manual/html_node/emacs/General-Variables.html
\r
60 (and probably in many other places too)
\r
66 > notmuch-config.c | 7 +++++--
\r
67 > 1 file changed, 5 insertions(+), 2 deletions(-)
\r
69 > diff --git a/notmuch-config.c b/notmuch-config.c
\r
70 > index 4886d36..8f1f48d 100644
\r
71 > --- a/notmuch-config.c
\r
72 > +++ b/notmuch-config.c
\r
73 > @@ -219,7 +219,8 @@ get_username_from_passwd_file (void *ctx)
\r
75 > * database_path: $HOME/mail
\r
77 > - * user_name: From /etc/passwd
\r
78 > + * user_name: $NAME variable if set, otherwise
\r
79 > + * read from /etc/passwd
\r
81 > * user_primary_mail: $EMAIL variable if set, otherwise
\r
82 > * constructed from the username and
\r
83 > @@ -329,7 +330,9 @@ notmuch_config_open (void *ctx,
\r
86 > if (notmuch_config_get_user_name (config) == NULL) {
\r
87 > - char *name = get_name_from_passwd_file (config);
\r
88 > + char *name = getenv ("NAME");
\r
90 > + name = get_name_from_passwd_file (config);
\r
91 > notmuch_config_set_user_name (config, name);
\r
92 > talloc_free (name);
\r