From: Mark Oteiza <mvoteiza@udel.edu>
Date: Mon, 21 Jul 2014 03:06:28 +0000 (-0400)
Subject: config: read user.name from $NAME if set
X-Git-Tag: address-command-v2~117
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/488b2619643de6776e2649d97b480da8db049023

config: read user.name from $NAME if set

Try to read the config parameter user.name from $NAME before taking the
user name from /etc/passwd.
---

diff --git a/notmuch-config.c b/notmuch-config.c
index 4886d366..8f1f48d0 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -219,7 +219,8 @@ get_username_from_passwd_file (void *ctx)
  *
  *		database_path:		$HOME/mail
  *
- *		user_name:		From /etc/passwd
+ *		user_name:		$NAME variable if set, otherwise
+ *					read from /etc/passwd
  *
  *		user_primary_mail: 	$EMAIL variable if set, otherwise
  *					constructed from the username and
@@ -329,7 +330,9 @@ notmuch_config_open (void *ctx,
     }
 
     if (notmuch_config_get_user_name (config) == NULL) {
-	char *name = get_name_from_passwd_file (config);
+	char *name = getenv ("NAME");
+	if (! name)
+	    name = get_name_from_passwd_file (config);
 	notmuch_config_set_user_name (config, name);
 	talloc_free (name);
     }