From 6b7ec622dd2a18715d3c0f353d23ade3f463f3f3 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 24 Mar 2017 23:36:07 -0400 Subject: [PATCH] Updated more modules to the new logging convention --- citadel/housekeeping.c | 23 +++--- citadel/serv_extensions.c | 142 +++++++++++++++-------------------- citadel/user_ops.c | 152 +++++++++++++++----------------------- 3 files changed, 132 insertions(+), 185 deletions(-) diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index 923362777..139ada05e 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -1,7 +1,7 @@ /* * 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. @@ -23,13 +23,12 @@ 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. @@ -43,13 +42,14 @@ void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) { ++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 * - * 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. @@ -259,8 +259,8 @@ void LogPrintMessages(long err) 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); @@ -386,7 +386,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc) 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) @@ -407,7 +407,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (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"); } @@ -420,7 +420,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void)) { 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); @@ -447,7 +447,7 @@ void CtdlDestroyCleanupHooks(void) 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; @@ -466,7 +466,7 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void)) 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"); } @@ -479,7 +479,7 @@ void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void)) { 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); @@ -506,7 +506,7 @@ void CtdlDestroyEVCleanupHooks(void) 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); @@ -535,7 +535,7 @@ void CtdlRegisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType, int Prior 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); } @@ -549,8 +549,7 @@ void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType) 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); @@ -576,7 +575,7 @@ void CtdlDestroyTDAPVetoHooks(void) 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; @@ -605,8 +604,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority 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); } @@ -619,8 +617,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType) 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); @@ -646,7 +643,7 @@ void CtdlDestroySessionHooks(void) 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; @@ -667,7 +664,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType) 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); } @@ -681,8 +678,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int 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); @@ -708,7 +704,7 @@ void CtdlDestroyUserHooks(void) 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; @@ -730,8 +726,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), 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); } @@ -745,8 +740,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *) 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; @@ -771,7 +765,7 @@ void CtdlDestroyMessageHook(void) 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; @@ -790,7 +784,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *)) 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"); } @@ -802,7 +796,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *)) 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); @@ -829,7 +823,7 @@ void CtdlDestroyRoomHooks(void) 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; @@ -847,7 +841,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) ) 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"); } @@ -861,7 +855,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) ) 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) { @@ -886,7 +880,7 @@ void CtdlDestroyNetprocHooks(void) 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; @@ -905,7 +899,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) ) 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"); } @@ -918,7 +912,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) ) 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); @@ -935,6 +929,8 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) ) } } } + + void CtdlDestroyDeleteHooks(void) { DeleteFunctionHook *cur, *p; @@ -942,7 +938,7 @@ void CtdlDestroyDeleteHooks(void) 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; @@ -951,8 +947,6 @@ void CtdlDestroyDeleteHooks(void) } - - void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) ) { FixedOutputHook *newfcn; @@ -964,7 +958,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int 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); } @@ -977,10 +971,7 @@ void CtdlUnregisterFixedOutputHook(char *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); @@ -1006,7 +997,7 @@ void CtdlDestroyFixedOutputHooks(void) 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; @@ -1030,9 +1021,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt } - - - void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order) { @@ -1043,7 +1031,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o 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); } @@ -1057,16 +1045,16 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int /* 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 { @@ -1076,6 +1064,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int } } + void CtdlDestroyXmsgHooks(void) { XmsgFunctionHook *cur, *p; @@ -1083,10 +1072,8 @@ void CtdlDestroyXmsgHooks(void) 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; } @@ -1119,10 +1106,10 @@ void CtdlRegisterServiceHook(int tcp_port, 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; @@ -1132,19 +1119,19 @@ void CtdlRegisterServiceHook(int tcp_port, 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); @@ -1172,13 +1159,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath, 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); @@ -1209,19 +1195,17 @@ void CtdlShutdownServiceHooks(void) 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; @@ -1241,14 +1225,12 @@ void CtdlDestroyServiceHook(void) } 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); @@ -1272,7 +1254,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c 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) @@ -1286,7 +1268,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), (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) @@ -1373,10 +1355,8 @@ int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType /* 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); } @@ -1401,7 +1381,7 @@ int PerformRoomHooks(struct ctdlroom *target_room) 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); diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 242adff86..e35953deb 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -1,7 +1,7 @@ /* * 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. @@ -161,16 +161,14 @@ int rename_user(char *oldname, char *newname) { 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; } } @@ -207,7 +205,6 @@ int GenerateRelationshipIndex(char *IndexBuf, } - /* * Back end for CtdlSetRelationship() */ @@ -218,10 +215,7 @@ void put_visit(visit *newvisit) 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, @@ -230,8 +224,6 @@ void put_visit(visit *newvisit) } - - /* * Define a relationship between a user and a room */ @@ -399,6 +391,7 @@ int is_room_aide(void) } } + /* * CtdlGetUserByNumber() - get user by number * returns 0 if user was found @@ -412,16 +405,17 @@ int CtdlGetUserByNumber(struct ctdluser *usbuf, long number) 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() */ @@ -452,10 +446,8 @@ void rebuild_ubn_for_user(struct ctdluser *usbuf, void *data) { } 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); @@ -463,7 +455,6 @@ void rebuild_ubn_for_user(struct ctdluser *usbuf, void *data) { } - /* * Rebuild the users-by-number index */ @@ -474,7 +465,6 @@ void rebuild_usersbynumber(void) { } - /* * getuserbyuid() - get user by system uid (for PAM mode authentication) * returns 0 if user was found @@ -502,6 +492,7 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number) return (-1); } + /* * Back end for cmd_user() and its ilk * @@ -513,7 +504,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) 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; @@ -523,7 +514,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) 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; } @@ -554,21 +545,21 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) 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; } @@ -576,8 +567,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) * 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); @@ -650,9 +640,6 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) } - - - /* * session startup code which is common to both cmd_pass() and cmd_newu() */ @@ -661,7 +648,7 @@ void do_login(void) 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); @@ -717,18 +704,16 @@ void logged_in_response(void) 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); @@ -745,8 +730,9 @@ void CtdlUserLogout(void) 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)); @@ -758,7 +744,6 @@ void CtdlUserLogout(void) CCC->fake_username[0] = 0; CCC->fake_hostname[0] = 0; CCC->fake_roomname[0] = 0; - /* Free any output buffers */ unbuffer_output(); @@ -774,42 +759,43 @@ static int validpw(uid_t uid, const char *pass) 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 */ @@ -818,37 +804,32 @@ void start_chkpwd_daemon(void) { 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); } @@ -861,19 +842,19 @@ int CtdlTryPassword(const char *password, long len) 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; } @@ -903,7 +884,6 @@ int CtdlTryPassword(const char *password, long len) /* * (sooper-seekrit hack ends here) */ - } else { code = (-1); @@ -945,24 +925,20 @@ int CtdlTryPassword(const char *password, long len) 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 Service Remote - + } + 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. */ @@ -978,7 +954,7 @@ int purge_user(char pname[]) 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 @@ -986,12 +962,12 @@ int purge_user(char pname[]) * 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: @@ -1000,7 +976,7 @@ int purge_user(char pname[]) * 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 */ @@ -1050,7 +1026,6 @@ int internal_create_user (const char *username, long len, struct ctdluser *usbuf } - /* * create_user() - back end processing to create a new user * @@ -1155,12 +1130,11 @@ int create_user(const char *newusername, long len, int become_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 */ @@ -1169,13 +1143,11 @@ void CtdlSetPassword(char *new_pw) 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. @@ -1244,8 +1216,6 @@ int CtdlForgetThisRoom(void) { } - - /* * Traverse the user file... */ @@ -1296,8 +1266,6 @@ void ListThisUser(struct ctdluser *usbuf, void *data) } - - /* * Count the number of new mail messages the user has */ @@ -1352,7 +1320,3 @@ int InitialMailCheck() return (num_newmsgs); } - - - - -- 2.30.2