/*
* Main source module for the Citadel server
*
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2011 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
+ * 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.
*
* 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
int ScheduledShutdown = 0;
time_t server_startup_time;
int panic_fd;
+int openid_level_supported = 0;
/*
* print the actual stack frame.
strings = backtrace_symbols(stack_frames, size);
for (i = 0; i < size; i++) {
if (strings != NULL)
- CtdlLogPrintf(1, "%s\n", strings[i]);
+ syslog(LOG_ALERT, "%s\n", strings[i]);
else
- CtdlLogPrintf(1, "%p\n", stack_frames[i]);
+ syslog(LOG_ALERT, "%p\n", stack_frames[i]);
}
free(strings);
#endif
}
+void cit_oneline_backtrace(void)
+{
+#ifdef HAVE_BACKTRACE
+ void *stack_frames[50];
+ size_t size, i;
+ char **strings;
+ StrBuf *Buf;
+
+ size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
+ strings = backtrace_symbols(stack_frames, size);
+ if (size > 0)
+ {
+ Buf = NewStrBuf();
+ for (i = 1; i < size; i++) {
+ if (strings != NULL)
+ StrBufAppendPrintf(Buf, "%s : ", strings[i]);
+ else
+ StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]);
+ }
+ free(strings);
+ syslog(LOG_ALERT, "%s\n", ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ }
+#endif
+}
+
/*
* print the actual stack frame.
*/
strings = backtrace_symbols(stack_frames, size);
for (i = 0; i < size; i++) {
if (strings != NULL)
- CtdlLogPrintf(1, "%s\n", strings[i]);
+ syslog(LOG_ALERT, "%s\n", strings[i]);
else
- CtdlLogPrintf(1, "%p\n", stack_frames[i]);
+ syslog(LOG_ALERT, "%p\n", stack_frames[i]);
}
free(strings);
#endif
struct ctdlroom qrbuf;
int rv;
- CtdlLogPrintf(CTDL_DEBUG, "master_startup() started\n");
+ syslog(LOG_DEBUG, "master_startup() started\n");
time(&server_startup_time);
- CtdlLogPrintf(CTDL_INFO, "Opening databases\n");
+ syslog(LOG_INFO, "Opening databases\n");
open_databases();
ctdl_thread_internal_init_tsd();
check_ref_counts();
- CtdlLogPrintf(CTDL_INFO, "Creating base rooms (if necessary)\n");
+ syslog(LOG_INFO, "Creating base rooms (if necessary)\n");
CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS);
CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS);
CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS);
CtdlPutRoomLock(&qrbuf);
}
- CtdlLogPrintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n");
+ syslog(LOG_INFO, "Seeding the pseudo-random number generator...\n");
urandom = fopen("/dev/urandom", "r");
if (urandom != NULL) {
rv = fread(&seed, sizeof seed, 1, urandom);
srand(seed);
srandom(seed);
- CtdlLogPrintf(CTDL_INFO, "Initializing ipgm secret\n");
+ syslog(LOG_INFO, "Initializing ipgm secret\n");
get_config();
config.c_ipgm_secret = rand();
put_config();
- CtdlLogPrintf(CTDL_DEBUG, "master_startup() finished\n");
+ syslog(LOG_DEBUG, "master_startup() finished\n");
}
sysdep_master_cleanup();
/* Close databases */
- CtdlLogPrintf(CTDL_INFO, "Closing databases\n");
+ syslog(LOG_INFO, "Closing databases\n");
close_databases();
#ifdef DEBUG_MEMORY_LEAKS
/* If the operator requested a halt but not an exit, halt here. */
if (shutdown_and_halt) {
- CtdlLogPrintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n");
+ syslog(LOG_NOTICE, "citserver: Halting server without exiting.\n");
fflush(stdout); fflush(stderr);
while(1) {
sleep(32767);
release_control();
/* Now go away. */
- CtdlLogPrintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode);
+ syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode);
fflush(stdout); fflush(stderr);
if (restart_server != 0)
cprintf("%s\n", config.c_moreprompt);
cprintf("1\n"); /* 1 = yes, this system supports floors */
cprintf("1\n"); /* 1 = we support the extended paging options */
- cprintf("%s\n", CC->cs_nonce);
+ cprintf("\n"); /* nonce no longer supported */
cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */
#ifdef HAVE_LDAP
cprintf("%s\n", svn_revision());
if (config.c_auth_mode == AUTHMODE_NATIVE) {
- cprintf("1\n"); /* OpenID is enabled when using native auth */
+ cprintf("%d\n", openid_level_supported); /* OpenID is enabled when using native auth */
}
else {
cprintf("0\n"); /* OpenID is disabled when using non-native auth */
*/
if (stat(public_clients_file, &statbuf) != 0) {
/* No public_clients file exists, so bail out */
- CtdlLogPrintf(CTDL_WARNING, "Warning: '%s' does not exist\n",
+ syslog(LOG_WARNING, "Warning: '%s' does not exist\n",
public_clients_file);
return(0);
}
if (statbuf.st_mtime > pc_timestamp) {
begin_critical_section(S_PUBLIC_CLIENTS);
- CtdlLogPrintf(CTDL_INFO, "Loading %s\n", public_clients_file);
+ syslog(LOG_INFO, "Loading %s\n", public_clients_file);
public_clientspos = &public_clients[0];
public_clientsend = public_clientspos + SIZ;
end_critical_section(S_PUBLIC_CLIENTS);
}
- CtdlLogPrintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n",
+ syslog(LOG_DEBUG, "Checking whether %s is a local or public client\n",
CC->cs_addr);
for (i=0; i<num_parms(public_clients); ++i) {
extract_token(addrbuf, public_clients, i, '|', sizeof addrbuf);
if (!strcasecmp(CC->cs_addr, addrbuf)) {
- CtdlLogPrintf(CTDL_DEBUG, "... yes it is.\n");
+ syslog(LOG_DEBUG, "... yes it is.\n");
return(1);
}
}
/* No hits. This is not a public client. */
- CtdlLogPrintf(CTDL_DEBUG, "... no it isn't.\n");
+ syslog(LOG_DEBUG, "... no it isn't.\n");
return(0);
}
CC->cs_addr[0] = 0;
}
- CtdlLogPrintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n",
+ syslog(LOG_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n",
dev_code,
cli_code,
(rev_level / 100),
cprintf("%d Ok\n",CIT_OK);
}
-
+typedef const char *ccharp;
/*
* display system messages or help
*/
/* Otherwise, look for the requested file by name. */
else {
- mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
+ mesg_locate(targ, sizeof targ, buf2, 2, (const ccharp*)dirs);
if (IsEmptyStr(targ)) {
snprintf(buf2, sizeof buf2, "%s.%d",
buf, CC->cs_clientdev);
mesg_locate(targ, sizeof targ, buf2, 2,
- (const char **)dirs);
+ (const ccharp*)dirs);
if (IsEmptyStr(targ)) {
mesg_locate(targ, sizeof targ, buf, 2,
- (const char **)dirs);
+ (const ccharp*)dirs);
}
}
}
dirs[0] = strdup(ctdl_message_dir);
dirs[1] = strdup(ctdl_hlp_dir);
- mesg_locate(targ, sizeof targ, buf, 2, (const char**)dirs);
+ mesg_locate(targ, sizeof targ, buf, 2, (const ccharp*)dirs);
free(dirs[0]);
free(dirs[1]);
else {
sleep(5);
cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED);
- CtdlLogPrintf(CTDL_ERR, "Warning: ipgm authentication failed.\n");
+ syslog(LOG_ERR, "Warning: ipgm authentication failed.\n");
CC->kill_me = 1;
}
}
}
if ((restart_server > 0) && !running_as_daemon)
{
- CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n");
+ syslog(LOG_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n");
Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n";
state = ERROR;
}
restart_server = 1;
if (!running_as_daemon)
{
- CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
+ syslog(LOG_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
state = ERROR;
}
}
-/*
- * Generate a "nonce" for APOP-style authentication.
- *
- * RFC 1725 et al specify a PID to be placed in front of the nonce.
- * Quoth BTX: That would be stupid.
- */
-void generate_nonce(CitContext *con) {
- struct timeval tv;
-
- memset(con->cs_nonce, NONCE_SIZE, 0);
- gettimeofday(&tv, NULL);
- memset(con->cs_nonce, NONCE_SIZE, 0);
- snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
- rand(), (long)tv.tv_usec, config.c_fqdn);
-}
-
/*
* Back-end function for starting a session
con->internal_pgm = 0;
con->download_fp = NULL;
con->upload_fp = NULL;
+ con->cached_msglist = NULL;
+ con->cached_num_msgs = 0;
con->FirstExpressMessage = NULL;
time(&con->lastcmd);
time(&con->lastidle);
*con->fake_username = '\0';
*con->fake_hostname = '\0';
*con->fake_roomname = '\0';
- generate_nonce(con);
+ *con->cs_clientinfo = '\0';
safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
con->cs_UDSclientUID = -1;
/*fill in the user data structure */
if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) {
- CtdlLogPrintf(CTDL_NOTICE, "could obtain credentials from unix domain socket");
+ syslog(LOG_NOTICE, "could obtain credentials from unix domain socket");
}
else {
database, after a reverse lookup on the UID to get the account name.
We can take this opportunity to check to see if this is a legit account.
*/
+ snprintf(con->cs_clientinfo, sizeof(con->cs_clientinfo),
+ "PID: "F_PID_T"; UID: "F_UID_T"; GID: "F_XPID_T" ",
+ credentials.pid,
+ credentials.uid,
+ credentials.gid);
}
}
#endif
}
if (!CC->is_local_socket) {
- CtdlLogPrintf(CTDL_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr);
+ syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr);
}
else {
- CtdlLogPrintf(CTDL_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID);
+ syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID);
}
/* Run any session startup routines registered by loadable modules */
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n");
+ syslog(LOG_ERR, "Client disconnected: ending session.\n");
CC->kill_me = 1;
CtdlThreadName(old_name);
return;
/* Log the server command, but don't show passwords... */
if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
- CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
+ syslog(LOG_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
}
else {
-
CtdlLogPrintf(CTDL_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
+
syslog(LOG_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
}
buffer_output();
projects / citadel.git / blobdiff