Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
main: Rename process_auth_form() to avoid conflict with library
Since we're still including openconnect-internal.h in main.c, it isn't
possible to use function names that overlap with internal library
symbols.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
  • Loading branch information
cernekee committed Jan 15, 2014
1 parent 7161ed9 commit b7ea6e6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions main.c
Expand Up @@ -65,8 +65,8 @@ static void syslog_progress(void *_vpninfo,
static int validate_peer_cert(void *_vpninfo,
OPENCONNECT_X509 *peer_cert,
const char *reason);
static int process_auth_form(void *_vpninfo,
struct oc_auth_form *form);
static int process_auth_form_cb(void *_vpninfo,
struct oc_auth_form *form);
static void init_token(struct openconnect_info *vpninfo,
oc_token_mode_t token_mode, const char *token_str);

Expand Down Expand Up @@ -507,7 +507,7 @@ int main(int argc, char **argv)
vpninfo->uid_csd = 0;
vpninfo->uid_csd_given = 0;
vpninfo->validate_peer_cert = validate_peer_cert;
vpninfo->process_auth_form = process_auth_form;
vpninfo->process_auth_form = process_auth_form_cb;
vpninfo->cbdata = vpninfo;
vpninfo->cert_expire_warning = 60 * 86400;
vpninfo->vpnc_script = DEFAULT_VPNCSCRIPT;
Expand Down Expand Up @@ -1083,8 +1083,8 @@ static int validate_peer_cert(void *_vpninfo, OPENCONNECT_X509 *peer_cert,
* = 0, when form was parsed and POST required
* = 1, when response was cancelled by user
*/
static int process_auth_form(void *_vpninfo,
struct oc_auth_form *form)
static int process_auth_form_cb(void *_vpninfo,
struct oc_auth_form *form)
{
struct openconnect_info *vpninfo = _vpninfo;
struct oc_form_opt *opt;
Expand Down

0 comments on commit b7ea6e6

Please sign in to comment.