diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
| commit | 27360bb33ff5e87a3852ebe2673170ebea168421 (patch) | |
| tree | 4b172b4c41a32ee2baa1baceb2b23339ace077f9 /runtime/cfsysline.c | |
| parent | f8ab9d166648f2b3af11bc3523e192bb3cd79219 (diff) | |
| parent | 29cd813960ed8e4f800cb9210d30888368587f1c (diff) | |
| download | rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.gz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.xz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.zip | |
Merge branch 'v5-beta' into beta
Conflicts:
runtime/modules.c
Diffstat (limited to 'runtime/cfsysline.c')
| -rw-r--r-- | runtime/cfsysline.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index af88b3de..d8c33169 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -346,11 +346,12 @@ static int doParseOnOffOption(uchar **pp) */ static rsRetVal doGetGID(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *pVal) { - struct group *pgBuf; + struct group *pgBuf = NULL; struct group gBuf; DEFiRet; uchar szName[256]; - char stringBuf[2048]; /* I hope this is large enough... */ + int bufSize = 2048; + char * stringBuf = NULL; assert(pp != NULL); assert(*pp != NULL); @@ -360,7 +361,17 @@ static rsRetVal doGetGID(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *p ABORT_FINALIZE(RS_RET_NOT_FOUND); } - getgrnam_r((char*)szName, &gBuf, stringBuf, sizeof(stringBuf), &pgBuf); + + CHKmalloc(stringBuf = malloc(bufSize)); + while(pgBuf == NULL) { + errno = 0; + getgrnam_r((char*)szName, &gBuf, stringBuf, bufSize, &pgBuf); + if((pgBuf == NULL) && (errno == ERANGE)) { + /* Increase bufsize and try again.*/ + bufSize *= 2; + CHKmalloc(stringBuf = realloc(stringBuf, bufSize)); + } + } if(pgBuf == NULL) { errmsg.LogError(0, RS_RET_NOT_FOUND, "ID for group '%s' could not be found or error", (char*)szName); @@ -379,6 +390,7 @@ static rsRetVal doGetGID(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *p skipWhiteSpace(pp); /* skip over any whitespace */ finalize_it: + free(stringBuf); RETiRet; } |