rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 06:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,369 Commits 67 Branches 505 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
Pascal Withopf
b63a6b9010 codestyle: line length adjusted 2017-01-17 08:54:37 +01:00
Rainer Gerhards
567469f94a ommail: optimize data type use 
not only fix compiler warnings, also do some changes which may
result in very slight performance enhancements
 2016-06-01 14:54:37 +02:00
haixingood
e28d8484d7 Should be added the number of characters sent. 
Not the number of all required to be sent.

Signed-off-by: haixingood <798473496@qq.com>
 2015-12-07 19:05:29 +08:00
Rainer Gerhards
261c2ef1d6 ommail: fix SMTP response code handling 2015-12-04 14:32:15 +01:00
Rainer Gerhards
0cc1ef8ac8 Merge branch 'v8-stable' 
Conflicts:
	plugins/ommail/ommail.c
 2014-10-08 19:06:47 +02:00
Rainer Gerhards
5b501968b3 ommail: remove no longer used variable 2014-10-08 15:55:57 +02:00
Paul Freeman
f262e19111 Fix only generate a single To: rfc2822 header with comma separator for 
multiple recipients
 2014-10-08 15:42:36 +02:00
Paul Freeman
5af0aabc64 Fix typo in X-Mailer: header 2014-10-08 15:42:22 +02:00
Paul Freeman
a63052b9c1 Fix Date: header to be rfc2822 compliant 2014-10-08 15:42:09 +02:00
Paul Freeman
ada27d0242 Fix only generate a single To: rfc2822 header with comma separator for 
multiple recipients
 2014-09-30 23:51:24 +01:00
Paul Freeman
f55a83bbe8 Fix typo in X-Mailer: header 2014-09-30 22:52:41 +01:00
Paul Freeman
92d462e441 Fix Date: header to be rfc2822 compliant 2014-09-30 22:40:43 +01:00
Rainer Gerhards
b038fe58cc Merge branch 'v7-stable' into v8-stable 2014-07-22 16:21:34 +02:00
Tomas Heinrich
e5ef86334c Remove dead code 
Error: DEADCODE (CWE-561):
rsyslog-7.4.10/plugins/ommail/ommail.c:143: cond_null: Condition "(pNew = calloc(1UL, 16UL)) == NULL", taking true branch. Now the value of "pNew" is NULL.
rsyslog-7.4.10/plugins/ommail/ommail.c:153: null: At condition "pNew != NULL", the value of "pNew" must be NULL.
rsyslog-7.4.10/plugins/ommail/ommail.c:153: dead_error_condition: The condition "pNew != NULL" cannot be true.
rsyslog-7.4.10/plugins/ommail/ommail.c:154: dead_error_line: Execution cannot reach this statement "free(pNew);".
 2014-07-22 16:10:24 +02:00
Rainer Gerhards
b0fa4593af ommail: add support for RainerScript config system [action() object] 
This finally adds support for the new config style. Also, we now permit
to set a constant subject text without the need to create a template for
it.
We also did some nitfixes.
 2014-07-22 11:13:32 +02:00
Rainer Gerhards
1f8be44f8e ommail: small cleanup 2013-11-12 14:16:04 +01:00
Rainer Gerhards
fea2aac346 ommail: support v8 omod interface 2013-11-12 14:09:57 +01:00
Andre Lorbach
b0fbe9452f Removed SPACE after "MAIL FROM:" and "RCPT TO:" as RFC5321 permits spaces. 2013-08-14 13:59:38 +02:00
Rainer Gerhards
d9df6e9775 bugfix: modules not (yet) supporting new conf format were not properly registered 
This lead to a "module not found" error message instead of
the to-be-expected "module does not support new style" error message.
That invalid error message could be quite misleading and actually stop
people from addressing the real problem (aka "go nuts" ;))
 2012-11-28 10:02:08 +01:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c
 2012-01-19 13:07:46 +01:00
Rainer Gerhards
b38dd53e08 undoing v6.1 config scoping interface, part II (now finished) 
This concludes the removal of the new scoping interface, at least as
far as pre v6-plugins are affected. Full code cleanup will happen
in the v6.3 branch.
 2012-01-19 12:33:12 +01:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master 
Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c
 2012-01-18 14:08:24 +01:00
Rainer Gerhards
fe4cfa6d1f Merge branch 'v5-stable' into v6-stable 
Conflicts:
	plugins/imtcp/imtcp.c
 2012-01-14 18:35:09 +01:00
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
 2012-01-14 18:32:40 +01:00
Rainer Gerhards
0216053099 relicense parts under ASL 2.0 
after carful check for copyright holder
 2012-01-11 18:30:33 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
bbe1f2688c renaming conf.* wasn't a good idea -- undoing 
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
 2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741 renamed conf.c to legacyconf.c to make room for new config system 2011-04-19 07:53:23 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta' 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
 2011-03-11 10:24:58 +01:00
Bojan Smojver
d1eb6e0edc added work-around for bug in gtls, which causes fd leak when using TLS 
The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-02-23 11:25:43 +01:00
Rainer Gerhards
d460c1cd5d fixed regression from last commit 
config variables were not properly initialized
 2010-07-27 11:38:25 +02:00
Rainer Gerhards
d18b238f16 milestone commit: output plugin interface changes (may NOT run) 
The output interface has been changed, but we do not yet utilize the
new interface. Also, it looks like a regression was introduced. But before
hunting it down, I'd like to make a commit (what also easys the regresion
hunt).
 2010-07-27 09:44:35 +02:00
Rainer Gerhards
e64cd21243 moving towards scoping inside rsyslog.conf 
first step: adding object-type specifier to config statement table
 2010-07-21 18:08:19 +02:00
Rainer Gerhards
8b246de2a5 some light performance enhancement 
...by replacing time() call with much faster (at least under linux)
gettimeofday() calls.
 2009-11-12 17:12:10 +01:00
Rainer Gerhards
e3d9843c85 re-enabled pipe, tty and console in omfile 
... by moving code to stream.c. Thanks to the new design, new cases are
not really needed, resulting in cleaner code.

I also did a cleanup of header file usage as a side-activity.
 2009-06-12 11:47:00 +02:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase 
pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
 2009-02-24 13:09:44 +01:00
Rainer Gerhards
15adf8f1fd bugfix: IPv6 addresses could not be specified in forwarding actions 
New syntax @[addr]:port introduced to enable that. Root problem was IPv6
addresses contain colons.
Also somewhat enhanced debugging messages.
 2008-08-05 15:02:49 +02:00
Rainer Gerhards
103ccc1801 enhanced ommail to support multiple email recipients. 
This is done by specifying $ActionMailTo multiple times. Note that this introduces a
small incompatibility to previous config file syntax: the recipient
list is now reset for each action (we honestly believe that will
not cause any problem - apologies if it does).
 2008-08-04 14:55:02 +02:00
Rainer Gerhards
989d8413a1 applied ErrLog interface change to ommail 2008-07-01 12:39:57 +02:00
Rainer Gerhards
e1791996b8 moved host/domain-name related variables to global data pool 2008-04-17 10:58:30 +02:00
Rainer Gerhards
d9b0c77d3e some more cleanup 
reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear
 2008-04-16 15:27:53 +02:00
Rainer Gerhards
d7f33053da made everything compile with the new runtime subdirectory 2008-04-16 08:42:00 +02:00
Rainer Gerhards
413fba03dc finalized mail output support 2008-04-08 11:48:07 +02:00
Rainer Gerhards
160ab44ef9 finishing core ommail plugin 2008-04-08 10:36:48 +02:00
Rainer Gerhards
d9dd85d4dc clean implementation of smtp protcol and rsyslog retries 2008-04-08 09:39:21 +02:00
Rainer Gerhards
3621234f98 smtp response codes are now correctly checked 2008-04-07 16:19:36 +02:00
Rainer Gerhards
e4d27e77e8 got a bit closer to real SMTP ;) 2008-04-04 18:24:47 +00:00
Rainer Gerhards
0d5d42c522 an initial, somewhat working, tester for the mail functionality 2008-04-04 16:57:25 +00:00
Rainer Gerhards
6a3b85a41c cleanup of previous code, ready to implement smtp 2008-04-04 13:43:09 +00:00