Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <willi@arangodb.com>
Wed, 7 Oct 2015 12:37:52 +0000 (14:37 +0200)
committerWilfried Goesgens <willi@arangodb.com>
Wed, 7 Oct 2015 12:37:52 +0000 (14:37 +0200)
1  2 
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