From: Wilfried Goesgens <willi@arangodb.com>
Date: Wed, 7 Oct 2015 12:37:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: Release_902~156^2~1
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9571de81331e169c042c630800bff1bde499c8a9

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

9571de81331e169c042c630800bff1bde499c8a9
diff --cc citadel/modules/vcard/serv_vcard.c
index 77e4b06a9,a86127fb4..5c3a3a725
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@@ -875,9 -878,9 +878,9 @@@ void vcard_newuser(struct ctdluser *usb
  		syslog(LOG_DEBUG, "Searching for uid %d", usbuf->uid);
  		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
  #endif // HAVE_GETPWUID_R
- 			snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
+ 			snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn"));
  			vcard_add_prop(v, "email;internet", buf);
 -			need_default_vcard=0;
 +			need_default_vcard = 0;
  		}
  	}
  #endif