/*
- * $Id$
- *
* 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"
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)
else {
cprintf("0\n"); /* OpenID is disabled when using non-native auth */
}
+
+ cprintf("%d\n", config.c_guest_logins);
cprintf("000\n");
}
*/
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);
}
int rev_level;
char desc[128];
char from_host[128];
- struct in_addr addr;
- int do_lookup = 0;
if (num_parms(argbuf)<4) {
cprintf("%d usage error\n", ERROR + ILLEGAL_VALUE);
safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
CC->cs_clientname[31] = 0;
- if (!IsEmptyStr(from_host)) {
- if (CC->is_local_socket) do_lookup = 1;
- else if (is_public_client()) do_lookup = 1;
+ /* For local sockets and public clients, trust the hostname supplied by the client */
+ if ( (CC->is_local_socket) || (is_public_client()) ) {
+ safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
+ CC->cs_host[sizeof CC->cs_host - 1] = 0;
+ CC->cs_addr[0] = 0;
}
- if (do_lookup) {
- CtdlLogPrintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host);
- if ((addr.s_addr = inet_addr(from_host)) != -1) {
- locate_host(CC->cs_host, sizeof CC->cs_host,
- CC->cs_addr, sizeof CC->cs_addr,
- &addr);
- }
- else {
- safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
- CC->cs_host[sizeof CC->cs_host - 1] = 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]);
return(-1);
}
+ if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) {
+ cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
+ return(-1);
+ }
+
if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) {
cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
return(-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;
}
*con->fake_username = '\0';
*con->fake_hostname = '\0';
*con->fake_roomname = '\0';
+ *con->cs_clientinfo = '\0';
generate_nonce(con);
safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
con->cs_host[sizeof con->cs_host - 1] = 0;
len = sizeof sin;
if (!CC->is_local_socket) {
- if (!getpeername(con->client_socket, (struct sockaddr *) &sin, &len)) {
- locate_host(con->cs_host, sizeof con->cs_host,
- con->cs_addr, sizeof con->cs_addr,
- &sin.sin_addr
- );
- }
+ locate_host(con->cs_host, sizeof con->cs_host,
+ con->cs_addr, sizeof con->cs_addr,
+ con->client_socket
+ );
}
else {
- strcpy(con->cs_host, "");
+ con->cs_host[0] = 0;
+ con->cs_addr[0] = 0;
#ifdef HAVE_STRUCT_UCRED
{
/* as http://www.wsinnovations.com/softeng/articles/uds.html told us... */
/*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 started from %s [%s].\n", 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 started via local socket.\n");
+ 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, "%s\n", cmdbuf);
+ syslog(LOG_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
}
else {
- CtdlLogPrintf(CTDL_INFO, "<password command hidden from log>\n");
+ syslog(LOG_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
}
buffer_output();
CtdlRegisterProtoHook(cmd_scdn, "SCDN", "schedule or cancel a server shutdown");
CtdlRegisterProtoHook(cmd_time, "TIME", "fetch the date and time from the server");
}
- /* return our Subversion id for the Log */
- return "$Id$";
+ /* return our id for the Log */
+ return "citserver";
}
projects / citadel.git / blobdiff