X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/82b7b0d87aecb7c20713c9cbd3bcc327a94f3ae0..348683aa59f63ac110c129f808c91fc3156ee14f:/src/nickserv.c diff --git a/src/nickserv.c b/src/nickserv.c index 8e37b34..1b9ad5a 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -5,7 +5,7 @@ * * x3 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -111,12 +111,12 @@ #define KEY_NOTE_NOTE "note" #define KEY_NOTE_SETTER "setter" #define KEY_NOTE_DATE "date" +#define KEY_FORCE_HANDLES_LOWERCASE "force_handles_lowercase" #define KEY_LDAP_ENABLE "ldap_enable" #ifdef WITH_LDAP -#define KEY_LDAP_HOST "ldap_host" -#define KEY_LDAP_PORT "ldap_port" +#define KEY_LDAP_URI "ldap_uri" #define KEY_LDAP_BASE "ldap_base" #define KEY_LDAP_DN_FMT "ldap_dn_fmt" #define KEY_LDAP_VERSION "ldap_version" @@ -129,6 +129,7 @@ #define KEY_LDAP_OBJECT_CLASSES "ldap_object_classes" #define KEY_LDAP_OPER_GROUP_DN "ldap_oper_group_dn" #define KEY_LDAP_FIELD_GROUP_MEMBER "ldap_field_group_member" +#define KEY_LDAP_TIMEOUT "ldap_timeout" #endif #define NICKSERV_VALID_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" @@ -163,6 +164,7 @@ static dict_t nickserv_email_dict; /* contains struct handle_info_list*, indexed static char handle_inverse_flags[256]; static unsigned int flag_access_levels[32]; static const struct message_entry msgtab[] = { + { "NSMSG_NO_ANGLEBRACKETS", "The < and > in help indicate that that word is a required parameter, but DO NOT actually type them in messages to me." }, { "NSMSG_HANDLE_EXISTS", "Account $b%s$b is already registered." }, { "NSMSG_HANDLE_TOLONG", "The account name %s is too long. Account names must be %lu characters or less."}, { "NSMSG_PASSWORD_SHORT", "Your password must be at least %lu characters long." }, @@ -170,7 +172,9 @@ static const struct message_entry msgtab[] = { { "NSMSG_PASSWORD_DICTIONARY", "Your password is too simple. You must choose a password that is not just a word or name." }, { "NSMSG_PASSWORD_READABLE", "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)." }, { "NSMSG_LDAP_FAIL", "There was a problem in contacting the account server (ldap): %s. Please try again later." }, - { "NSMSG_LDAP_FAIL_EMAIL", "There was a problem in storing your email address in the account server (ldap): %s. Please try again later." }, + { "NSMSG_LDAP_FAIL_ADD", "There was a problem in adding account %s to ldap: %s." }, + { "NSMSG_LDAP_FAIL_SEND_EMAIL", "There was a problem in storing your email address in the account server (ldap): %s. Please try again later." }, + { "NSMSG_LDAP_FAIL_GET_EMAIL", "There was a problem in retrieving your email address from the account server (ldap): %s. Please try again later." }, { "NSMSG_PARTIAL_REGISTER", "Account has been registered to you; nick was already registered to someone else." }, { "NSMSG_OREGISTER_VICTIM", "%s has registered a new account for you (named %s)." }, { "NSMSG_OREGISTER_H_SUCCESS", "Account has been registered." }, @@ -298,7 +302,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_DB_UNREADABLE", "Unable to read database file %s; check the log for more information." }, { "NSMSG_DB_MERGED", "$N merged DB from %s (in "FMT_TIME_T".%03lu seconds)." }, { "NSMSG_HANDLE_CHANGED", "$b%s$b's account name has been changed to $b%s$b." }, - { "NSMSG_BAD_HANDLE", "Account $b%s$b not registered because it is in use by a network service, is too long, or contains invalid characters." }, + { "NSMSG_BAD_HANDLE", "Account $b%s$b is not allowed because it is reserved, is too long, or contains invalid characters." }, { "NSMSG_BAD_NICK", "Nickname $b%s$b not registered because it is in use by a network service, is too long, or contains invalid characters." }, { "NSMSG_BAD_EMAIL_ADDR", "Please use a well-formed email address." }, { "NSMSG_FAIL_RENAME", "Account $b%s$b not renamed to $b%s$b because it is in use by a network services, or contains invalid characters." }, @@ -434,7 +438,7 @@ register_handle(const char *handle, const char *passwd, UNUSED_ARG(unsigned long struct handle_info *hi; hi = calloc(1, sizeof(*hi)); - hi->userlist_style = HI_DEFAULT_STYLE; + hi->userlist_style = nickserv_conf.default_style ? nickserv_conf.default_style : HI_DEFAULT_STYLE; hi->announcements = '?'; hi->handle = strdup(handle); safestrncpy(hi->passwd, passwd, sizeof(hi->passwd)); @@ -545,14 +549,16 @@ nickserv_unregister_handle(struct handle_info *hi, struct userNode *notify, stru struct userNode *uNode; #ifdef WITH_LDAP - int rc; if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { - if( (rc = ldap_delete_account(hi->handle)) != LDAP_SUCCESS) { - if(notify) { - send_message(notify, bot, "NSMSG_LDAP_FAIL", ldap_err2string(rc)); - } - if(rc != LDAP_NO_SUCH_OBJECT) - return false; /* if theres noone there to delete, its kinda ok, right ?:) */ + int rc; + if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { + if( (rc = ldap_delete_account(hi->handle)) != LDAP_SUCCESS) { + if(notify) { + send_message(notify, bot, "NSMSG_LDAP_FAIL", ldap_err2string(rc)); + } + if(rc != LDAP_NO_SUCH_OBJECT) + return false; /* if theres noone there to delete, its kinda ok, right ?:) */ + } } } #endif @@ -669,8 +675,16 @@ is_valid_handle(const char *handle) static int is_registerable_nick(const char *nick) { - /* make sure it could be used as an account name */ - if (!is_valid_handle(nick)) + struct userNode *user; + /* cant register a juped nick/service nick as nick, to prevent confusion */ + user = GetUserH(nick); + if (user && IsLocal(user)) + return 0; + /* for consistency, only allow nicks names that could be nicks */ + if (!is_valid_nick(nick)) + return 0; + /* disallow nicks that look like bad words */ + if (opserv_bad_channel(nick)) return 0; /* check length */ if (strlen(nick) > NICKLEN) @@ -1043,28 +1057,33 @@ nickserv_register(struct userNode *user, struct userNode *settee, const char *ha char crypted[MD5_CRYPT_LENGTH]; if ((hi = dict_find(nickserv_handle_dict, handle, NULL))) { - send_message(user, nickserv, "NSMSG_HANDLE_EXISTS", handle); + if(user) + send_message(user, nickserv, "NSMSG_HANDLE_EXISTS", handle); return 0; } if(strlen(handle) > 15) { - send_message(user, nickserv, "NSMSG_HANDLE_TOLONG", handle, 15); + if(user) + send_message(user, nickserv, "NSMSG_HANDLE_TOLONG", handle, 15); return 0; } if (!is_secure_password(handle, passwd, user)) return 0; + cryptpass(passwd, crypted); #ifdef WITH_LDAP - int rc; - rc = ldap_do_add(handle, passwd, NULL); - if(LDAP_SUCCESS != rc && LDAP_ALREADY_EXISTS != rc ) { - send_message(user, nickserv, "NSMSG_LDAP_FAIL", ldap_err2string(rc)); - return 0; + if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { + int rc; + rc = ldap_do_add(handle, crypted, NULL); + if(LDAP_SUCCESS != rc && LDAP_ALREADY_EXISTS != rc ) { + if(user) + send_message(user, nickserv, "NSMSG_LDAP_FAIL", ldap_err2string(rc)); + return 0; + } } #endif - cryptpass(passwd, crypted); hi = register_handle(handle, crypted, 0); hi->masks = alloc_string_list(1); hi->ignores = alloc_string_list(1); @@ -1076,18 +1095,31 @@ nickserv_register(struct userNode *user, struct userNode *settee, const char *ha if (settee && !no_auth) set_user_handle_info(settee, hi, 1); - if (user != settee) + if (user != settee) { + if(user) send_message(user, nickserv, "NSMSG_OREGISTER_H_SUCCESS"); - else if (nickserv_conf.disable_nicks) + } + else if (nickserv_conf.disable_nicks) { + if(user) { send_message(user, nickserv, "NSMSG_REGISTER_H_SUCCESS"); - else if ((ni = dict_find(nickserv_nick_dict, user->nick, NULL))) + } + } + else if ((ni = dict_find(nickserv_nick_dict, user->nick, NULL))) { + if(user) { send_message(user, nickserv, "NSMSG_PARTIAL_REGISTER"); + } + } else { - register_nick(user->nick, hi); - send_message(user, nickserv, "NSMSG_REGISTER_HN_SUCCESS"); + if(user) { + register_nick(user->nick, hi); + send_message(user, nickserv, "NSMSG_REGISTER_HN_SUCCESS"); + } } - if (settee && (user != settee)) + if (settee && (user != settee)) { + if(user) { send_message(settee, nickserv, "NSMSG_OREGISTER_VICTIM", user->nick, hi->handle); + } + } return hi; } @@ -1293,7 +1325,8 @@ static NICKSERV_FUNC(cmd_register) NICKSERV_MIN_PARMS((unsigned)3 + nickserv_conf.email_required); - irc_strtolower(argv[1]); + if(nickserv_conf.force_handles_lowercase) + irc_strtolower(argv[1]); if (!is_valid_handle(argv[1])) { reply("NSMSG_BAD_HANDLE", argv[1]); return 0; @@ -1424,7 +1457,8 @@ static NICKSERV_FUNC(cmd_oregister) account = argv[1]; pass = argv[2]; - irc_strtolower(account); + if(nickserv_conf.force_handles_lowercase) + irc_strtolower(account); if (nickserv_conf.email_required) { NICKSERV_MIN_PARMS(4); email = argv[3]; @@ -1828,7 +1862,8 @@ static NICKSERV_FUNC(cmd_rename_handle) unsigned int nn; NICKSERV_MIN_PARMS(3); - irc_strtolower(argv[2]); + if(nickserv_conf.force_handles_lowercase) + irc_strtolower(argv[2]); if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; if (!is_valid_handle(argv[2])) { @@ -1845,8 +1880,8 @@ static NICKSERV_FUNC(cmd_rename_handle) return 0; } #ifdef WITH_LDAP - int rc; if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { + int rc; if( (rc = ldap_rename_account(hi->handle, argv[2])) != LDAP_SUCCESS) { reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); return 0; @@ -1907,7 +1942,9 @@ struct handle_info *loc_auth(char *handle, char *password) struct handle_info *hi; struct userNode *other; #ifdef WITH_LDAP - int ldap_result; + int ldap_result = LDAP_SUCCESS; + char *email = NULL; + #endif hi = dict_find(nickserv_handle_dict, handle, NULL); @@ -1916,29 +1953,23 @@ struct handle_info *loc_auth(char *handle, char *password) #ifdef WITH_LDAP if(nickserv_conf.ldap_enable) { ldap_result = ldap_check_auth(handle, password); - if(ldap_result == LDAP_SUCCESS) { - /* pull the users info from ldap: - * * email - * * name if available - * * - */ - } - else if(ldap_result != LDAP_INVALID_CREDENTIALS) { + if(ldap_result != LDAP_SUCCESS) { return NULL; } } - else +// else #else if (!checkpass(password, hi->passwd)) { return NULL; } #endif #ifdef WITH_LDAP - if(!hi && nickserv_conf.ldap_enable && ldap_result == LDAP_SUCCESS && nickserv_conf.ldap_autocreate) { + if( (!hi) && nickserv_conf.ldap_enable && ldap_result == LDAP_SUCCESS && nickserv_conf.ldap_autocreate) { /* user not found, but authed to ldap successfully.. * create the account. */ char *mask; + int rc; /* Add a *@* mask */ if(nickserv_conf.default_hostmask) @@ -1950,6 +1981,16 @@ struct handle_info *loc_auth(char *handle, char *password) return 0; /* couldn't add the user for some reason */ } + if((rc = ldap_get_user_info(handle, &email) != LDAP_SUCCESS)) + { + if(nickserv_conf.email_required) { + return 0; + } + } + if(email) { + nickserv_set_email_addr(hi, email); + free(email); + } if(mask) { char* mask_canonicalized = canonicalize_hostmask(strdup(mask)); string_list_append(hi->masks, mask_canonicalized); @@ -1989,6 +2030,7 @@ struct handle_info *loc_auth(char *handle, char *password) return NULL; } } + /* TODO - Add LOGGING to this function so LOC's are logged.. */ return hi; } @@ -2016,6 +2058,15 @@ static NICKSERV_FUNC(cmd_auth) } if (argc == 3) { #ifdef WITH_LDAP + if(strchr(argv[1], '<') || strchr(argv[1], '>')) { + reply("NSMSG_NO_ANGLEBRACKETS"); + return 0; + } + if (!is_valid_handle(argv[1])) { + reply("NSMSG_BAD_HANDLE", argv[1]); + return 0; + } + if(nickserv_conf.ldap_enable) { ldap_result = ldap_check_auth(argv[1], argv[2]); /* Get the users email address and update it */ @@ -2023,8 +2074,10 @@ static NICKSERV_FUNC(cmd_auth) int rc; if((rc = ldap_get_user_info(argv[1], &email) != LDAP_SUCCESS)) { - reply("NSMSG_LDAP_FAIL_EMAIL", ldap_err2string(rc)); - return 0; + if(nickserv_conf.email_required) { + reply("NSMSG_LDAP_FAIL_GET_EMAIL", ldap_err2string(rc)); + return 0; + } } } else if(ldap_result != LDAP_INVALID_CREDENTIALS) { @@ -2036,6 +2089,7 @@ static NICKSERV_FUNC(cmd_auth) #endif hi = dict_find(nickserv_handle_dict, argv[1], NULL); pw_arg = 2; +#ifdef notdef } else if (argc == 2) { if (nickserv_conf.disable_nicks) { if (!(hi = get_handle_info(user->nick))) { @@ -2054,6 +2108,7 @@ static NICKSERV_FUNC(cmd_auth) hi = ni->owner; } pw_arg = 1; +#endif } else { reply("MSG_MISSING_PARAMS", argv[0]); svccmd_send_help_brief(user, nickserv, cmd); @@ -2111,7 +2166,7 @@ static NICKSERV_FUNC(cmd_auth) } #ifdef WITH_LDAP if( ( nickserv_conf.ldap_enable && ldap_result == LDAP_INVALID_CREDENTIALS ) || - ( !nickserv_conf.ldap_enable && !checkpass(passwd, hi->passwd) ) ) { + ( (!nickserv_conf.ldap_enable) && (!checkpass(passwd, hi->passwd)) ) ) { #else if (!checkpass(passwd, hi->passwd)) { #endif @@ -2351,7 +2406,7 @@ static NICKSERV_FUNC(cmd_odelcookie) if((rc = ldap_do_modify(hi->handle, NULL, hi->cookie->data)) != LDAP_SUCCESS) { /* Falied to update email in ldap, but still * updated it here.. what should we do? */ - reply("NSMSG_LDAP_FAIL_EMAIL", ldap_err2string(rc)); + reply("NSMSG_LDAP_FAIL_SEND_EMAIL", ldap_err2string(rc)); } else { nickserv_set_email_addr(hi, hi->cookie->data); } @@ -2455,6 +2510,17 @@ static NICKSERV_FUNC(cmd_cookie) switch (hi->cookie->type) { case ACTIVATION: +#ifdef WITH_LDAP + if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { + int rc; + if((rc = ldap_do_modify(hi->handle, hi->cookie->data, NULL)) != LDAP_SUCCESS) { + /* Falied to update email in ldap, but still + * updated it here.. what should we do? */ + reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); + return 0; + } + } +#endif safestrncpy(hi->passwd, hi->cookie->data, sizeof(hi->passwd)); set_user_handle_info(user, hi, 1); reply("NSMSG_HANDLE_ACTIVATED"); @@ -2462,6 +2528,17 @@ static NICKSERV_FUNC(cmd_cookie) SyncLog("ACCOUNTACC %s", hi->handle); break; case PASSWORD_CHANGE: +#ifdef WITH_LDAP + if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { + int rc; + if((rc = ldap_do_modify(hi->handle, hi->cookie->data, NULL)) != LDAP_SUCCESS) { + /* Falied to update email in ldap, but still + * updated it here.. what should we do? */ + reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); + return 0; + } + } +#endif set_user_handle_info(user, hi, 1); safestrncpy(hi->passwd, hi->cookie->data, sizeof(hi->passwd)); reply("NSMSG_PASSWORD_CHANGED"); @@ -2475,7 +2552,7 @@ static NICKSERV_FUNC(cmd_cookie) if((rc = ldap_do_modify(hi->handle, NULL, hi->cookie->data)) != LDAP_SUCCESS) { /* Falied to update email in ldap, but still * updated it here.. what should we do? */ - reply("NSMSG_LDAP_FAIL_EMAIL", ldap_err2string(rc)); + reply("NSMSG_LDAP_FAIL_SEND_EMAIL", ldap_err2string(rc)); return 0; } } @@ -2562,6 +2639,7 @@ static NICKSERV_FUNC(cmd_pass) { struct handle_info *hi; char *old_pass, *new_pass; + char crypted[MD5_CRYPT_LENGTH+1]; #ifdef WITH_LDAP int ldap_result; #endif @@ -2590,16 +2668,18 @@ static NICKSERV_FUNC(cmd_pass) reply("NSMSG_PASSWORD_INVALID"); return 0; } + cryptpass(new_pass, crypted); #ifdef WITH_LDAP if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { int rc; - if((rc = ldap_do_modify(hi->handle, new_pass, NULL)) != LDAP_SUCCESS) { + if((rc = ldap_do_modify(hi->handle, crypted, NULL)) != LDAP_SUCCESS) { reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); return 0; } } #endif - cryptpass(new_pass, hi->passwd); + //cryptpass(new_pass, hi->passwd); + strcpy(hi->passwd, crypted); if (nickserv_conf.sync_log) SyncLog("PASSCHANGE %s %s", hi->handle, hi->passwd); argv[1] = "****"; @@ -2980,23 +3060,26 @@ static OPTION_FUNC(opt_announcements) static OPTION_FUNC(opt_password) { + char crypted[MD5_CRYPT_LENGTH+1]; + if(argc < 1) { + return 0; + } if (!override) { reply("NSMSG_USE_CMD_PASS"); return 0; } + cryptpass(argv[1], crypted); #ifdef WITH_LDAP if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { int rc; - if((rc = ldap_do_modify(hi->handle, argv[1], NULL)) != LDAP_SUCCESS) { + if((rc = ldap_do_modify(hi->handle, crypted, NULL)) != LDAP_SUCCESS) { reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); return 0; } } #endif - if (argc > 1) - cryptpass(argv[1], hi->passwd); - + strcpy(hi->passwd, crypted); if (nickserv_conf.sync_log) SyncLog("PASSCHANGE %s %s", hi->handle, hi->passwd); @@ -3048,7 +3131,7 @@ static OPTION_FUNC(opt_email) #ifdef WITH_LDAP if(nickserv_conf.ldap_enable && nickserv_conf.ldap_admin_dn) { int rc; - if((rc = ldap_do_modify(hi->handle, argv[1], NULL)) != LDAP_SUCCESS) { + if((rc = ldap_do_modify(hi->handle, NULL, argv[1])) != LDAP_SUCCESS) { reply("NSMSG_LDAP_FAIL", ldap_err2string(rc)); return 0; } @@ -3138,7 +3221,7 @@ oper_try_set_access(struct userNode *user, struct userNode *bot, struct handle_i rc = ldap_add2group(target->handle, nickserv_conf.ldap_oper_group_dn); else rc = ldap_delfromgroup(target->handle, nickserv_conf.ldap_oper_group_dn); - if(rc != LDAP_SUCCESS) { + if(rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS && rc != LDAP_NO_SUCH_ATTRIBUTE) { send_message(user, bot, "NSMSG_LDAP_FAIL", ldap_err2string(rc)); return 0; } @@ -3821,6 +3904,9 @@ struct nickserv_discrim { const char *hostmask; const char *handlemask; const char *emailmask; +#ifdef WITH_LDAP + unsigned int inldap; +#endif }; typedef void (*discrim_search_func)(struct userNode *source, struct handle_info *hi); @@ -3846,6 +3932,9 @@ nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int discrim->min_registered = 0; discrim->max_registered = INT_MAX; discrim->lastseen = now; +#ifdef WITH_LDAP + discrim->inldap = 2; +#endif for (i=0; ihostmask_type = SUPERSET; } discrim->hostmask = argv[++i]; - } else if (!irccasecmp(argv[i], "handlemask") || !irccasecmp(argv[i], "accountmask")) { + } else if (!irccasecmp(argv[i], "handlemask") || !irccasecmp(argv[i], "accountmask") || !irccasecmp(argv[i], "account")) { if (!irccasecmp(argv[++i], "*")) { discrim->handlemask = 0; } else { @@ -3945,7 +4034,20 @@ nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int } else { reply("MSG_INVALID_CRITERIA", cmp); } - } else { +#ifdef WITH_LDAP + } else if (nickserv_conf.ldap_enable && !irccasecmp(argv[i], "inldap")) { + i++; + if(true_string(argv[i])) { + discrim->inldap = 1; + } + else if (false_string(argv[i])) { + discrim->inldap = 0; + } + else { + reply("MSG_INVALID_BINARY", argv[i]); + } +#endif + } else { reply("MSG_INVALID_CRITERIA", argv[i]); goto fail; } @@ -3993,6 +4095,17 @@ nickserv_discrim_match(struct nickserv_discrim *discrim, struct handle_info *hi) } if (!nick) return 0; } +#ifdef WITH_LDAP + if(nickserv_conf.ldap_enable && discrim->inldap != 2) { + int rc; + rc = ldap_get_user_info(hi->handle, NULL); + if(discrim->inldap == 1 && rc != LDAP_SUCCESS) + return 0; + if(discrim->inldap == 0 && rc == LDAP_SUCCESS) + return 0; + } + +#endif return 1; } @@ -4032,6 +4145,20 @@ search_unregister_func (struct userNode *source, struct handle_info *match) nickserv_unregister_handle(match, source, nickserv); // XXX nickserv hard coded } +static void +search_add2ldap_func (struct userNode *source, struct handle_info *match) +{ +#ifdef WITH_LDAP + int rc; + if(match->email_addr && match->passwd && match->handle) { + rc = ldap_do_add(match->handle, match->passwd, match->email_addr); + if(rc != LDAP_SUCCESS) { + send_message(source, nickserv, "NSMSG_LDAP_FAIL_ADD", match->handle, ldap_err2string(rc)); + } + } +#endif +} + static int nickserv_sort_accounts_by_access(const void *a, const void *b) { @@ -4096,6 +4223,10 @@ static NICKSERV_FUNC(cmd_search) action = search_count_func; else if (!irccasecmp(argv[1], "unregister")) action = search_unregister_func; +#ifdef WITH_LDAP + else if (nickserv_conf.ldap_enable && !irccasecmp(argv[1], "add2ldap")) + action = search_add2ldap_func; +#endif else { reply("NSMSG_INVALID_ACTION", argv[1]); return 0; @@ -4172,7 +4303,8 @@ nickserv_db_read_handle(char *handle, dict_t obj) authed_users = NULL; channels = NULL; } - irc_strtolower(handle); + if(nickserv_conf.force_handles_lowercase) + irc_strtolower(handle); hi = register_handle(handle, str, id); if (authed_users) { hi->users = authed_users; @@ -4571,6 +4703,10 @@ nickserv_conf_read(void) str = database_get_data(conf_node, KEY_LDAP_ENABLE, RECDB_QSTRING); nickserv_conf.ldap_enable = str ? strtoul(str, NULL, 0) : 0; + + str = database_get_data(conf_node, KEY_FORCE_HANDLES_LOWERCASE, RECDB_QSTRING); + nickserv_conf.force_handles_lowercase = str ? strtol(str, NULL, 0) : 0; + #ifndef WITH_LDAP if(nickserv_conf.ldap_enable > 0) { /* ldap is enabled but not compiled in - error out */ @@ -4581,12 +4717,9 @@ nickserv_conf_read(void) #endif #ifdef WITH_LDAP - str = database_get_data(conf_node, KEY_LDAP_HOST, RECDB_QSTRING); - nickserv_conf.ldap_host = str ? str : ""; + str = database_get_data(conf_node, KEY_LDAP_URI, RECDB_QSTRING); + nickserv_conf.ldap_uri = str ? str : ""; - str = database_get_data(conf_node, KEY_LDAP_PORT, RECDB_QSTRING); - nickserv_conf.ldap_port = str ? strtoul(str, NULL, 0) : LDAP_PORT; - str = database_get_data(conf_node, KEY_LDAP_BASE, RECDB_QSTRING); nickserv_conf.ldap_base = str ? str : ""; @@ -4599,6 +4732,9 @@ nickserv_conf_read(void) str = database_get_data(conf_node, KEY_LDAP_AUTOCREATE, RECDB_QSTRING); nickserv_conf.ldap_autocreate = str ? strtoul(str, NULL, 0) : 0; + str = database_get_data(conf_node, KEY_LDAP_TIMEOUT, RECDB_QSTRING); + nickserv_conf.ldap_timeout = str ? strtoul(str, NULL, 0) : 5; + str = database_get_data(conf_node, KEY_LDAP_ADMIN_DN, RECDB_QSTRING); nickserv_conf.ldap_admin_dn = str ? str : "";