projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
modules
/
ctdlproto
/
serv_user.c
diff --git
a/citadel/modules/ctdlproto/serv_user.c
b/citadel/modules/ctdlproto/serv_user.c
index 5a7162977c717e91f5a2decbffa3d77d420c4670..51ea437b7241951c9c7fb7bffe77c8178ddbe421 100644
(file)
--- a/
citadel/modules/ctdlproto/serv_user.c
+++ b/
citadel/modules/ctdlproto/serv_user.c
@@
-1,7
+1,7
@@
/*
* Server functions which perform operations on user objects.
*
/*
* Server functions which perform operations on user objects.
*
- * Copyright (c) 1987-201
1
by the citadel.org team
+ * Copyright (c) 1987-201
5
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, version 3.
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License, version 3.
@@
-15,14
+15,12
@@
#include "support.h"
#include "control.h"
#include "ctdl_module.h"
#include "support.h"
#include "control.h"
#include "ctdl_module.h"
-
#include "citserver.h"
#include "citserver.h"
-
+#include "config.h"
#include "user_ops.h"
#include "internet_addressing.h"
#include "user_ops.h"
#include "internet_addressing.h"
-
/*
* USER cmd
*/
/*
* USER cmd
*/
@@
-47,7
+45,7
@@
void cmd_user(char *cmdbuf)
"Too many users are already online "
"(maximum is %d)\n",
ERROR + MAX_SESSIONS_EXCEEDED,
"Too many users are already online "
"(maximum is %d)\n",
ERROR + MAX_SESSIONS_EXCEEDED,
-
config.c_nodename, config.c_maxsessions
);
+
CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions")
);
return;
case login_ok:
cprintf("%d Password required for %s\n",
return;
case login_ok:
cprintf("%d Password required for %s\n",
@@
-99,13
+97,13
@@
void cmd_newu(char *cmdbuf)
long len;
char username[SIZ];
long len;
char username[SIZ];
- if (
config.c_auth_mode
!= AUTHMODE_NATIVE) {
+ if (
CtdlGetConfigInt("c_auth_mode")
!= AUTHMODE_NATIVE) {
cprintf("%d This system does not use native mode authentication.\n",
ERROR + NOT_HERE);
return;
}
cprintf("%d This system does not use native mode authentication.\n",
ERROR + NOT_HERE);
return;
}
- if (
config.c_disable_newu
) {
+ if (
CtdlGetConfigInt("c_disable_newu")
) {
cprintf("%d Self-service user account creation "
"is disabled on this system.\n", ERROR + NOT_HERE);
return;
cprintf("%d Self-service user account creation "
"is disabled on this system.\n", ERROR + NOT_HERE);
return;
@@
-118,7
+116,8
@@
void cmd_newu(char *cmdbuf)
if (CC->nologin) {
cprintf("%d %s: Too many users are already online (maximum is %d)\n",
ERROR + MAX_SESSIONS_EXCEEDED,
if (CC->nologin) {
cprintf("%d %s: Too many users are already online (maximum is %d)\n",
ERROR + MAX_SESSIONS_EXCEEDED,
- config.c_nodename, config.c_maxsessions);
+ CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions"));
+ return;
}
extract_token(username, cmdbuf, 0, '|', sizeof username);
strproc(username);
}
extract_token(username, cmdbuf, 0, '|', sizeof username);
strproc(username);
@@
-231,7
+230,7
@@
void cmd_creu(char *cmdbuf)
} else if (a == ERROR + ALREADY_EXISTS) {
cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, username);
return;
} else if (a == ERROR + ALREADY_EXISTS) {
cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, username);
return;
- } else if ( (
config.c_auth_mode
!= AUTHMODE_NATIVE) && (a == ERROR + NO_SUCH_USER) ) {
+ } else if ( (
CtdlGetConfigInt("c_auth_mode")
!= AUTHMODE_NATIVE) && (a == ERROR + NO_SUCH_USER) ) {
cprintf("%d User accounts are not created within Citadel in host authentication mode.\n",
ERROR + NO_SUCH_USER);
return;
cprintf("%d User accounts are not created within Citadel in host authentication mode.\n",
ERROR + NO_SUCH_USER);
return;
@@
-241,23
+240,19
@@
void cmd_creu(char *cmdbuf)
}
}
-
/*
* get user parameters
*/
void cmd_getu(char *cmdbuf)
{
/*
* get user parameters
*/
void cmd_getu(char *cmdbuf)
{
-
if (CtdlAccessCheck(ac_logged_in))
return;
CtdlGetUser(&CC->user, CC->curr_user);
if (CtdlAccessCheck(ac_logged_in))
return;
CtdlGetUser(&CC->user, CC->curr_user);
- cprintf("%d 80|24|%d|\n",
- CIT_OK,
- (CC->user.flags & US_USER_SET)
- );
+ cprintf("%d 80|24|%d|\n", CIT_OK, (CC->user.flags & US_USER_SET));
}
}
+
/*
* set user parameters
*/
/*
* set user parameters
*/
@@
-371,7
+366,7
@@
void cmd_invt_kick(char *iuser, int op) {
return;
}
return;
}
- if (!strncasecmp(CC->room.QRname,
config.c_baseroom
,
+ if (!strncasecmp(CC->room.QRname,
CtdlGetConfigStr("c_baseroom")
,
ROOMNAMELEN)) {
cprintf("%d Can't add/remove users from this room.\n",
ERROR + NOT_HERE);
ROOMNAMELEN)) {
cprintf("%d Can't add/remove users from this room.\n",
ERROR + NOT_HERE);
@@
-424,7
+419,7
@@
void cmd_gnur(char *argbuf)
return;
}
return;
}
- if ((C
itControl.MMflags
& MM_VALID) == 0) {
+ if ((C
tdlGetConfigInt("MMflags")
& MM_VALID) == 0) {
cprintf("%d There are no unvalidated users.\n", CIT_OK);
return;
}
cprintf("%d There are no unvalidated users.\n", CIT_OK);
return;
}
@@
-452,13
+447,12
@@
void cmd_gnur(char *argbuf)
*/
begin_critical_section(S_CONTROL);
*/
begin_critical_section(S_CONTROL);
- get_control();
- CitControl.MMflags = CitControl.MMflags & (~MM_VALID);
- put_control();
+ int flags;
+ flags = CtdlGetConfigInt("MMflags");
+ flags = flags & (~MM_VALID);
+ CtdlSetConfigInt("MMflags", flags);
end_critical_section(S_CONTROL);
cprintf("%d *** End of registration.\n", CIT_OK);
end_critical_section(S_CONTROL);
cprintf("%d *** End of registration.\n", CIT_OK);
-
-
}
}
@@
-534,9
+528,9
@@
void cmd_chek(char *argbuf)
regis = 1;
if (CC->user.axlevel >= AxAideU) {
regis = 1;
if (CC->user.axlevel >= AxAideU) {
- get_control();
- if (CitControl.MMflags & MM_VALID)
+ if (CtdlGetConfigInt("MMflags") & MM_VALID) {
vali = 1;
vali = 1;
+ }
}
/* check for mail */
}
/* check for mail */