* 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.
+ * 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"
#include <sys/select.h>
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "ctdl_module.h"
#include "threads.h"
#include "user_ops.h"
time_t last_purge = 0; /* Last dead session purge */
int num_sessions = 0; /* Current number of sessions */
+int next_pid = 0;
/* Flag for single user mode */
static int want_single_user = 0;
*/
int CtdlTerminateOtherSession (int session_num)
{
+ struct CitContext *CCC = CC;
int ret = 0;
CitContext *ccptr;
+ int aide;
- if (session_num == CC->cs_pid) {
- return TERM_NOTALLOWED;
- }
+ if (session_num == CCC->cs_pid) return TERM_NOTALLOWED;
+
+ aide = ( (CCC->user.axlevel >= AxAideU) || (CCC->internal_pgm) ) ;
CONM_syslog(LOG_DEBUG, "Locating session to kill\n");
begin_critical_section(S_SESSION_TABLE);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
if (session_num == ccptr->cs_pid) {
ret |= TERM_FOUND;
- if ((ccptr->user.usernum == CC->user.usernum)
- || (CC->user.axlevel >= AxAideU)) {
+ if ((ccptr->user.usernum == CCC->user.usernum) || aide) {
ret |= TERM_ALLOWED;
- ccptr->kill_me = KILLME_ADMIN_TERMINATE;
}
+ break;
}
}
- end_critical_section(S_SESSION_TABLE);
+
+ if (((ret & TERM_FOUND) != 0) && ((ret & TERM_ALLOWED) != 0))
+ {
+ if (ccptr->IO != NULL) {
+ AsyncIO *IO = ccptr->IO;
+ end_critical_section(S_SESSION_TABLE);
+ KillAsyncIOContext(IO);
+ }
+ else
+ {
+ if (ccptr->user.usernum == CCC->user.usernum)
+ ccptr->kill_me = KILLME_ADMIN_TERMINATE;
+ else
+ ccptr->kill_me = KILLME_IDLE;
+ end_critical_section(S_SESSION_TABLE);
+ }
+ }
+ else
+ end_critical_section(S_SESSION_TABLE);
+
return ret;
}
*/
CitContext *CreateNewContext(void) {
CitContext *me;
- static int next_pid = 0;
me = (CitContext *) malloc(sizeof(CitContext));
if (me == NULL) {
*/
CitContext *CloneContext(CitContext *CloneMe) {
CitContext *me;
- static int next_pid = 0;
me = (CitContext *) malloc(sizeof(CitContext));
if (me == NULL) {
me->openid_data = NULL;
me->ldap_dn = NULL;
me->session_specific_data = NULL;
+
+ me->CIT_ICAL = NULL;
+ me->cached_msglist = NULL;
me->download_fp = NULL;
me->upload_fp = NULL;
me->client_socket = 0;