[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] : Use /etc/subversion/config and global registry

From: David Kimdon <dwhedon_at_debian.org>
Date: 2002-09-25 16:52:04 CEST

Hi,

The following patch makes subversion look into /etc/subversion/config.
(Options in that file are overridden by ~/.subversion/config.) Before
this patch /etc/subversion/config was completely ignored as far as I
can tell. I'm also including the changes to enable similar beavior on
win32, but I don't have a win32 box to check it on.

-David

* config.c (svn_config_read_config) : Look in /etc/subversion/config and
  in SVN_REGISTRY_SYS_CONFIG_PROXY_PATH (on win32) for system wide
  configuration options.

Index: config.c
===================================================================
--- config.c
+++ config.c 2002-09-25 07:35:28.000000000 -0700
@@ -185,20 +185,25 @@
 svn_error_t *
 svn_config_read_config (svn_config_t **cfgp, apr_pool_t *pool)
 {
- const char *usr_reg_path = NULL;
- const char *usr_cfg_path;
+ const char *usr_reg_path = NULL, *sys_reg_path = NULL;
+ const char *usr_cfg_path, *sys_cfg_path;
 
 #ifdef SVN_WIN32
   usr_reg_path = SVN_REGISTRY_USR_CONFIG_CONFIG_PATH;
+ sys_reg_path = SVN_REGISTRY_SYS_CONFIG_PROXY_PATH;
 #endif /* SVN_WIN32 */
+
+ SVN_ERR (svn_config__sys_config_path (&sys_cfg_path,
+ SVN_CONFIG__USR_CONFIG_FILE,
+ pool));
 
   SVN_ERR (svn_config__user_config_path (&usr_cfg_path,
                                          SVN_CONFIG__USR_CONFIG_FILE,
                                          pool));
 
   SVN_ERR (read_all (cfgp,
- NULL, usr_reg_path,
- NULL, usr_cfg_path,
+ sys_reg_path, usr_reg_path,
+ sys_cfg_path, usr_cfg_path,
                      pool));
 
   return SVN_NO_ERROR;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 25 16:47:15 2002

This is an archived mail posted to the Subversion Dev mailing list.