Skip to contentSkip to conversation

plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case

PATCH In review Stefan Hellermann 3 participants 6 messages Feb 27, 2011 – Feb 28, 2011 1 message not in the archive

lore
Share & tools
lore

Stefan Hellermann

author
#0 lore raw

PATCH 1/1 plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case

plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case

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(-)

This is my first patch with git, is everything correct? This patch is against the allmerged branch.

Regards,
Stefan

plugin.h +3 -1
index 846973f..9d48651 100644
@@ -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;
 }
Signature · 1 line
1.7.4
#1 lore raw
Quoted 8 lines

plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case

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.

Quoted 8 lines
---
 plugin.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

This is my first patch with git, is everything correct? This patch is against the allmerged branch.

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.

Signature · 5 lines
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock
author
#2 lore raw

Am 28.02.2011 09:08, schrieb Samuli Seppänen:

Quoted 16 lines
Quoted 8 lines

plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case

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.

Quoted 8 lines
---
 plugin.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

This is my first patch with git, is everything correct? This patch is against the allmerged branch.

Quoted 6 lines

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.

Regards,
Stefan

author
#3 lore raw

PATCH 1/1 plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case [v2]

Am 28.02.2011 15:23, schrieb Stefan Hellermann:

Quoted 7 lines

Am 28.02.2011 09:08, schrieb Samuli Seppänen:

Quoted 6 lines

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.

Quoted 9 lines

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 <[email protected]...>
plugin.h +3 -1
index 846973f..9d48651 100644
@@ -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

Applied
#4 lore raw

Re: [Openvpn-devel] [PATCH] plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case [v2]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 30 lines · Stefan Hellermann

Am 28.02.2011 15:23, schrieb Stefan Hellermann:

Quoted 7 lines

Am 28.02.2011 09:08, schrieb Samuli Seppänen:

Quoted 6 lines

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.

Quoted 9 lines

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(-)
Quoted 4 lines

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 <[email protected]...>

ACK!

Thanks a lot for this fix. Good catch!

Applied to bugfix2.1 and merged into allmerged.

commit 4c4b8cedfa98e8892a53eadd154836f8fa8cea7a

Author: Stefan Hellermann <[email protected]...>
Date:   Sun Feb 27 22:15:44 2011 +0100
    Signed-off-by: Stefan Hellermann <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>

You asked earlier if this patch was good, and I see you managed to add the "Signed-off-by:" line (git commit -s). So this basically looks good to me!

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk1rwdEACgkQDC186MBRfrq+9gCdGgk78cFkcXo+Oc1yEFi7Y5l0 SDkAni0Oa4lDyvK/9OrIwOAIeaEWFpVT
=RoHL
-----END PGP SIGNATURE-----

A message that is not in the archive (sent off-list or not yet received): [email protected]...

Acked-by
#6 lore raw

Re: [Openvpn-devel] [PATCH] plugin.h: update prototype of plugin_call dummy in !ENABLE_PLUGIN case [v2]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 24 lines · Stefan Hellermann
Quoted 9 lines

Thanks a lot for this fix. Good catch!

Applied to bugfix2.1 and merged into allmerged.

commit 4c4b8cedfa98e8892a53eadd154836f8fa8cea7a

Author: Stefan Hellermann <[email protected]...>
Date:   Sun Feb 27 22:15:44 2011 +0100
Quoted 7 lines
    Signed-off-by: Stefan Hellermann <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>

You asked earlier if this patch was good, and I see you managed to add the "Signed-off-by:" line (git commit -s). So this basically looks good to me!

Sorry, the E-Mail with the Signed-off-by: was a patch v2, the last changed line has a ";" too much.
The incremental diff:

plugin.h plugin_call (const struct plugin_list *pl, · line 179

Quoted 5 lines
plugin.h +1 -1
@@ -176,7 +176,7 @@ plugin_call (const struct plugin_list *pl,
             struct plugin_return *pr,
             struct env_set *es,
             int current_cert_depth,
-            X509 *current_cert);
+            X509 *current_cert)

Gah! I managed to somehow mix stuff up. Sorry about that. I've applied a new commit with this patch with you as the author and Signed-off-by. I'm sorry about that mess. Even though I did a 'make distcheck' without failures. But I might have missed a warning.

For patches which replaces earlier ones, please emphasize what the difference is, then it easier to see that I work with the proper patches.

commit 2b7e41f39f54b68b515c9aa9053ca07bf54974a8

Author: Stefan Hellermann <[email protected]...>
Date:   Mon Feb 28 16:53:26 2011 +0100

Fixed typo in plugin.h

A additional ';' had sneaked in commit 4c4b8cedfa98e8892a53. Lets kick it out again.

Signed-off-by Stefan Hellermann <[email protected]...>
Acked-by David Sommerseth <[email protected]...>
Signed-off-by David Sommerseth <[email protected]...>

Kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk1rxsIACgkQDC186MBRfro6RACfcuzzJ5b/kVXqMqLDJ6CPKQhF /cwAnigYwfBBG1O1thR2kOqiVUoy21sr
=zN1n
-----END PGP SIGNATURE-----