* added a comment infront of the svn modifieable returns. Now it will be me listed...

[citadel.git] / citadel / serv_ldap.c

diff --git a/citadel/serv_ldap.c b/citadel/serv_ldap.c
index 1dff8761ff94da6b8eb420c8074f69bf0fe2eac7..6d8acc1f77156adea325f90114ce3670456f20d8 100644 (file)
--- a/citadel/serv_ldap.c
+++ b/citadel/serv_ldap.c
@@ -106,7 +106,10 @@ void CtdlCreateLdapRoot(void) {
        i = ldap_add_s(dirserver, config.c_ldap_base_dn, mods);
        end_critical_section(S_LDAP);
 
-       if (i != LDAP_SUCCESS) {
+       if (i == LDAP_ALREADY_EXISTS) {
+               lprintf(CTDL_INFO, "Base DN is already present in the directory; no need to add it again.\n");
+       }
+       else if (i != LDAP_SUCCESS) {
                lprintf(CTDL_CRIT, "ldap_add_s() failed: %s (%d)\n",
                        ldap_err2string(i), i);
        }
@@ -149,12 +152,13 @@ void CtdlCreateHostOU(char *host) {
        i = ldap_add_s(dirserver, dn, mods);
        end_critical_section(S_LDAP);
 
-       /* ignore the error -- it's ok if it already exists
-       if (i != LDAP_SUCCESS) {
-               lprintf(CTDL_ERR, "ldap_add_s() failed: %s (%d)\n",
+       if (i == LDAP_ALREADY_EXISTS) {
+               lprintf(CTDL_INFO, "Host OU is already present in the directory; no need to add it again.\n");
+       }
+       else if (i != LDAP_SUCCESS) {
+               lprintf(CTDL_CRIT, "ldap_add_s() failed: %s (%d)\n",
                        ldap_err2string(i), i);
        }
-       */
 }
 
 
@@ -282,7 +286,7 @@ void ctdl_vcard_to_ldap(struct CtdlMessage *msg, int op) {
        attrs[0]->mod_op        = LDAP_MOD_ADD;
        attrs[0]->mod_type      = "objectclass";
        attrs[0]->mod_values    = malloc(3 * sizeof(char *));
-       attrs[0]->mod_values[0] = strdup("inetOrgPerson");
+       attrs[0]->mod_values[0] = strdup("citadelInetOrgPerson");
        attrs[0]->mod_values[1] = NULL;
 
        /* Convert the vCard fields to LDAP properties */
@@ -530,7 +534,7 @@ void ctdl_vcard_to_ldap(struct CtdlMessage *msg, int op) {
        attrs = realloc(attrs, (sizeof(LDAPMod *) * ++num_attrs) );
        attrs[num_attrs - 1] = NULL;
        
-       lprintf(CTDL_DEBUG, "Calling ldap_add_s()\n");
+       lprintf(CTDL_DEBUG, "Calling ldap_add_s() for '%s'\n", this_dn);
        begin_critical_section(S_LDAP);
        i = ldap_add_s(dirserver, this_dn, attrs);
        end_critical_section(S_LDAP);
@@ -540,7 +544,7 @@ void ctdl_vcard_to_ldap(struct CtdlMessage *msg, int op) {
                for (j=0; j<(num_attrs-1); ++j) {
                        attrs[j]->mod_op = LDAP_MOD_REPLACE;
                }
-               lprintf(CTDL_DEBUG, "Calling ldap_modify_s()\n");
+               lprintf(CTDL_DEBUG, "Calling ldap_modify_s() for '%s'\n", this_dn);
                begin_critical_section(S_LDAP);
                i = ldap_modify_s(dirserver, this_dn, attrs);
                end_critical_section(S_LDAP);
@@ -593,5 +597,7 @@ char *serv_ldap_init(void)
        }
 
 #endif                         /* HAVE_LDAP */
+
+       /* return our Subversion id for the Log */
        return "$Id$";
 }