Commit 65fa0ebb authored by Hardy Simpson's avatar Hardy Simpson

Merge branch 'tmp'

Conflicts:
	src/makefile
parents 0c5160e9 1a9726c6
......@@ -153,6 +153,7 @@ dep:
$(CC) -MM *.c
# Installation target
ifeq ($(uname_S),SunOS)
INSTALL?= cp -r
endif
......
......@@ -483,24 +483,25 @@ static int syslog_facility_atoi(char *facility)
*/
zc_assert(facility, -187);
if (STRICMP(facility, ==, "LOG_LOCAL0"))
return LOG_LOCAL0;
if (STRICMP(facility, ==, "LOG_LOCAL1"))
return LOG_LOCAL1;
if (STRICMP(facility, ==, "LOG_LOCAL2"))
return LOG_LOCAL2;
if (STRICMP(facility, ==, "LOG_LOCAL3"))
return LOG_LOCAL3;
if (STRICMP(facility, ==, "LOG_LOCAL4"))
return LOG_LOCAL4;
if (STRICMP(facility, ==, "LOG_LOCAL5"))
return LOG_LOCAL5;
if (STRICMP(facility, ==, "LOG_LOCAL6"))
return LOG_LOCAL6;
if (STRICMP(facility, ==, "LOG_LOCAL7"))
return LOG_LOCAL7;
if (STRICMP(facility, ==, "LOG_USER"))
return LOG_USER;
if (STRICMP(facility, ==, "LOG_LOCAL0")) return LOG_LOCAL0;
if (STRICMP(facility, ==, "LOG_LOCAL1")) return LOG_LOCAL1;
if (STRICMP(facility, ==, "LOG_LOCAL2")) return LOG_LOCAL2;
if (STRICMP(facility, ==, "LOG_LOCAL3")) return LOG_LOCAL3;
if (STRICMP(facility, ==, "LOG_LOCAL4")) return LOG_LOCAL4;
if (STRICMP(facility, ==, "LOG_LOCAL5")) return LOG_LOCAL5;
if (STRICMP(facility, ==, "LOG_LOCAL6")) return LOG_LOCAL6;
if (STRICMP(facility, ==, "LOG_LOCAL7")) return LOG_LOCAL7;
if (STRICMP(facility, ==, "LOG_USER")) return LOG_USER;
if (STRICMP(facility, ==, "LOG_AUTHPRIV")) return LOG_AUTHPRIV;
if (STRICMP(facility, ==, "LOG_CRON")) return LOG_CRON;
if (STRICMP(facility, ==, "LOG_DAEMON")) return LOG_DAEMON;
if (STRICMP(facility, ==, "LOG_FTP")) return LOG_FTP;
if (STRICMP(facility, ==, "LOG_KERN")) return LOG_KERN;
if (STRICMP(facility, ==, "LOG_LPR")) return LOG_LPR;
if (STRICMP(facility, ==, "LOG_MAIL")) return LOG_MAIL;
if (STRICMP(facility, ==, "LOG_NEWS")) return LOG_NEWS;
if (STRICMP(facility, ==, "LOG_SYSLOG")) return LOG_SYSLOG;
return LOG_AUTHPRIV;
zc_error("wrong syslog facility[%s], must in LOG_LOCAL[0-7] or LOG_USER", facility);
return -187;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment