* Copyright (c) 1987-2011 by the citadel.org team
*
* This program is open source 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 3 of the License, or
- * (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
/*
- * Is the user currently logged in an Aide?
+ * Is the user currently logged in an Admin?
*/
int is_aide(void)
{
/*
- * Is the user currently logged in an Aide *or* the room aide for this room?
+ * Is the user currently logged in an Admin *or* the room Admin for this room?
*/
int is_room_aide(void)
{
abort_upl(CCC);
}
- /*
- * If we were talking to a network node, we're not anymore...
- */
- if (!IsEmptyStr(CCC->net_node)) {
- network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
- }
-
/* Run any hooks registered by modules... */
PerformSessionHooks(EVT_LOGOUT);
CONM_syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n");
return pass_wrong_password;
}
- code = (-1);
if (CCC->is_master) {
code = strcmp(password, config.c_master_pass);
strproc(pw);
strproc(CCC->user.password);
code = strcasecmp(CCC->user.password, pw);
- strproc(pw);
- strproc(CCC->user.password);
- code = strcasecmp(CCC->user.password, pw);
+ if (code != 0) {
+ strproc(pw);
+ strproc(CCC->user.password);
+ code = strcasecmp(CCC->user.password, pw);
+ }
free (pw);
}
void cmd_invt_kick(char *iuser, int op) {
/*
- * These commands are only allowed by aides, room aides,
+ * These commands are only allowed by admins, room admins,
* and room namespace owners
*/
if (is_room_aide()) {
int CtdlForgetThisRoom(void) {
visit vbuf;
- /* On some systems, Aides are not allowed to forget rooms */
+ /* On some systems, Admins are not allowed to forget rooms */
if (is_aide() && (config.c_aide_zap == 0)
&& ((CC->room.QRflags & QR_MAILBOX) == 0) ) {
return(1);