urandom = fopen("/dev/urandom", "r");
if (urandom != NULL) {
rv = fread(&seed, sizeof seed, 1, urandom);
+ if (rv == -1)
+ syslog(LOG_EMERG, "failed to read random seed: %s\n",
+ strerror(errno));
fclose(urandom);
}
else {
/* timezone and daylight global variables are not portable. */
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
- cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst);
+ cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time);
#else
- cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst);
+ cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time);
#endif
}
for (i=0; i<num_parms(public_clients); ++i) {
extract_token(addrbuf, public_clients, i, '|', sizeof addrbuf);
if (!strcasecmp(CC->cs_addr, addrbuf)) {
- syslog(LOG_DEBUG, "... yes it is.\n");
+ syslog(LOG_DEBUG, "... yes its local.\n");
return(1);
}
}
if (viewed->room.QRflags & QR_PRIVATE) {
CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
if ( (ra & UA_KNOWN) == 0) {
- strcpy(real_room, "<private room>");
+ strcpy(real_room, " ");
}
}
*/
void begin_session(CitContext *con)
{
- socklen_t len;
- struct sockaddr_in sin;
-
/*
* Initialize some variables specific to our context.
*/
safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
con->cs_UDSclientUID = -1;
con->cs_host[sizeof con->cs_host - 1] = 0;
- len = sizeof sin;
if (!CC->is_local_socket) {
locate_host(con->cs_host, sizeof con->cs_host,
con->cs_addr, sizeof con->cs_addr,
}
+void citproto_begin_admin_session() {
+ CC->internal_pgm = 1;
+ cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename);
+}
+
+
void cmd_noop(char *argbuf)
{
cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() );
/* Log the server command, but don't show passwords... */
if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
- syslog(LOG_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
+ syslog(LOG_INFO, "[%d][%s(%ld)] %s",
+ CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf
+ );
}
else {
- syslog(LOG_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
+ syslog(LOG_INFO, "[%d][%s(%ld)] <password command hidden from log>",
+ CC->cs_pid, CC->curr_user, CC->user.usernum
+ );
}
buffer_output();