}
}
- if (!strcasecmp(v->prop[i].name, "tel;home"))
+ if ( (!strcasecmp(v->prop[i].name, "tel;home"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=home")) )
(void) CtdlDoDirectoryServiceFunc("homePhone", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
else
- if (!strcasecmp(v->prop[i].name, "tel;fax"))
+ if ( (!strcasecmp(v->prop[i].name, "tel;fax"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=fax")) )
(void) CtdlDoDirectoryServiceFunc("facsimileTelephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
else
- if (!strcasecmp(v->prop[i].name, "tel;cell"))
+ if ( (!strcasecmp(v->prop[i].name, "tel;cell"))
+ || (!strcasecmp(v->prop[i].name, "tel;type=cell")) )
(void) CtdlDoDirectoryServiceFunc("mobile", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD);
else
if ( (!strcasecmp(v->prop[i].name, "tel"))
}
}
}
- if (a==5) vcard_set_prop(my_vcard, "tel;home", buf, 0);
+ if (a==5) vcard_set_prop(my_vcard, "tel", buf, 0);
if (a==6) vcard_set_prop(my_vcard, "email;internet", buf, 0);
if (a==7) strcpy(tmpcountry, buf);
++a;
extract_token(buf, adr, 5, ';', sizeof buf);
cprintf("%s\n", buf); /* zip */
- s = vcard_get_prop(v, "tel;home", 0, 0, 0);
+ s = vcard_get_prop(v, "tel", 0, 0, 0);
if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0, 0);
if (s != NULL) {
cprintf("%s\n", s);
#ifdef SOLARIS_GETPWUID
if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
#else // SOLARIS_GETPWUID
- struct passwd **result = NULL;
- if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
+ struct passwd *result = NULL;
+ CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", 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);
vcard_add_prop(v, "email;internet", buf);