command line client adapter does not pass gnome keyring environment parameters [Tigris #1309]

[markphip]

Description

The command line client adapter only passes a selection of environment variables through to the svn 
process. This selection is missing the environment variable DBUS_SESSION_BUS_ADDRESS which is 
required to access passwords that are stored in the gnome key ring.

Metadata Imported from Tigris (Issue 1309)

• Creation Date: 2011-09-27 05:06:14
• Reporter: bartvh
• Subcomponent: svnClientAdapter
• Version: 1.6.x
• Milestone: not determined
• Keywords:
• Cc:

Comments

2011-09-27 05:08:33 by bartvh

Created an attachment (id=352)
Patch that adds the missing DBUS_SESSION_BUS_ADDRESS env var

Attachments

dbus-cmdline.patch - Patch that adds the missing DBUS_SESSION_BUS_ADDRESS env var

Posted 2011-09-27 05:08:33 by bartvh

Index: src/commandline/org/tigris/subversion/svnclientadapter/commandline/CommandLine.java
===================================================================
--- src/commandline/org/tigris/subversion/svnclientadapter/commandline/CommandLine.java (revision 4859)
+++ src/commandline/org/tigris/subversion/svnclientadapter/commandline/CommandLine.java (working copy)
@@ -120,6 +120,7 @@
        final String path = CmdLineClientAdapter.getEnvironmentVariable("PATH");
        final String systemRoot = CmdLineClientAdapter.getEnvironmentVariable("SystemRoot");
        final String aprIconv = CmdLineClientAdapter.getEnvironmentVariable("APR_ICONV_PATH");
+       final String dbus = CmdLineClientAdapter.getEnvironmentVariable("DBUS_SESSION_BUS_ADDRESS");
        int i = 3;
        if (path != null)
            i++;
@@ -127,6 +128,8 @@
            i++;
        if (aprIconv != null)
            i++;
+       if (dbus != null)
+           i++;
        String[] lcVars = getLocaleVariables();
        String[] env = new String[i + lcVars.length];
        i = 0;
@@ -150,6 +153,10 @@
            env[i] = "APR_ICONV_PATH=" + aprIconv;
            i++;
        }
+       if (dbus != null) {
+           env[i] = "DBUS_SESSION_BUS_ADDRESS=" + dbus;
+           i++;
+       }
        //Add the remaining LC vars
        for (int j = 0; j < lcVars.length; j++) {
            env[i] = lcVars[j];