int ctdl_require_ldap_version = 3;
+#define _GNU_SOURCE // Needed to suppress warning about vasprintf() when running on Linux/Linux
#include <stdio.h>
#include <libcitadel.h>
-
#include "citserver.h"
#include "citadel_ldap.h"
#include "ctdl_module.h"
-
#include "user_ops.h"
#ifdef HAVE_LDAP
#define LDAP_DEPRECATED 1 /* Suppress libldap's warning that we are using deprecated API calls */
#include <ldap.h>
+
+
+/*
+ * Wrapper function for ldap_initialize() that consistently fills in the correct fields
+ */
+int ctdl_ldap_initialize(LDAP **ld) {
+
+ char server_url[256];
+ int ret;
+
+ snprintf(server_url, sizeof server_url, "ldap://%s:%d", config.c_ldap_host, config.c_ldap_port);
+ ret = ldap_initialize(ld, server_url);
+ if (ret != LDAP_SUCCESS) {
+ syslog(LOG_ALERT, "LDAP: Could not connect to %s : %s",
+ server_url,
+ strerror(errno)
+ );
+ *ld = NULL;
+ return(errno);
+ }
+
+ return(ret);
+}
+
+
+
+
+/*
+ * Look up a user in the directory to see if this is an account that can be authenticated
+ */
int CtdlTryUserLDAP(char *username,
char *found_dn, int found_dn_size,
char *fullname, int fullname_size,
char **values;
char *user_dn = NULL;
-#ifndef LDAP_INITIALIZE
if (fullname) safestrncpy(fullname, username, fullname_size);
ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
- if (ldserver == NULL) {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s\n",
- config.c_ldap_host, config.c_ldap_port,
- strerror(errno)
- );
+ if (ctdl_ldap_initialize(&ldserver) != LDAP_SUCCESS) {
return(errno);
}
striplt(config.c_ldap_bind_dn);
striplt(config.c_ldap_bind_pw);
- syslog(LOG_DEBUG, "LDAP bind DN: %s\n", config.c_ldap_bind_dn);
- i = ldap_simple_bind_s(ldserver,
- (!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
- (!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
- );
- if (i != LDAP_SUCCESS) {
- syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i);
- return(i);
- }
-#else
- if (ldap_initialize(&ldserver, config.c_ldap_host))
- {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s\n",
- config.c_ldap_host, config.c_ldap_port,
- strerror(errno)
- );
- return(errno);
- }
-
- striplt(config.c_ldap_bind_dn);
- striplt(config.c_ldap_bind_pw);
-
- syslog(LOG_DEBUG, "LDAP bind DN: %s\n", config.c_ldap_bind_dn);
+ syslog(LOG_DEBUG, "LDAP bind DN: %s", config.c_ldap_bind_dn);
i = ldap_simple_bind_s(ldserver,
(!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
(!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
);
-
if (i != LDAP_SUCCESS) {
- syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i);
+ syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
return(i);
}
-#endif
-
tv.tv_sec = 10;
tv.tv_usec = 0;
if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
- sprintf(searchstring, "(sAMAccountName=%s)", username);
+ snprintf(searchstring, sizeof(searchstring), "(sAMAccountName=%s)", username);
}
else {
- sprintf(searchstring, "(&(objectclass=posixAccount)(uid=%s))", username);
+ snprintf(searchstring, sizeof(searchstring), "(&(objectclass=posixAccount)(uid=%s))", username);
}
- syslog(LOG_DEBUG, "LDAP search: %s\n", searchstring);
+ syslog(LOG_DEBUG, "LDAP search: %s", searchstring);
(void) ldap_search_ext_s(
ldserver, /* ld */
config.c_ldap_base_dn, /* base */
* the search succeeds. Instead, we check to see whether search_result is still NULL.
*/
if (search_result == NULL) {
- syslog(LOG_DEBUG, "LDAP search: zero results were returned\n");
+ syslog(LOG_DEBUG, "LDAP search: zero results were returned");
ldap_unbind(ldserver);
return(2);
}
user_dn = ldap_get_dn(ldserver, entry);
if (user_dn) {
- syslog(LOG_DEBUG, "dn = %s\n", user_dn);
+ syslog(LOG_DEBUG, "dn = %s", user_dn);
}
if (config.c_auth_mode == AUTHMODE_LDAP_AD) {
if (values) {
if (values[0]) {
if (fullname) safestrncpy(fullname, values[0], fullname_size);
- syslog(LOG_DEBUG, "displayName = %s\n", values[0]);
+ syslog(LOG_DEBUG, "displayName = %s", values[0]);
}
ldap_value_free(values);
}
if (values) {
if (values[0]) {
if (fullname) safestrncpy(fullname, values[0], fullname_size);
- syslog(LOG_DEBUG, "cn = %s\n", values[0]);
+ syslog(LOG_DEBUG, "cn = %s", values[0]);
}
ldap_value_free(values);
}
if (values[0]) {
if (uid != NULL) {
*uid = abs(HashLittle(values[0], strlen(values[0])));
- syslog(LOG_DEBUG, "uid hashed from objectGUID = %d\n", *uid);
+ syslog(LOG_DEBUG, "uid hashed from objectGUID = %d", *uid);
}
}
ldap_value_free(values);
values = ldap_get_values(ldserver, search_result, "uidNumber");
if (values) {
if (values[0]) {
- syslog(LOG_DEBUG, "uidNumber = %s\n", values[0]);
+ syslog(LOG_DEBUG, "uidNumber = %s", values[0]);
if (uid != NULL) {
*uid = atoi(values[0]);
}
ldap_unbind(ldserver);
if (!user_dn) {
- syslog(LOG_DEBUG, "No such user was found.\n");
+ syslog(LOG_DEBUG, "No such user was found.");
return(4);
}
int i = (-1);
if (IsEmptyStr(password)) {
- syslog(LOG_DEBUG, "LDAP: empty passwords are not permitted\n");
+ syslog(LOG_DEBUG, "LDAP: empty passwords are not permitted");
return(1);
}
- syslog(LOG_DEBUG, "LDAP: trying to bind as %s\n", user_dn);
+ syslog(LOG_DEBUG, "LDAP: trying to bind as %s", user_dn);
ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
- if (ldserver) {
+
+ i = ctdl_ldap_initialize(&ldserver);
+ if (i == LDAP_SUCCESS) {
ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
i = ldap_simple_bind_s(ldserver, user_dn, password);
if (i == LDAP_SUCCESS) {
- syslog(LOG_DEBUG, "LDAP: bind succeeded\n");
+ syslog(LOG_DEBUG, "LDAP: bind succeeded");
}
else {
- syslog(LOG_DEBUG, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i);
+ syslog(LOG_DEBUG, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
}
ldap_set_option(ldserver, LDAP_OPT_REFERRALS, (void *)LDAP_OPT_OFF);
ldap_unbind(ldserver);
return(1);
}
-
//return !0 iff property changed.
int vcard_set_props_iff_different(struct vCard *v,char *propname,int numvals, char **vals) {
int i;
if (!v) return(0);
ldserver = ldap_init(config.c_ldap_host, config.c_ldap_port);
if (ldserver == NULL) {
- syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s\n",
+ syslog(LOG_ALERT, "LDAP: Could not connect to %s:%d : %s",
config.c_ldap_host, config.c_ldap_port,
strerror(errno)
);
striplt(config.c_ldap_bind_dn);
striplt(config.c_ldap_bind_pw);
- syslog(LOG_DEBUG, "LDAP bind DN: %s\n", config.c_ldap_bind_dn);
+ syslog(LOG_DEBUG, "LDAP bind DN: %s", config.c_ldap_bind_dn);
i = ldap_simple_bind_s(ldserver,
(!IsEmptyStr(config.c_ldap_bind_dn) ? config.c_ldap_bind_dn : NULL),
(!IsEmptyStr(config.c_ldap_bind_pw) ? config.c_ldap_bind_pw : NULL)
);
if (i != LDAP_SUCCESS) {
- syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)\n", ldap_err2string(i), i);
+ syslog(LOG_ALERT, "LDAP: Cannot bind: %s (%d)", ldap_err2string(i), i);
return(0);
}
tv.tv_sec = 10;
tv.tv_usec = 0;
- syslog(LOG_DEBUG, "LDAP search: %s\n", ldap_dn);
+ syslog(LOG_DEBUG, "LDAP search: %s", ldap_dn);
(void) ldap_search_ext_s(
ldserver, /* ld */
ldap_dn, /* base */
*/
if (search_result == NULL) {
- syslog(LOG_DEBUG, "LDAP search: zero results were returned\n");
+ syslog(LOG_DEBUG, "LDAP search: zero results were returned");
ldap_unbind(ldserver);
return(0);
}
/* At this point we've got at least one result from our query. If there are multiple
* results, we still only look at the first one.
*/
+
entry = ldap_first_entry(ldserver, search_result);
if (entry) {
- syslog(LOG_DEBUG, "LDAP search, got user details for vcard.\n");
+ syslog(LOG_DEBUG, "LDAP search, got user details for vcard.");
givenName=ldap_get_values(ldserver, search_result, "givenName");
sn=ldap_get_values(ldserver, search_result, "sn");
cn=ldap_get_values(ldserver, search_result, "cn");
if (mobile) changed_something |= vcard_set_one_prop_iff_different(v,"tel;cell","%s",mobile[0]);
if (homePhone) changed_something |= vcard_set_one_prop_iff_different(v,"tel;home","%s",homePhone[0]);
if (givenName && sn) {
- if (initials)
- changed_something |= vcard_set_one_prop_iff_different(v,"n","%s;%s;%s",sn[0],givenName[0],initials[0]);
- else
- changed_something |= vcard_set_one_prop_iff_different(v,"n","%s;%s",sn[0],givenName[0]);
+ if (initials) {
+ changed_something |= vcard_set_one_prop_iff_different(v,"n","%s;%s;%s",sn[0],givenName[0],initials[0]);
+ }
+ else {
+ changed_something |= vcard_set_one_prop_iff_different(v,"n","%s;%s",sn[0],givenName[0]);
+ }
}
if (mail) {
changed_something |= vcard_set_props_iff_different(v,"email;internet",ldap_count_values(mail),mail);
projects / citadel.git / blobdiff