svn commit: r1359686 - in /subversion/branches/master-passphrase/subversion: include/svn_auth.h libsvn_subr/masterpass.c svn/changepassword-cmd.c

[cm...@apache.org]

Author: cmpilato
Date: Tue Jul 10 14:10:18 2012
New Revision: 1359686

URL: http://svn.apache.org/viewvc?rev=1359686&view=rev
Log:
On the 'master-passphrase' branch, remove some temporary code crutches.

* subversion/include/svn_auth.h
  (SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE, SVN_AUTH_TEMP_MASTER_PASSPHRASE):
    Remove.

* subversion/libsvn_subr/masterpass.c
  (svn_auth_master_passphrase_get): Remove logic branch associated
    with SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE #define.

* subversion/svn/changepassword-cmd.c
  (svn_cl__changepassword): Remove logic branch associated with
    SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE #define.

Modified:
    subversion/branches/master-passphrase/subversion/include/svn_auth.h
    subversion/branches/master-passphrase/subversion/libsvn_subr/masterpass.c
    subversion/branches/master-passphrase/subversion/svn/changepassword-cmd.c

Modified: subversion/branches/master-passphrase/subversion/include/svn_auth.h
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/include/svn_auth.h?rev=1359686&r1=1359685&r2=1359686&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/include/svn_auth.h (original)
+++ subversion/branches/master-passphrase/subversion/include/svn_auth.h Tue Jul 10 14:10:18 2012
@@ -367,12 +367,6 @@ typedef struct svn_auth_cred_master_pass
   svn_boolean_t may_save;
 } svn_auth_cred_master_passphrase_t;
 
-/* Temporary support for a hard-coded master passphrase.  (Truth told,
-   cmpilato just doesn't feel like implementing prompting providers
-   and stuff just yet.)  */
-#define SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE 1
-#define SVN_AUTH_TEMP_MASTER_PASSPHRASE "mypass"
-
 /* Set *PASSPHRASE to the master passphrase for authentication
    credentials stored in the runtime configuration associated with
    AUTH_BATON, allocated from RESULT_POOL.  Use SCRATCH_POOL for

Modified: subversion/branches/master-passphrase/subversion/libsvn_subr/masterpass.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/libsvn_subr/masterpass.c?rev=1359686&r1=1359685&r2=1359686&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/libsvn_subr/masterpass.c (original)
+++ subversion/branches/master-passphrase/subversion/libsvn_subr/masterpass.c Tue Jul 10 14:10:18 2012
@@ -285,13 +285,9 @@ svn_auth_master_passphrase_get(const cha
   const svn_string_t *check_text;
   const char *config_dir = svn_auth_get_parameter(auth_baton,
                                                   SVN_AUTH_PARAM_CONFIG_DIR);
-#ifdef SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE
-  const char *default_passphrase = SVN_AUTH_TEMP_MASTER_PASSPHRASE;
-#else
   const char *default_passphrase =
     svn_auth_get_parameter(auth_baton,
                            SVN_AUTH_PARAM_DEFAULT_MASTER_PASSPHRASE);
-#endif
 
   /* Read the existing passphrase storage record so we can validate
      any master passphrase we have or fetch. If there's no check text,

Modified: subversion/branches/master-passphrase/subversion/svn/changepassword-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svn/changepassword-cmd.c?rev=1359686&r1=1359685&r2=1359686&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svn/changepassword-cmd.c (original)
+++ subversion/branches/master-passphrase/subversion/svn/changepassword-cmd.c Tue Jul 10 14:10:18 2012
@@ -53,11 +53,7 @@ svn_cl__changepassword(apr_getopt_t *os,
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
       if (args->nelts > 1)
         return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL);
-#ifdef SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE
-      new_password = SVN_AUTH_TEMP_MASTER_PASSPHRASE;
-#else
       new_password = APR_ARRAY_IDX(args, 0, const char *);
-#endif
     }
   else
     {