2669cb8cc6
resolves: rhbz#1972058 Close dir when fsync=on resolves: rhbz#1972069 Do not exit when user/group can not be found resolves: rhbz#1990868 Remove abortOnIDResolution fail Always use message severity when comparing with ratelimit severity resolves: rhbz#1990869
103 lines
4.8 KiB
Diff
103 lines
4.8 KiB
Diff
diff -up rsyslog-8.2102.0/runtime/cfsysline.c.orig rsyslog-8.2102.0/runtime/cfsysline.c
|
|
--- rsyslog-8.2102.0/runtime/cfsysline.c.orig 2021-08-04 07:16:02.663163106 +0200
|
|
+++ rsyslog-8.2102.0/runtime/cfsysline.c 2021-08-04 07:18:05.952490008 +0200
|
|
@@ -353,13 +353,8 @@ static rsRetVal doGetGID(uchar **pp, rsR
|
|
assert(*pp != NULL);
|
|
|
|
if(getSubString(pp, (char*) szName, sizeof(szName), ' ') != 0) {
|
|
- if(loadConf->globals.abortOnIDResolutionFail) {
|
|
- fprintf(stderr, "could not extract group name: %s\n", (char*)szName);
|
|
- exit(1); /* good exit */
|
|
- } else {
|
|
- LogError(0, RS_RET_NOT_FOUND, "could not extract group name");
|
|
- ABORT_FINALIZE(RS_RET_NOT_FOUND);
|
|
- }
|
|
+ LogError(0, RS_RET_NOT_FOUND, "could not extract group name");
|
|
+ ABORT_FINALIZE(RS_RET_NOT_FOUND);
|
|
}
|
|
|
|
do {
|
|
@@ -380,10 +375,6 @@ static rsRetVal doGetGID(uchar **pp, rsR
|
|
LogError(0, RS_RET_NOT_FOUND, "ID for group '%s' could not be found", szName);
|
|
}
|
|
iRet = RS_RET_NOT_FOUND;
|
|
- if(loadConf->globals.abortOnIDResolutionFail) {
|
|
- fprintf(stderr, "ID for group '%s' could not be found or error\n", szName);
|
|
- exit(1); /* good exit */
|
|
- }
|
|
} else {
|
|
if(pSetHdlr == NULL) {
|
|
/* we should set value directly to var */
|
|
@@ -418,25 +409,15 @@ static rsRetVal doGetUID(uchar **pp, rsR
|
|
assert(*pp != NULL);
|
|
|
|
if(getSubString(pp, (char*) szName, sizeof(szName), ' ') != 0) {
|
|
- if(loadConf->globals.abortOnIDResolutionFail) {
|
|
- fprintf(stderr, "could not extract user name: %s\n", (char*)szName);
|
|
- exit(1); /* good exit */
|
|
- } else {
|
|
- LogError(0, RS_RET_NOT_FOUND, "could not extract user name");
|
|
- ABORT_FINALIZE(RS_RET_NOT_FOUND);
|
|
- }
|
|
+ LogError(0, RS_RET_NOT_FOUND, "could not extract user name");
|
|
+ ABORT_FINALIZE(RS_RET_NOT_FOUND);
|
|
}
|
|
|
|
getpwnam_r((char*)szName, &pwBuf, stringBuf, sizeof(stringBuf), &ppwBuf);
|
|
|
|
if(ppwBuf == NULL) {
|
|
- if(loadConf->globals.abortOnIDResolutionFail) {
|
|
- fprintf(stderr, "ID for user '%s' could not be found or error\n", (char*)szName);
|
|
- exit(1); /* good exit */
|
|
- } else {
|
|
- LogError(0, RS_RET_NOT_FOUND, "ID for user '%s' could not be found or error", (char*)szName);
|
|
- iRet = RS_RET_NOT_FOUND;
|
|
- }
|
|
+ LogError(0, RS_RET_NOT_FOUND, "ID for user '%s' could not be found or error", (char*)szName);
|
|
+ iRet = RS_RET_NOT_FOUND;
|
|
} else {
|
|
if(pSetHdlr == NULL) {
|
|
/* we should set value directly to var */
|
|
diff -up rsyslog-8.2102.0/runtime/glbl.c.orig rsyslog-8.2102.0/runtime/glbl.c
|
|
--- rsyslog-8.2102.0/runtime/glbl.c.orig 2021-08-04 07:18:19.301633677 +0200
|
|
+++ rsyslog-8.2102.0/runtime/glbl.c 2021-08-04 07:19:02.409019106 +0200
|
|
@@ -210,7 +210,6 @@ static struct cnfparamdescr cnfparamdesc
|
|
{ "environment", eCmdHdlrArray, 0 },
|
|
{ "processinternalmessages", eCmdHdlrBinary, 0 },
|
|
{ "umask", eCmdHdlrFileCreateMode, 0 },
|
|
- { "security.abortonidresolutionfail", eCmdHdlrBinary, 0 },
|
|
{ "internal.developeronly.options", eCmdHdlrInt, 0 },
|
|
{ "internalmsg.ratelimit.interval", eCmdHdlrPositiveInt, 0 },
|
|
{ "internalmsg.ratelimit.burst", eCmdHdlrPositiveInt, 0 },
|
|
@@ -1443,8 +1442,6 @@ glblDoneLoadCnf(void)
|
|
glblInputTimeoutShutdown = (int) cnfparamvals[i].val.d.n;
|
|
} else if(!strcmp(paramblk.descr[i].name, "privdrop.group.keepsupplemental")) {
|
|
loadConf->globals.gidDropPrivKeepSupplemental = (int) cnfparamvals[i].val.d.n;
|
|
- } else if(!strcmp(paramblk.descr[i].name, "security.abortonidresolutionfail")) {
|
|
- loadConf->globals.abortOnIDResolutionFail = (int) cnfparamvals[i].val.d.n;
|
|
} else if(!strcmp(paramblk.descr[i].name, "net.acladdhostnameonfail")) {
|
|
*(net.pACLAddHostnameOnFail) = (int) cnfparamvals[i].val.d.n;
|
|
} else if(!strcmp(paramblk.descr[i].name, "net.aclresolvehostname")) {
|
|
diff -up rsyslog-8.2102.0/runtime/rsconf.c.orig rsyslog-8.2102.0/runtime/rsconf.c
|
|
--- rsyslog-8.2102.0/runtime/rsconf.c.orig 2021-08-04 07:19:13.103104854 +0200
|
|
+++ rsyslog-8.2102.0/runtime/rsconf.c 2021-08-04 07:19:44.635357684 +0200
|
|
@@ -156,7 +156,6 @@ static void cnfSetDefaults(rsconf_t *pTh
|
|
pThis->globals.maxErrMsgToStderr = -1;
|
|
pThis->globals.umask = -1;
|
|
pThis->globals.gidDropPrivKeepSupplemental = 0;
|
|
- pThis->globals.abortOnIDResolutionFail = 1;
|
|
pThis->templates.root = NULL;
|
|
pThis->templates.last = NULL;
|
|
pThis->templates.lastStatic = NULL;
|
|
diff -up rsyslog-8.2102.0/runtime/rsconf.h.orig rsyslog-8.2102.0/runtime/rsconf.h
|
|
--- rsyslog-8.2102.0/runtime/rsconf.h.orig 2021-08-04 07:20:15.848607958 +0200
|
|
+++ rsyslog-8.2102.0/runtime/rsconf.h 2021-08-04 07:20:42.782823920 +0200
|
|
@@ -73,7 +73,6 @@ struct globals_s {
|
|
int uidDropPriv; /* user-id to which priveleges should be dropped to */
|
|
int gidDropPriv; /* group-id to which priveleges should be dropped to */
|
|
int gidDropPrivKeepSupplemental; /* keep supplemental groups when dropping? */
|
|
- int abortOnIDResolutionFail;
|
|
int umask; /* umask to use */
|
|
uchar *pszConfDAGFile; /* name of config DAG file, non-NULL means generate one */
|
|
|