git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0574cb
)
Builtin macros for log_selector values
author
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 20 Aug 2018 11:46:16 +0000
(12:46 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 21 Aug 2018 18:26:44 +0000
(19:26 +0100)
doc/doc-docbook/spec.xfpt
patch
|
blob
|
history
doc/doc-txt/NewStuff
patch
|
blob
|
history
src/src/macro_predef.c
patch
|
blob
|
history
src/src/macro_predef.h
patch
|
blob
|
history
src/src/readconf.c
patch
|
blob
|
history
diff --git
a/doc/doc-docbook/spec.xfpt
b/doc/doc-docbook/spec.xfpt
index ff945eebd23f1ca6a8d2c67c78c1a997260830ee..a9b5d968e5c6ca057af17dce49f8426ffb876641 100644
(file)
--- a/
doc/doc-docbook/spec.xfpt
+++ b/
doc/doc-docbook/spec.xfpt
@@
-5076,6
+5076,7
@@
The following classes of macros are defined:
&` _DRIVER_ROUTER_* `& router drivers
&` _DRIVER_TRANSPORT_* `& transport drivers
&` _DRIVER_AUTHENTICATOR_* `& authenticator drivers
&` _DRIVER_ROUTER_* `& router drivers
&` _DRIVER_TRANSPORT_* `& transport drivers
&` _DRIVER_AUTHENTICATOR_* `& authenticator drivers
+&` _LOG_* `& log_selector values
&` _OPT_MAIN_* `& main config options
&` _OPT_ROUTERS_* `& generic router options
&` _OPT_TRANSPORTS_* `& generic transport options
&` _OPT_MAIN_* `& main config options
&` _OPT_ROUTERS_* `& generic router options
&` _OPT_TRANSPORTS_* `& generic transport options
diff --git
a/doc/doc-txt/NewStuff
b/doc/doc-txt/NewStuff
index e22f759c7de684bab64a74bb2d6e37efb765ebc0..dd2645d863e7967cfe8809755a73bc33d0e2cb36 100644
(file)
--- a/
doc/doc-txt/NewStuff
+++ b/
doc/doc-txt/NewStuff
@@
-23,6
+23,8
@@
Version 4.92
5. A "pipelining" log_selector.
5. A "pipelining" log_selector.
+ 6. Builtin macros for supported log_selector values.
+
Version 4.91
--------------
Version 4.91
--------------
diff --git
a/src/src/macro_predef.c
b/src/src/macro_predef.c
index 1073e45a6a7d60786434b22202e89e010075534a..0a22eec2f4c9987d97d41c71bcf2bd309b344e9c 100644
(file)
--- a/
src/src/macro_predef.c
+++ b/
src/src/macro_predef.c
@@
-284,6
+284,7
@@
options_main();
options_routers();
options_transports();
options_auths();
options_routers();
options_transports();
options_auths();
+options_logging();
}
static void
}
static void
diff --git
a/src/src/macro_predef.h
b/src/src/macro_predef.h
index 50b61a897a67ab873909ea22e29f06a0c3d3f047..7eeaa9692cacbeed7d51aeaa358bc9a228af7789 100644
(file)
--- a/
src/src/macro_predef.h
+++ b/
src/src/macro_predef.h
@@
-18,5
+18,6
@@
extern void options_main(void);
extern void options_routers(void);
extern void options_transports(void);
extern void options_auths(void);
extern void options_routers(void);
extern void options_transports(void);
extern void options_auths(void);
+extern void options_logging(void);
extern void params_dkim(void);
extern void params_dkim(void);
diff --git
a/src/src/readconf.c
b/src/src/readconf.c
index bf024efc9ed0488b7fcc1465373e6af8e38669d0..875e032222f0ee435f8e5d13bada48673c539e84 100644
(file)
--- a/
src/src/readconf.c
+++ b/
src/src/readconf.c
@@
-409,6
+409,19
@@
for (ai = auths_available; ai->driver_name[0]; ai++)
}
}
}
}
+void
+options_logging(void)
+{
+bit_table * bp;
+uschar buf[64];
+
+for (bp = log_options; bp < log_options + log_options_count; bp++)
+ {
+ spf(buf, sizeof(buf), US"_LOG_%T", bp->name);
+ builtin_macro_create(buf);
+ }
+}
+
#else /*!MACRO_PREDEF*/
#else /*!MACRO_PREDEF*/