1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 05:01:29 +00:00

Changes to svn_auth.c to compile on Windows.

This commit is contained in:
david
2012-01-02 03:20:46 +00:00
parent eeecdea68d
commit 0aee7fc4a2
3 changed files with 22 additions and 4 deletions

View File

@@ -37,6 +37,20 @@
#include <svn_types.h> #include <svn_types.h>
#endif #endif
/* From svn_auth.c. */
svn_error_t *
nmap_update_svn_cmdline_create_auth_baton(svn_auth_baton_t **ab,
svn_boolean_t non_interactive,
const char *auth_username,
const char *auth_password,
const char *config_dir,
svn_boolean_t no_auth_cache,
svn_boolean_t trust_server_cert,
svn_config_t *cfg,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
#include "default_channel.h" #include "default_channel.h"
#ifdef WIN32 #ifdef WIN32
@@ -866,7 +880,7 @@ static svn_error_t *checkout_svn(const char *url, const char *path)
APR_HASH_KEY_STRING); APR_HASH_KEY_STRING);
svn_config_set_bool(cfg, SVN_CONFIG_SECTION_GLOBAL, svn_config_set_bool(cfg, SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_SSL_TRUST_DEFAULT_CA, TRUE); SVN_CONFIG_OPTION_SSL_TRUST_DEFAULT_CA, TRUE);
svn_cmdline_create_auth_baton(&ctx->auth_baton, nmap_update_svn_cmdline_create_auth_baton(&ctx->auth_baton,
FALSE, /* non_interactive */ FALSE, /* non_interactive */
options.username, /* username */ options.username, /* username */
options.password, /* password */ options.password, /* password */

View File

@@ -12,6 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="nmap-update.c" /> <ClCompile Include="nmap-update.c" />
<ClCompile Include="svn_auth.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{BBF27339-C7B6-4F52-B742-897796C1F13B}</ProjectGuid> <ProjectGuid>{BBF27339-C7B6-4F52-B742-897796C1F13B}</ProjectGuid>

View File

@@ -11,7 +11,10 @@
These changes have been made (set off with #if 0): These changes have been made (set off with #if 0):
* Made trust_server_cert always false in svn_cmdline_create_auth_baton. (This * Made trust_server_cert always false in svn_cmdline_create_auth_baton. (This
is only to avoid having to also copy in ssl_trust_unknown_server_cert.) is only to avoid having to also copy in ssl_trust_unknown_server_cert.)
* Disabled username guessing in prompt_for_simple_creds. */ * Disabled username guessing in prompt_for_simple_creds.
* Made svn_auth_get_simple_prompt_provider have static scope.
* Renamed svn_cmdline_create_auth_baton to
nmap_update_svn_cmdline_create_auth_baton. */
/* /*
* ==================================================================== * ====================================================================
@@ -233,7 +236,7 @@ static const svn_auth_provider_t simple_prompt_provider = {
/* Public API */ /* Public API */
void static void
svn_auth_get_simple_prompt_provider svn_auth_get_simple_prompt_provider
(svn_auth_provider_object_t **provider, (svn_auth_provider_object_t **provider,
svn_auth_simple_prompt_func_t prompt_func, svn_auth_simple_prompt_func_t prompt_func,
@@ -254,7 +257,7 @@ svn_auth_get_simple_prompt_provider
} }
svn_error_t * svn_error_t *
svn_cmdline_create_auth_baton(svn_auth_baton_t **ab, nmap_update_svn_cmdline_create_auth_baton(svn_auth_baton_t **ab,
svn_boolean_t non_interactive, svn_boolean_t non_interactive,
const char *auth_username, const char *auth_username,
const char *auth_password, const char *auth_password,