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

diff --cc citadel/modules/vcard/serv_vcard.c
index 77e4b06a90fc367ba50f73591a6f9f7c0c9656b1,a86127fb42ad58f529e3e427eb0d2d45eb96eddc..5c3a3a7259adfad4a3ef82f8963e23d3742e7a8b
--- 1/citadel/modules/vcard/serv_vcard.c
--- 2/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