diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-11 11:51:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-11 11:51:25 +0200 |
| commit | db36d734a2aaa4600e39ec438c73b2432160e446 (patch) | |
| tree | 2b84b45739550fc40fe041e9f588768137801077 | |
| parent | de8d8b89a4d3fc4e6cff6b8ab26132896624421e (diff) | |
| download | rsyslog-db36d734a2aaa4600e39ec438c73b2432160e446.tar.gz rsyslog-db36d734a2aaa4600e39ec438c73b2432160e446.tar.bz2 rsyslog-db36d734a2aaa4600e39ec438c73b2432160e446.zip | |
regression fix: message properties did not work
This was a regeression from the global/local variabe work done for this release.
Consequently, this problem did not occur in any released version.
| -rw-r--r-- | runtime/msg.c | 2 | ||||
| -rw-r--r-- | runtime/rsconf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 4221efe3..f3181898 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3801,7 +3801,7 @@ msgGetMsgVarNew(msg_t *pThis, uchar *name) /* always call MsgGetProp() without a template specifier */ /* TODO: optimize propNameToID() call -- rgerhards, 2009-06-26 */ propNameStrToID(name, &propid); - propName = es_newStrFromCStr((char*)name+1, ustrlen(name)-1); // TODO: optimize! + propName = es_newStrFromCStr((char*)name, ustrlen(name)); // TODO: optimize! pszProp = (uchar*) MsgGetProp(pThis, NULL, propid, propName, &propLen, &bMustBeFreed, NULL); es_deleteStr(propName); diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 1c0e33c3..2cfb1691 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -486,7 +486,7 @@ cnfGetVar(char *name, void *usrptr) else if(name[1] == '!') estr = msgGetCEEVarNew((msg_t*) usrptr, name+2); else - estr = msgGetMsgVarNew((msg_t*) usrptr, (uchar*)name); + estr = msgGetMsgVarNew((msg_t*) usrptr, (uchar*)name+1); } else { /* if this happens, we have a program logic error */ estr = es_newStrFromCStr("err: var must start with $", sizeof("err: var must start with $")-1); |