← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/svn/help-cmd.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/svn/help-cmd.c
30
30
#include "svn_hash.h"
31
31
#include "svn_string.h"
32
32
#include "svn_config.h"
 
33
#include "svn_dirent_uri.h"
33
34
#include "svn_error.h"
34
 
#include "svn_version.h"
35
35
#include "cl.h"
36
36
 
37
37
#include "svn_private_config.h"
47
47
{
48
48
  svn_cl__opt_state_t *opt_state = NULL;
49
49
  svn_stringbuf_t *version_footer = NULL;
 
50
  const char *config_path;
50
51
 
51
 
  /* xgettext: the %s is for SVN_VER_NUMBER. */
52
 
  char help_header_template[] =
 
52
  char help_header[] =
53
53
  N_("usage: svn <subcommand> [options] [args]\n"
54
 
     "Subversion command-line client, version %s.\n"
 
54
     "Subversion command-line client.\n"
55
55
     "Type 'svn help <subcommand>' for help on a specific subcommand.\n"
56
56
     "Type 'svn --version' to see the program version and RA modules\n"
57
57
     "  or 'svn --version --quiet' to see just the version number.\n"
66
66
  N_("Subversion is a tool for version control.\n"
67
67
     "For additional information, see http://subversion.apache.org/\n");
68
68
 
69
 
  char *help_header =
70
 
    apr_psprintf(pool, _(help_header_template), SVN_VER_NUMBER);
71
 
 
72
69
  const char *ra_desc_start
73
70
    = _("The following repository access (RA) modules are available:\n\n");
74
71
 
138
135
    version_footer = svn_stringbuf_create(ra_desc_start, pool);
139
136
  SVN_ERR(svn_ra_print_modules(version_footer, pool));
140
137
 
 
138
  /*
 
139
   * Show auth creds storage providers.
 
140
   */
 
141
  SVN_ERR(svn_config_get_user_config_path(&config_path,
 
142
                                          opt_state ? opt_state->config_dir
 
143
                                                    : NULL,
 
144
                                          NULL,
 
145
                                          pool));
 
146
  svn_stringbuf_appendcstr(version_footer,
 
147
                           _("\nThe following authentication credential caches are available:\n\n"));
 
148
 
 
149
  /*### There is no API to query available providers at run time. */
 
150
#if (defined(WIN32) && !defined(__MINGW32__))
 
151
  version_footer =
 
152
    svn_stringbuf_create(apr_psprintf(pool, _("%s* Wincrypt cache in %s\n"),
 
153
                                      version_footer->data,
 
154
                                      svn_dirent_local_style(config_path,
 
155
                                                             pool)),
 
156
                         pool);
 
157
#elif !defined(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE)
 
158
  version_footer =
 
159
    svn_stringbuf_create(apr_psprintf(pool, _("%s* Plaintext cache in %s\n"),
 
160
                                      version_footer->data,
 
161
                                      svn_dirent_local_style(config_path,
 
162
                                                             pool)),
 
163
                         pool);
 
164
#endif
 
165
#ifdef SVN_HAVE_GNOME_KEYRING
 
166
  svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
 
167
#endif
 
168
#ifdef SVN_HAVE_GPG_AGENT
 
169
  svn_stringbuf_appendcstr(version_footer, "* GPG-Agent\n");
 
170
#endif
 
171
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
 
172
  svn_stringbuf_appendcstr(version_footer, "* Mac OS X Keychain\n");
 
173
#endif
 
174
#ifdef SVN_HAVE_KWALLET
 
175
  svn_stringbuf_appendcstr(version_footer, "* KWallet (KDE)\n");
 
176
#endif
 
177
 
141
178
  return svn_opt_print_help4(os,
142
179
                             "svn",   /* ### erm, derive somehow? */
143
180
                             opt_state ? opt_state->version : FALSE,