/*
* This file contains miscellaneous housekeeping tasks.
*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
void check_sched_shutdown(void) {
if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
- syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
+ syslog(LOG_NOTICE, "housekeeping: scheduled shutdown initiating");
server_shutting_down = 1;
}
}
-
/*
* Check (and fix) floor reference counts. This doesn't need to be done
* very often, since the counts should remain correct during normal operation.
++new_refcounts[(int)qrbuf->QRfloor];
}
+
void check_ref_counts(void) {
struct floor flbuf;
int a;
int new_refcounts[MAXFLOORS];
- syslog(LOG_DEBUG, "Checking floor reference counts\n");
+ syslog(LOG_DEBUG, "housekeeping: checking floor reference counts");
for (a=0; a<MAXFLOORS; ++a) {
new_refcounts[a] = 0;
}
flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
}
lputfloor(&flbuf, a);
- syslog(LOG_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+ syslog(LOG_DEBUG, "housekeeping: floor %d has %d rooms", a, new_refcounts[a]);
}
}
+
/*
* This is the housekeeping loop. Worker threads come through here after
* processing client requests but before jumping back into the pool. We
end_critical_section(S_HOUSEKEEPING);
}
+
void CtdlDisableHouseKeeping(void)
{
int ActiveBackgroundJobs;
int nContexts, i;
retry_block_housekeeping:
- syslog(LOG_INFO, "trying to disable housekeeping services");
+ syslog(LOG_INFO, "housekeeping: trying to disable services");
begin_critical_section(S_HOUSEKEEPING);
if (housekeeping_in_progress == 0) {
do_housekeeping_now = 1;
goto retry_block_housekeeping;
}
- syslog(LOG_INFO, "checking for running server Jobs");
+ syslog(LOG_INFO, "housekeeping: checking for running server jobs");
retry_wait_for_contexts:
/* So that we don't keep the context list locked for a long time
if ((nptr[i].state != CON_SYS) || (nptr[i].IO == NULL) || (nptr[i].lastcmd == 0))
continue;
ActiveBackgroundJobs ++;
- syslog(LOG_INFO, "Job CC[%d] active; use TERM if you don't want to wait for it",nptr[i].cs_pid);
+ syslog(LOG_INFO, "jousekeeping: job CC[%d] active; use TERM if you don't want to wait for it", nptr[i].cs_pid);
}
}
if (ActiveBackgroundJobs != 0) {
- syslog(LOG_INFO, "found %d running jobs, need to wait", ActiveBackgroundJobs);
+ syslog(LOG_INFO, "housekeeping: found %d running jobs, need to wait", ActiveBackgroundJobs);
usleep(5000000);
goto retry_wait_for_contexts;
}
- syslog(LOG_INFO, "Housekeeping disabled now.");
+ syslog(LOG_INFO, "housekeeping: disabled now.");
}
+
void CtdlEnableHouseKeeping(void)
{
begin_critical_section(S_HOUSEKEEPING);
* Citadel Extension Loader
* Written by Brian Costello <btx@calyx.net>
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
- syslog(LOG_EMERG, "%s", ChrPtr(Message));
- syslog(LOG_EMERG, "%s", ErrSubject);
+ syslog(LOG_EMERG, "extensions: %s", ChrPtr(Message));
+ syslog(LOG_EMERG, "extensions: %s", ErrSubject);
quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
FreeStrBuf(&Message);
p->desc = desc;
Put(ProtoHookList, cmd, 4, p, NULL);
- syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
+ syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
}
void CtdlDestroyProtoHooks(void)
newfcn->h_function_pointer = fcn_ptr;
CleanupHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
}
{
if (fcn_ptr == cur->h_function_pointer)
{
- syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
p = cur->next;
free(cur);
cur = CleanupHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = fcn_ptr;
EVCleanupHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
}
{
if (fcn_ptr == cur->h_function_pointer)
{
- syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
p = cur->next;
free(cur);
cur = EVCleanupHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
p = cur->next;
cur->h_function_pointer();
free(cur);
newfcn->next = *pfcn;
*pfcn = newfcn;
- syslog(LOG_DEBUG, "Registered a new TDAP Veto function (type %d Priority %d)\n",
+ syslog(LOG_DEBUG, "extensions: registered a new TDAP Veto function (type %d Priority %d)",
EventType, Priority);
}
if ((fcn_ptr == cur->h_function_pointer) &&
(EventType == cur->eventtype))
{
- syslog(LOG_DEBUG, "Unregistered TDAP Veto function (type %d)\n",
- EventType);
+ syslog(LOG_DEBUG, "extensions: unregistered TDAP Veto function (type %d)", EventType);
p = cur->next;
free(cur);
cur = TDAPVetoHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed TDAP Veto function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed TDAP Veto function");
p = cur->next;
free(cur);
cur = p;
newfcn->next = *pfcn;
*pfcn = newfcn;
- syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
- EventType, Priority);
+ syslog(LOG_DEBUG, "extensions: registered a new session function (type %d Priority %d)", EventType, Priority);
}
if ((fcn_ptr == cur->h_function_pointer) &&
(EventType == cur->eventtype))
{
- syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
- EventType);
+ syslog(LOG_DEBUG, "extensions: unregistered session function (type %d)", EventType);
p = cur->next;
free(cur);
cur = SessionHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed session function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed session function");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
UserHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+ syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)",
EventType);
}
if ((fcn_ptr == cur->h_function_pointer) &&
(EventType == cur->eventtype))
{
- syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
- EventType);
+ syslog(LOG_DEBUG, "extensions: unregistered user function (type %d)", EventType);
p = cur->next;
free(cur);
cur = UserHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed user function \n");
+ syslog(LOG_DEBUG, "extensions: destroyed user function");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
MessageHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new message function (type %d)\n",
- EventType);
+ syslog(LOG_DEBUG, "extensions: registered a new message function (type %d)", EventType);
}
if ((handler == cur->h_function_pointer) &&
(EventType == cur->eventtype))
{
- syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
- EventType);
+ syslog(LOG_DEBUG, "extensions: unregistered message function (type %d)", EventType);
p = cur->next;
free(cur);
cur = NULL;
cur = MessageHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
+ syslog(LOG_DEBUG, "extensions: destroyed message function (type %d)", cur->eventtype);
p = cur->next;
free(cur);
cur = p;
newfcn->fcn_ptr = fcn_ptr;
RoomHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new room function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new room function");
}
while (cur != NULL)
{
if (fcn_ptr == cur->fcn_ptr) {
- syslog(LOG_DEBUG, "Unregistered room function\n");
+ syslog(LOG_DEBUG, "extensions: unregistered room function");
p = cur->next;
free(cur);
cur = RoomHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed room function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed room function");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
NetprocHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new netproc function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new netproc function");
}
while (cur != NULL) {
if (handler == cur->h_function_pointer)
{
- syslog(LOG_DEBUG, "Unregistered netproc function\n");
+ syslog(LOG_DEBUG, "extensions: unregistered netproc function");
p = cur->next;
free(cur);
if (last != NULL) {
cur = NetprocHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed netproc function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed netproc function");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
DeleteHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new delete function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new delete function");
}
while (cur != NULL) {
if (handler == cur->h_function_pointer )
{
- syslog(LOG_DEBUG, "Unregistered delete function\n");
+ syslog(LOG_DEBUG, "extensions: unregistered delete function");
p = cur->next;
free(cur);
}
}
}
+
+
void CtdlDestroyDeleteHooks(void)
{
DeleteFunctionHook *cur, *p;
cur = DeleteHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed delete function\n");
+ syslog(LOG_DEBUG, "extensions: destroyed delete function");
p = cur->next;
free(cur);
cur = p;
}
-
-
void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
{
FixedOutputHook *newfcn;
safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
FixedOutputTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new fixed output function for %s\n", newfcn->content_type);
+ syslog(LOG_DEBUG, "extensions: registered a new fixed output function for %s", newfcn->content_type);
}
while (cur != NULL) {
/* This will also remove duplicates if any */
if (!strcasecmp(content_type, cur->content_type)) {
- syslog(LOG_DEBUG,
- "Unregistered fixed output function for %s\n",
- content_type);
-
+ syslog(LOG_DEBUG, "extensions: unregistered fixed output function for %s", content_type);
p = cur->next;
free(cur);
cur = FixedOutputTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
+ syslog(LOG_DEBUG, "extensions: destroyed fixed output function for %s", cur->content_type);
p = cur->next;
free(cur);
cur = p;
}
-
-
-
void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
newfcn->order = order;
newfcn->h_function_pointer = fcn_ptr;
XmsgHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new x-msg function (priority %d)\n", order);
+ syslog(LOG_DEBUG, "extensions: registered a new x-msg function (priority %d)", order);
}
/* This will also remove duplicates if any */
if (fcn_ptr == cur->h_function_pointer &&
order == cur->order) {
- syslog(LOG_DEBUG, "Unregistered x-msg function "
- "(priority %d)\n", order);
+ syslog(LOG_DEBUG, "extensions: unregistered x-msg function (priority %d)", order);
p = cur->next;
free(cur);
- if (last != NULL)
+ if (last != NULL) {
last->next = p;
- else
+ }
+ else {
XmsgHookTable = p;
-
+ }
cur = p;
}
else {
}
}
+
void CtdlDestroyXmsgHooks(void)
{
XmsgFunctionHook *cur, *p;
cur = XmsgHookTable;
while (cur != NULL)
{
- syslog(LOG_DEBUG, "Destroyed x-msg function "
- "(priority %d)\n", cur->order);
+ syslog(LOG_DEBUG, "extensions: destroyed x-msg function (priority %d)", cur->order);
p = cur->next;
-
free(cur);
cur = p;
}
if (sockpath != NULL) {
newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"), error);
- snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
+ snprintf(message, SIZ, "extensions: unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
- syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+ syslog(LOG_INFO, "extensions: service %s has been manually disabled, skipping", ServiceName);
free (message);
free(newfcn);
return;
tcp_port,
CtdlGetConfigInt("c_maxsessions"),
error);
- snprintf(message, SIZ, "TCP port %s:%d: (%s) ",
+ snprintf(message, SIZ, "extensions: TCP port %s:%d: (%s) ",
CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName);
}
if (newfcn->msock > 0) {
ServiceHookTable = newfcn;
strcat(message, "registered.");
- syslog(LOG_INFO, "%s\n", message);
+ syslog(LOG_INFO, "%s", message);
}
else {
AddPortError(message, error);
strcat(message, "FAILED.");
- syslog(LOG_CRIT, "%s\n", message);
+ syslog(LOG_ERR, "%s", message);
free(newfcn);
}
free(message);
if (cur->msock > 0)
close(cur->msock);
if (sockpath) {
- syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
- sockpath);
+ syslog(LOG_INFO, "extensions: closed UNIX domain socket %s", sockpath);
unlink(sockpath);
} else if (tcp_port) {
- syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
+ syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
} else {
- syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+ syslog(LOG_INFO, "extensions: unregistered service \"%s\"", cur->ServiceName);
}
p = cur->next;
free(cur);
close(cur->msock);
cur->msock = -1;
if (cur->sockpath != NULL){
- syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
- cur->ServiceName,
- cur->sockpath);
+ syslog(LOG_INFO, "extensions: [%s] Closed UNIX domain socket %s", cur->ServiceName, cur->sockpath);
unlink(cur->sockpath);
} else {
- syslog(LOG_INFO, "[%s] closing service\n",
- cur->ServiceName);
+ syslog(LOG_INFO, "extensions: [%s] closing service", cur->ServiceName);
}
}
cur = cur->next;
}
}
+
void CtdlDestroyServiceHook(void)
{
const char *Text;
}
if (cur->sockpath) {
- syslog(LOG_INFO, "%s UNIX domain socket %s\n",
- Text,
- cur->sockpath);
+ syslog(LOG_INFO, "extensions: %s UNIX domain socket %s", Text, cur->sockpath);
unlink(cur->sockpath);
} else if (cur->tcp_port) {
- syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port);
+ syslog(LOG_INFO, "extensions: %s TCP port %d", Text, cur->tcp_port);
} else {
- syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+ syslog(LOG_INFO, "extensions: destroyed service \"%s\"", cur->ServiceName);
}
p = cur->next;
free(cur);
newfcn->fcn_ptr = fcn_ptr;
SearchFunctionHookTable = newfcn;
- syslog(LOG_DEBUG, "Registered a new search function (%s)\n", name);
+ syslog(LOG_DEBUG, "extensions: registered a new search function (%s)", name);
}
void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
(cur->fcn_ptr == fcn_ptr) &&
name && !strcmp(name, cur->name))
{
- syslog(LOG_DEBUG, "Unregistered search function(%s)\n", name);
+ syslog(LOG_DEBUG, "extensions: unregistered search function(%s)", name);
p = cur->next;
free (cur);
if (last != NULL)
/* Other code may elect to protect this message from server-side
* handlers; if this is the case, don't do anything.
- syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
*/
if (msg->cm_flags & CM_SKIP_HOOKS) {
- syslog(LOG_DEBUG, "Skipping hooks\n");
return(0);
}
RoomFunctionHook *fcn;
int total_retval = 0;
- syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+ syslog(LOG_DEBUG, "extensions: performing room hooks for <%s>", target_room->QRname);
for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
/*
* Server functions which perform operations on user objects.
*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
else { /* Sanity checks succeeded. Now rename the user. */
if (usbuf.usernum == 0)
{
- syslog(LOG_DEBUG, "Can not rename user \"Citadel\".\n");
+ syslog(LOG_DEBUG, "user_ops: can not rename user \"Citadel\".");
retcode = RENAMEUSER_NOT_FOUND;
} else {
- syslog(LOG_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname);
+ syslog(LOG_DEBUG, "user_ops: renaming <%s> to <%s>\n", oldname, newname);
cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey));
safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname);
CtdlPutUser(&usbuf);
- cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long),
- usbuf.fullname, strlen(usbuf.fullname)+1 );
-
+ cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long), usbuf.fullname, strlen(usbuf.fullname)+1 );
retcode = RENAMEUSER_OK;
}
}
}
-
/*
* Back end for CtdlSetRelationship()
*/
memset (IndexBuf, 0, sizeof (IndexBuf));
/* Generate an index */
- IndexLen = GenerateRelationshipIndex(IndexBuf,
- newvisit->v_roomnum,
- newvisit->v_roomgen,
- newvisit->v_usernum);
+ IndexLen = GenerateRelationshipIndex(IndexBuf, newvisit->v_roomnum, newvisit->v_roomgen, newvisit->v_usernum);
/* Store the record */
cdb_store(CDB_VISIT, IndexBuf, IndexLen,
}
-
-
/*
* Define a relationship between a user and a room
*/
}
}
+
/*
* CtdlGetUserByNumber() - get user by number
* returns 0 if user was found
cdbun = cdb_fetch(CDB_USERSBYNUMBER, &number, sizeof(long));
if (cdbun == NULL) {
- syslog(LOG_INFO, "User %ld not found\n", number);
+ syslog(LOG_INFO, "user_ops: %ld not found", number);
return(-1);
}
- syslog(LOG_INFO, "User %ld maps to %s\n", number, cdbun->ptr);
+ syslog(LOG_INFO, "user_ops: %ld maps to %s", number, cdbun->ptr);
r = CtdlGetUser(usbuf, cdbun->ptr);
cdb_free(cdbun);
return(r);
}
+
/*
* Helper function for rebuild_usersbynumber()
*/
}
while (u != NULL) {
- syslog(LOG_DEBUG, "Rebuilding usersbynumber index %10ld : %s\n",
- u->usernum, u->username);
+ syslog(LOG_DEBUG, "user_ops: rebuilding usersbynumber index %10ld : %s", u->usernum, u->username);
cdb_store(CDB_USERSBYNUMBER, &u->usernum, sizeof(long), u->username, strlen(u->username)+1);
-
ptr = u;
u = u->next;
free(ptr);
}
-
/*
* Rebuild the users-by-number index
*/
}
-
/*
* getuserbyuid() - get user by system uid (for PAM mode authentication)
* returns 0 if user was found
return (-1);
}
+
/*
* Back end for cmd_user() and its ilk
*
int found_user;
long len;
- syslog(LOG_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname);
+ syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s, %s)", authname, trythisname);
if ((CC->logged_in)) {
return login_already_logged_in;
if (!strncasecmp(trythisname, "SYS_", 4))
{
- syslog(LOG_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname);
+ syslog(LOG_DEBUG, "user_ops: system user \"%s\" is not allowed to log in.", trythisname);
return login_not_found;
}
struct passwd *tempPwdPtr;
char pwdbuffer[256];
- syslog(LOG_DEBUG, "asking host about <%s>\n", username);
+ syslog(LOG_DEBUG, "user_ops: asking host about <%s>", username);
#ifdef HAVE_GETPWNAM_R
#ifdef SOLARIS_GETPWUID
- syslog(LOG_DEBUG, "Calling getpwnam_r()\n");
+ syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
#else // SOLARIS_GETPWUID
- syslog(LOG_DEBUG, "Calling getpwnam_r()\n");
+ syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
#endif // SOLARIS_GETPWUID
#else // HAVE_GETPWNAM_R
- syslog(LOG_DEBUG, "SHOULD NEVER GET HERE!!!\n");
+ syslog(LOG_DEBUG, "user_ops: SHOULD NEVER GET HERE!!!");
tempPwdPtr = NULL;
#endif // HAVE_GETPWNAM_R
if (tempPwdPtr == NULL) {
- syslog(LOG_DEBUG, "no such user <%s>\n", username);
+ syslog(LOG_DEBUG, "user_ops: no such user <%s>", username);
return login_not_found;
}
* If not found, make one attempt to create it.
*/
found_user = getuserbyuid(&CC->user, pd.pw_uid);
- syslog(LOG_DEBUG, "found it: uid=%ld, gecos=%s here: %d\n",
- (long)pd.pw_uid, pd.pw_gecos, found_user);
+ syslog(LOG_DEBUG, "user_ops: found it: uid=%ld, gecos=%s here: %d", (long)pd.pw_uid, pd.pw_gecos, found_user);
if (found_user != 0) {
len = cutuserkey(username);
create_user(username, len, 0);
}
-
-
-
/*
* session startup code which is common to both cmd_pass() and cmd_newu()
*/
struct CitContext *CCC = CC;
CCC->logged_in = 1;
- syslog(LOG_NOTICE, "<%s> logged in\n", CCC->curr_user);
+ syslog(LOG_NOTICE, "user_ops: <%s> logged in", CCC->curr_user);
CtdlGetUserLock(&CCC->user, CCC->curr_user);
++(CCC->user.timescalled);
CIT_OK, CC->user.fullname, CC->user.axlevel,
CC->user.timescalled, CC->user.posted,
CC->user.flags, CC->user.usernum,
- CC->previous_login);
+ CC->previous_login
+ );
}
-
void CtdlUserLogout(void)
{
CitContext *CCC = MyContext();
- syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s> from session %d",
- CCC->curr_user, CCC->cs_pid
- );
+ syslog(LOG_DEBUG, "user_ops: CtdlUserLogout() logging out <%s> from session %d", CCC->curr_user, CCC->cs_pid);
/* Run any hooks registered by modules... */
PerformSessionHooks(EVT_LOGOUT);
CCC->logged_in = 0;
/* Check to see if the user was deleted whilst logged in and purge them if necessary */
- if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum))
+ if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) {
purge_user(CCC->user.fullname);
+ }
/* Clear out the user record in memory so we don't behave like a ghost */
memset(&CCC->user, 0, sizeof(struct ctdluser));
CCC->fake_username[0] = 0;
CCC->fake_hostname[0] = 0;
CCC->fake_roomname[0] = 0;
-
/* Free any output buffers */
unbuffer_output();
int rv = 0;
if (IsEmptyStr(pass)) {
- syslog(LOG_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid);
+ syslog(LOG_DEBUG, "user_ops: refusing to chkpwd for uid=%d with empty password", uid);
return 0;
}
- syslog(LOG_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid);
+ syslog(LOG_DEBUG, "user_ops: validating password for uid=%d using chkpwd...", uid);
begin_critical_section(S_CHKPWD);
rv = write(chkpwd_write_pipe[1], &uid, sizeof(uid_t));
if (rv == -1) {
- syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "user_ops: communication with chkpwd broken: %s", strerror(errno));
end_critical_section(S_CHKPWD);
return 0;
}
rv = write(chkpwd_write_pipe[1], pass, 256);
if (rv == -1) {
- syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "user_ops: communication with chkpwd broken: %s", strerror(errno));
end_critical_section(S_CHKPWD);
return 0;
}
rv = read(chkpwd_read_pipe[0], buf, 4);
if (rv == -1) {
- syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_EMERG, "user_ops: ommunication with chkpwd broken: %s", strerror(errno));
end_critical_section(S_CHKPWD);
return 0;
}
end_critical_section(S_CHKPWD);
if (!strncmp(buf, "PASS", 4)) {
- syslog(LOG_DEBUG, "...pass\n");
+ syslog(LOG_DEBUG, "user_ops: chkpwd pass");
return(1);
}
- syslog(LOG_DEBUG, "...fail\n");
+ syslog(LOG_DEBUG, "user_ops: chkpwd fail");
return 0;
}
+
/*
* Start up the chkpwd daemon so validpw() has something to talk to
*/
struct stat filestats;
int i;
- syslog(LOG_DEBUG, "Starting chkpwd daemon for host authentication mode\n");
+ syslog(LOG_DEBUG, "user_ops: starting chkpwd daemon for host authentication mode");
- if ((stat(file_chkpwd, &filestats)==-1) ||
- (filestats.st_size==0)){
+ if ((stat(file_chkpwd, &filestats)==-1) || (filestats.st_size==0)) {
printf("didn't find chkpwd daemon in %s: %s\n", file_chkpwd, strerror(errno));
abort();
}
if (pipe(chkpwd_write_pipe) != 0) {
- syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to create pipe for chkpwd daemon: %s", strerror(errno));
abort();
}
if (pipe(chkpwd_read_pipe) != 0) {
- syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to create pipe for chkpwd daemon: %s", strerror(errno));
abort();
}
chkpwd_pid = fork();
if (chkpwd_pid < 0) {
- syslog(LOG_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to fork chkpwd daemon: %s", strerror(errno));
abort();
}
if (chkpwd_pid == 0) {
- syslog(LOG_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_write_pipe[0], 0);
- syslog(LOG_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_read_pipe[1], 1);
- syslog(LOG_DEBUG, "Now closing stuff\n");
for (i=2; i<256; ++i) close(i);
- syslog(LOG_DEBUG, "Now calling execl(%s)\n", file_chkpwd);
execl(file_chkpwd, file_chkpwd, NULL);
- syslog(LOG_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to exec chkpwd daemon: %s", strerror(errno));
abort();
exit(errno);
}
CitContext *CCC = CC;
if ((CCC->logged_in)) {
- syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n");
+ syslog(LOG_WARNING, "user_ops: CtdlTryPassword: already logged in");
return pass_already_logged_in;
}
if (!strcmp(CCC->curr_user, NLI)) {
- syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n");
+ syslog(LOG_WARNING, "user_ops: CtdlTryPassword: no user selected");
return pass_no_user;
}
if (CtdlGetUser(&CCC->user, CCC->curr_user)) {
- syslog(LOG_ERR, "CtdlTryPassword: internal error\n");
+ syslog(LOG_ERR, "user_ops: CtdlTryPassword: internal error");
return pass_internal_error;
}
if (password == NULL) {
- syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n");
+ syslog(LOG_INFO, "user_ops: CtdlTryPassword: NULL password string supplied");
return pass_wrong_password;
}
/*
* (sooper-seekrit hack ends here)
*/
-
}
else {
code = (-1);
if (!code) {
do_login();
return pass_ok;
- } else {
- syslog(LOG_WARNING, "Bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>\n",
- CCC->curr_user,
- CCC->ServiceName,
- CCC->tcp_port,
- CCC->cs_host,
- CCC->cs_addr);
-
-
-//citserver[5610]: Bad password specified for <willi> Service <citadel-TCP> Remote <PotzBlitz / >
-
+ }
+ else {
+ syslog(LOG_WARNING, "user_ops: bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>",
+ CCC->curr_user,
+ CCC->ServiceName,
+ CCC->tcp_port,
+ CCC->cs_host,
+ CCC->cs_addr
+ );
return pass_wrong_password;
}
}
-
-
/*
* Delete a user record *and* all of its related resources.
*/
return (ERROR + NO_SUCH_USER);
if (CtdlGetUser(&usbuf, pname) != 0) {
- syslog(LOG_ERR, "Cannot purge user <%s> - not found\n", pname);
+ syslog(LOG_ERR, "user_ops: cannot purge user <%s> - not found", pname);
return (ERROR + NO_SUCH_USER);
}
/* Don't delete a user who is currently logged in. Instead, just
* during the next purge.
*/
if (CtdlIsUserLoggedInByNum(usbuf.usernum)) {
- syslog(LOG_WARNING, "User <%s> is logged in; not deleting.\n", pname);
+ syslog(LOG_WARNING, "user_ops: <%s> is logged in; not deleting", pname);
usbuf.axlevel = AxDeleted;
CtdlPutUser(&usbuf);
return (1);
}
- syslog(LOG_NOTICE, "Deleting user <%s>\n", pname);
+ syslog(LOG_NOTICE, "user_ops: deleting <%s>", pname);
/*
* FIXME:
* That would truly mess things up :-(
* I would like to see the S_USERS start before the CtdlIsUserLoggedInByNum() above
* and end after the user has been deleted from the database, below.
- * Question is should we enter the EVT_PURGEUSER whilst S_USERS is active?
+ * Question is should we enter the EVT_PURGEUSER while S_USERS is active?
*/
/* Perform any purge functions registered by server extensions */
}
-
/*
* create_user() - back end processing to create a new user
*
CC->cs_addr
);
CtdlAideMessage(buf, "User Creation Notice");
- syslog(LOG_NOTICE, "New user <%s> created\n", username);
+ syslog(LOG_NOTICE, "user_ops: <%s> created", username);
return (0);
}
-
/*
* set password - back end api code
*/
CtdlGetUserLock(&CC->user, CC->curr_user);
safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password));
CtdlPutUserLock(&CC->user);
- syslog(LOG_INFO, "Password changed for user <%s>\n", CC->curr_user);
+ syslog(LOG_INFO, "user_ops: password changed for <%s>", CC->curr_user);
PerformSessionHooks(EVT_SETPASS);
}
-
-
/*
* API function for cmd_invt_kick() and anything else that needs to
* invite or kick out a user to/from a room.
}
-
-
/*
* Traverse the user file...
*/
}
-
-
/*
* Count the number of new mail messages the user has
*/
return (num_newmsgs);
}
-
-
-
-
projects / citadel.git / commitdiff