|
 |
a562a9 |
diff -up rsyslog-8.1911.0/grammar/rainerscript.c.orig rsyslog-8.1911.0/grammar/rainerscript.c
|
|
|
a562a9 |
--- rsyslog-8.1911.0/grammar/rainerscript.c.orig 2021-04-06 13:43:55.366523373 +0200
|
|
|
a562a9 |
+++ rsyslog-8.1911.0/grammar/rainerscript.c 2021-04-06 13:44:40.039239056 +0200
|
|
|
a562a9 |
@@ -905,15 +905,29 @@ static int
|
|
|
a562a9 |
doGetGID(struct nvlst *valnode, struct cnfparamdescr *param,
|
|
|
a562a9 |
struct cnfparamvals *val)
|
|
|
a562a9 |
{
|
|
|
a562a9 |
- char *cstr;
|
|
|
a562a9 |
- int r;
|
|
|
a562a9 |
- struct group *resultBuf;
|
|
|
a562a9 |
- struct group wrkBuf;
|
|
|
a562a9 |
- char stringBuf[2048]; /* 2048 has been proven to be large enough */
|
|
|
a562a9 |
+ char *cstr;
|
|
|
a562a9 |
+ int r;
|
|
|
a562a9 |
+ struct group *resultBuf = NULL;
|
|
|
a562a9 |
+ struct group wrkBuf;
|
|
|
a562a9 |
+ char *stringBuf = NULL;
|
|
|
a562a9 |
+ size_t bufSize = 1024;
|
|
|
a562a9 |
+ int e;
|
|
|
a562a9 |
+
|
|
|
a562a9 |
+ cstr = es_str2cstr(valnode->val.d.estr, NULL);
|
|
|
a562a9 |
+ do {
|
|
|
a562a9 |
+ char *p;
|
|
|
a562a9 |
+
|
|
|
a562a9 |
+ /* Increase bufsize and try again.*/
|
|
|
a562a9 |
+ bufSize *= 2;
|
|
|
a562a9 |
+ p = realloc(stringBuf, bufSize);
|
|
|
a562a9 |
+ if(!p) {
|
|
|
a562a9 |
+ e = ENOMEM;
|
|
|
a562a9 |
+ break;
|
|
|
a562a9 |
+ }
|
|
|
a562a9 |
+ stringBuf = p;
|
|
|
a562a9 |
+ e = getgrnam_r(cstr, &wrkBuf, stringBuf, bufSize, &resultBuf);
|
|
|
a562a9 |
+ } while(!resultBuf && (e == ERANGE));
|
|
|
a562a9 |
|
|
|
a562a9 |
- cstr = es_str2cstr(valnode->val.d.estr, NULL);
|
|
|
a562a9 |
- const int e = getgrnam_r(cstr, &wrkBuf, stringBuf,
|
|
|
a562a9 |
- sizeof(stringBuf), &resultBuf);
|
|
|
a562a9 |
if(resultBuf == NULL) {
|
|
|
a562a9 |
if(e != 0) {
|
|
|
a562a9 |
LogError(e, RS_RET_ERR, "parameter '%s': error to "
|
|
|
a562a9 |
@@ -929,6 +943,7 @@ doGetGID(struct nvlst *valnode, struct c
|
|
|
a562a9 |
param->name, (int) resultBuf->gr_gid, cstr);
|
|
|
a562a9 |
r = 1;
|
|
|
a562a9 |
}
|
|
|
a562a9 |
+ free(stringBuf);
|
|
|
a562a9 |
free(cstr);
|
|
|
a562a9 |
return r;
|
|
|
a562a9 |
}
|