diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 12:09:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 12:09:54 +0200 |
| commit | c8ba2749b60eb020fb944bb338d4d2e35f71e351 (patch) | |
| tree | f6d55864de4c1a0c974240c9565c1d1cd3f23b35 /runtime/rsyslog.h | |
| parent | e0897fbe64bac6b6d2a2573942ea3373bba31414 (diff) | |
| parent | 5a09d0915baf292a1bfc3011668759534264a29a (diff) | |
| download | rsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.tar.gz rsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.tar.bz2 rsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.zip | |
Merge branch 'v7-stable'
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index e51f11bd..7cad3eae 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -3,7 +3,7 @@ * * Begun 2005-09-15 RGerhards * - * Copyright (C) 2005-2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2005-2013 by Rainer Gerhards and Adiscon GmbH * * This file is part of the rsyslog runtime library. * @@ -415,6 +415,9 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_CRY_INVLD_ALGO = -2326,/**< user specified invalid (unkonwn) crypto algorithm */ RS_RET_CRY_INVLD_MODE = -2327,/**< user specified invalid (unkonwn) crypto mode */ RS_RET_QUEUE_DISK_NO_FN = -2328,/**< disk queue configured, but filename not set */ + RS_RET_CA_CERT_MISSING = -2329,/**< a CA cert is missing where one is required (e.g. TLS) */ + RS_RET_CERT_MISSING = -2330,/**< a cert is missing where one is required (e.g. TLS) */ + RS_RET_CERTKEY_MISSING = -2331,/**< a cert (private) key is missing where one is required (e.g. TLS) */ /* up to 2350 reserved for 7.4 */ RS_RET_QUEUE_CRY_DISK_ONLY = -2351,/**< crypto provider only supported for disk-associated queues */ RS_RET_NO_DATA = -2352,/**< file has no data; more a state than a real error */ |