snprintf(lockfilename, sizeof lockfilename, "%s/citadel.lock", ctdl_run_dir);
fp = fopen(lockfilename, "w");
if (!fp) {
- syslog(LOG_ERR, "%s: %s", lockfilename, strerror(errno));
+ syslog(LOG_ERR, "%s: %m", lockfilename);
exit(CTDLEXIT_DB);
}
if (flock(fileno(fp), (LOCK_EX|LOCK_NB)) != 0) {
int relh=0;
int home=0;
int dbg=0;
+ int max_log_level = LOG_INFO;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
int syslog_facility = LOG_DAEMON;
break;
case 'x':
- /* deprecated */
+ max_log_level = atoi(optarg);
break;
case 't': /* deprecated */
fprintf(stderr, "citserver: usage: "
"citserver "
"[-l LogFacility] "
+ "[-x MaxLogLevel] "
"[-d] [-D] [-r] "
"[-u user] "
"[-h HomeDir]\n"
}
StartLibCitadel(basesize);
+ setlogmask(LOG_UPTO(max_log_level));
openlog("citserver",
( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
syslog_facility
#endif // HAVE_GETPWUID_R
if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST)) {
- syslog(LOG_ERR, "main: unable to create run directory [%s]: %s", ctdl_run_dir, strerror(errno));
+ syslog(LOG_ERR, "main: unable to create run directory [%s]: %m", ctdl_run_dir);
}
if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0) {
- syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %s", ctdl_run_dir, strerror(errno));
+ syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %m", ctdl_run_dir);
}
}
#endif
#endif // HAVE_GETPWUID_R
if (pwp == NULL)
- syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %s" "Group IDs will be incorrect.", (long)CTDLUID, strerror(errno));
+ syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)CTDLUID);
else {
initgroups(pw.pw_name, pw.pw_gid);
if (setgid(pw.pw_gid))
- syslog(LOG_ERR, "main: setgid(%ld): %s", (long)pw.pw_gid, strerror(errno));
+ syslog(LOG_ERR, "main: setgid(%ld): %m", (long)pw.pw_gid);
}
syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID);
if (setuid(CTDLUID) != 0) {
- syslog(LOG_ERR, "main: setuid() failed: %s", strerror(errno));
+ syslog(LOG_ERR, "main: setuid() failed: %m");
}
#if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
prctl(PR_SET_DUMPABLE, 1);