-r 1026:1032

https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn

Changes:
1. Updated makefile.w32-vc to include lladdr.*, updated
linkage libraries.
2. Modified lladdr.c to be compiled under visual C.
3. Added retry counter to PKCS#11 PIN hook.
4. Modified PKCS#11 PIN retry loop to return correct error
code when PIN is incorrect.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1038 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 2 insertions, 1 deletions

diff --git a/lladdr.c b/lladdr.c
index d6fb0a6..1f02ba4 100644
--- a/lladdr.c
+++ b/lladdr.c
@@ -16,6 +16,7 @@ int set_lladdr(const char *ifname, const char *lladdr,
 		const struct env_set *es)
 {
   char cmd[256];
+  int r;
 
   if (!ifname || !lladdr)
     return -1;
@@ -51,7 +52,7 @@ int set_lladdr(const char *ifname, const char *lladdr,
       return -1;
 #endif
 
-  int r = system_check (cmd, es, M_WARN, "ERROR: Unable to set link layer address.");
+  r = system_check (cmd, es, M_WARN, "ERROR: Unable to set link layer address.");
   if (r)
     msg (M_INFO, "TUN/TAP link layer address set to %s", lladdr);
   return r;