Package: openvpn-auth-ldap Version: 2.0.3-4 Followup-For: Bug #692936 Hum. It seems that this packaging is failing to build on kfreebsd, and for good reasons:
https://buildd.debian.org/status/fetch.php?pkg=openvpn-auth-ldap&arch=kfreebsd-amd64&ver=2.0.3-4&stamp=1352718255 auth-ldap.m:538:4: error: 'ret' undeclared (first use in this function) I don't know how I missed this, or why this is building here, but it shouldn't build. Here's a new patch that fixes that compile error. A. -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to fr_CA.UTF-8) Shell: /bin/sh linked to /bin/dash
Description: move address checks further down to avoid certain failures this tries to avoid certain failures with the LDAP plugin where it doesn't get passed the remoteAddress in certain cases. since we do may not care about this address, we fail only when really necessary. Author: Antoine Beaupr? <anar...@debian.org> Origin: vendor Bug: https://code.google.com/p/openvpn-auth-ldap/issues/detail?id=4 Bug-Debian: http://bugs.debian.org/692936 Forwarded: yes Last-Update: 2012-11-10 --- openvpn-auth-ldap-2.0.3.orig/src/auth-ldap.m +++ openvpn-auth-ldap-2.0.3/src/auth-ldap.m @@ -533,7 +533,10 @@ static int handle_client_connect_disconn } if (tableName) - if (!pf_client_connect_disconnect(ctx, tableName, remoteAddress, connecting)) + if (!remoteAddress) { + [TRLog debug: "No remote address supplied to OpenVPN LDAP Plugin (OPENVPN_PLUGIN_CLIENT_CONNECT)."]; + return OPENVPN_PLUGIN_FUNC_ERROR; + } else if (!pf_client_connect_disconnect(ctx, tableName, remoteAddress, connecting)) return OPENVPN_PLUGIN_FUNC_ERROR; #endif /* HAVE_PF */ @@ -587,20 +590,10 @@ openvpn_plugin_func_v1(openvpn_plugin_ha break; /* New connection established */ case OPENVPN_PLUGIN_CLIENT_CONNECT: - if (!remoteAddress) { - [TRLog debug: "No remote address supplied to OpenVPN LDAP Plugin (OPENVPN_PLUGIN_CLIENT_CONNECT)."]; - ret = OPENVPN_PLUGIN_FUNC_ERROR; - } else { - ret = handle_client_connect_disconnect(ctx, ldap, ldapUser, remoteAddress, YES); - } + ret = handle_client_connect_disconnect(ctx, ldap, ldapUser, remoteAddress, YES); break; case OPENVPN_PLUGIN_CLIENT_DISCONNECT: - if (!remoteAddress) { - [TRLog debug: "No remote address supplied to OpenVPN LDAP Plugin (OPENVPN_PLUGIN_CLIENT_DISCONNECT)."]; - ret = OPENVPN_PLUGIN_FUNC_ERROR; - } else { - ret = handle_client_connect_disconnect(ctx, ldap, ldapUser, remoteAddress, NO); - } + ret = handle_client_connect_disconnect(ctx, ldap, ldapUser, remoteAddress, NO); break; default: [TRLog debug: "Unhandled plugin type in OpenVPN LDAP Plugin (type=%d)", type];
