* If we were talking to a network node, we're not anymore...
*/
if (!IsEmptyStr(CCC->net_node)) {
- network_talking_to(CCC->net_node, NTT_REMOVE);
+ network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
}
/* Run any hooks registered by modules... */
int CtdlTryPassword(const char *password, long len)
{
int code;
+ CitContext *CCC = CC;
- if ((CC->logged_in)) {
+ if ((CCC->logged_in)) {
syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n");
return pass_already_logged_in;
}
- if (!strcmp(CC->curr_user, NLI)) {
+ if (!strcmp(CCC->curr_user, NLI)) {
syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n");
return pass_no_user;
}
- if (CtdlGetUser(&CC->user, CC->curr_user)) {
+ if (CtdlGetUser(&CCC->user, CCC->curr_user)) {
syslog(LOG_ERR, "CtdlTryPassword: internal error\n");
return pass_internal_error;
}
}
code = (-1);
- if (CC->is_master) {
+ if (CCC->is_master) {
code = strcmp(password, config.c_master_pass);
}
/* host auth mode */
- if (validpw(CC->user.uid, password)) {
+ if (validpw(CCC->user.uid, password)) {
code = 0;
/*
* this is a security hazard, comment it out.
*/
- CtdlGetUserLock(&CC->user, CC->curr_user);
- safestrncpy(CC->user.password, password, sizeof CC->user.password);
- CtdlPutUserLock(&CC->user);
+ CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ safestrncpy(CCC->user.password, password, sizeof CCC->user.password);
+ CtdlPutUserLock(&CCC->user);
/*
* (sooper-seekrit hack ends here)
/* LDAP auth mode */
- if ((CC->ldap_dn) && (!CtdlTryPasswordLDAP(CC->ldap_dn, password))) {
+ if ((CCC->ldap_dn) && (!CtdlTryPasswordLDAP(CCC->ldap_dn, password))) {
code = 0;
}
else {
pw = (char*) malloc(len + 1);
memcpy(pw, password, len + 1);
strproc(pw);
- strproc(CC->user.password);
- code = strcasecmp(CC->user.password, pw);
+ strproc(CCC->user.password);
+ code = strcasecmp(CCC->user.password, pw);
strproc(pw);
- strproc(CC->user.password);
- code = strcasecmp(CC->user.password, pw);
+ strproc(CCC->user.password);
+ code = strcasecmp(CCC->user.password, pw);
free (pw);
}
do_login();
return pass_ok;
} else {
- syslog(LOG_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
+ syslog(LOG_WARNING, "Bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>\n",
+ CCC->curr_user,
+ CCC->ServiceName,
+ CCC->tcp_port,
+ CCC->cs_host,
+ CCC->cs_addr);
+
+
+//citserver[5610]: Bad password specified for <willi> Service <citadel-TCP> Remote <PotzBlitz / >
+
return pass_wrong_password;
}
}
iuser,
((op == 1) ? "invited to" : "kicked out of"),
CC->room.QRname,
- CC->user.fullname);
+ (CC->logged_in ? CC->user.fullname : "an administrator")
+ );
CtdlAideMessage(bbb,"User Admin Message");
return(0);
if (deleted) {
snprintf(notify, SIZ,
"User \"%s\" has been deleted by %s.\n",
- usbuf.fullname, CC->user.fullname);
+ usbuf.fullname,
+ (CC->logged_in ? CC->user.fullname : "an administrator")
+ );
CtdlAideMessage(notify, "User Deletion Message");
}
CtdlRegisterProtoHook(cmd_invt, "INVT", "Invite a user to a room");
CtdlRegisterProtoHook(cmd_kick, "KICK", "Kick a user out of a room");
CtdlRegisterProtoHook(cmd_forg, "FORG", "Forget a room");
- CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Get Next Unregistered User");
CtdlRegisterProtoHook(cmd_vali, "VALI", "Validate new users");
CtdlRegisterProtoHook(cmd_list, "LIST", "List users");
- CtdlRegisterProtoHook(cmd_chek, "CHEK", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_qusr, "QUSR", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_agup, "AGUP", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_asup, "ASUP", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_seen, "SEEN", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_view, "VIEW", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_renu, "RENU", "Autoconverted. TODO: document me.");
- CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_chek, "CHEK", "assorted info we need to check at login");
+ CtdlRegisterProtoHook(cmd_qusr, "QUSR", "check to see if a user exists");
+ CtdlRegisterProtoHook(cmd_agup, "AGUP", "Administratively Get User Parameters");
+ CtdlRegisterProtoHook(cmd_asup, "ASUP", "Administratively Set User Parameters");
+ CtdlRegisterProtoHook(cmd_seen, "SEEN", "Manipulate seen/unread message flags");
+ CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Fetch seen/unread message flags");
+ CtdlRegisterProtoHook(cmd_view, "VIEW", "Set preferred view for user/room combination");
+ CtdlRegisterProtoHook(cmd_renu, "RENU", "Rename a user");
+ CtdlRegisterProtoHook(cmd_newu, "NEWU", "Log in as a new user");
}
/* return our Subversion id for the Log */
return "user_ops";