diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:14:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:14:39 +0100 |
| commit | 5f3d6db7965ae7ac247ed0be9c37f0e8df2dfc84 (patch) | |
| tree | 0f99ee628fd3e312c368cb417012722861b43a97 | |
| parent | 66dcd68d625f9afe22fced995696ef654e8abe37 (diff) | |
| parent | 72bb5828771e56be6ab066195c7967c69595570e (diff) | |
| download | rsyslog-5f3d6db7965ae7ac247ed0be9c37f0e8df2dfc84.tar.gz rsyslog-5f3d6db7965ae7ac247ed0be9c37f0e8df2dfc84.tar.bz2 rsyslog-5f3d6db7965ae7ac247ed0be9c37f0e8df2dfc84.zip | |
Merge branch 'v7-stable-libnet-frag'
Conflicts:
runtime/rsyslog.h
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index 82331e17..4f37fd8c 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -542,7 +542,7 @@ static rsRetVal doTryResume(instanceData *pData) if(pData->libnet_handle == NULL) { if(pData->bReportLibnetInitErr) { - errmsg.LogError(0, RS_RET_LIBNET_INIT_FAILED, "omudpsoof: error " + errmsg.LogError(0, RS_RET_ERR_LIBNET_INIT, "omudpsoof: error " "initializing libnet - are you running as root?"); pData->bReportLibnetInitErr = 0; } diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 5b06e7a3..936a76e2 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -323,7 +323,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ERR_DOOR = -2147, /**< some problems with handling the Solaris door functionality */ RS_RET_NO_SRCNAME_TPL = -2150, /**< sourcename template was not specified where one was needed (omudpspoof spoof addr) */ RS_RET_HOST_NOT_SPECIFIED = -2151, /**< (target) host was not specified where it was needed */ - RS_RET_ERR_LIBNET_INIT = -2152, /**< error initializing libnet */ + RS_RET_ERR_LIBNET_INIT = -2152, /**< error initializing libnet, e.g. because not running as root */ RS_RET_FORCE_TERM = -2153, /**< thread was forced to terminate by bShallShutdown, a state, not an error */ RS_RET_RULES_QUEUE_EXISTS = -2154,/**< we were instructed to create a new ruleset queue, but one already exists */ RS_RET_NO_CURR_RULESET = -2155,/**< no current ruleset exists (but one is required) */ @@ -398,7 +398,6 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_DS_PROP_SEQ_ERR = -2308,/**< property sequence error deserializing object */ RS_RET_TPL_INVLD_PROP = -2309,/**< property name error in template (unknown name) */ RS_RET_NO_RULEBASE = -2310,/**< mmnormalize: rulebase can not be found or otherwise invalid */ - RS_RET_LIBNET_INIT_FAILED = -2311,/**< libnet_init() failed, probably because of not running as root */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |