Am 28.02.2011 15:23, schrieb Stefan Hellermann:
> Am 28.02.2011 09:08, schrieb Samuli Seppänen:
>> Hi Stefan,
>>
>> I think you should rebase your patch against the "beta2.2" branch. No
>> development is done in the "allmerged" branch, it only used to aggregate
>> code from other branches.
>>
> The commit which introduces this build-failure is in the bugfix2.1
> branch. Could you apply it there and merge the patch to allmerged?
>
> Otherwise the weekly snapshots linked on
> https://community.openvpn.net/openvpn/wiki/TesterDocumentation
> do not build in the !ENABLE_PLUGIN case.
>
> The router distribution Openwrt is using these.
>
plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case [v2]
Commit 2db5a0ac3e053857d97e468de53e70a605f54561 adds two arguments to
plugin_call(...), but missed the !ENABLE_PLUGIN case. With
!ENABLE_PLUGIN, plugin_call(...) is only a dummy, so add these two
parameters there too.
---
plugin.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
There is a small copy-paste failure in the patch, the correct one below.
This one is now really run-time tested.
Signed-off-by: Stefan Hellermann <ste...@the2masters.de>
diff --git a/plugin.h b/plugin.h
index 846973f..9d48651 100644
--- a/plugin.h
+++ b/plugin.h
@@ -174,7 +174,9 @@ plugin_call (const struct plugin_list *pl,
const int type,
const struct argv *av,
struct plugin_return *pr,
- struct env_set *es)
+ struct env_set *es,
+ int current_cert_depth,
+ X509 *current_cert)
{
return 0;
}
-- 1.7.4
