more moving towards ldap sync ... lots of refactoring

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index acaa7ac620d7d3988ee503fd4debf20d81703f9f..f3624bdc451e8891b0e02ccf430ca2dd64f14196 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -798,7 +798,11 @@ void vcard_newuser(struct ctdluser *usbuf) {
                int found_user;
                char ldap_cn[512];
                char ldap_dn[512];
-               found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid, 1);
+
+syslog(LOG_DEBUG, "\033[31m FIXME BORK BORK BORK try lookup by uid , or maybe dn?\033[0m");
+
+
+               found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid);
                if (found_user == 0) {
                        if (Ctdl_LDAP_to_vCard(ldap_dn, v)) {
                                /* Allow global address book and internet directory update without login long enough to write this. */
@@ -1447,15 +1451,15 @@ CTDL_MODULE_INIT(vcard)
                                //fclose(fp);
                                //rv = chown(filename, CTDLUID, (-1));
                                //if (rv == -1) {
-                                       //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %s", filename, strerror(errno));
+                                       //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %m", filename);
                                //}
                                //rv = chmod(filename, 0600);
                                //if (rv == -1) {
-                                       //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %s", filename, strerror(errno));
+                                       //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %m", filename);
                                //}
                        //}
                        //else {
-                               //syslog(LOG_ERR, "vcard: cannot create %s: %s", filename, strerror(errno));
+                               //syslog(LOG_ERR, "vcard: cannot create %s: %m", filename);
                        //}
                }