From bdbeb7e3ba1b35cbf7ad89b6dd6153f27af92d5b Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 3 Apr 2009 16:47:27 +0000
Subject: [PATCH] Regenerated the patchset to include an Oracle GDL adaptor fix
 in the connect string.

Monotone-Parent: 7b7b1e4cf6acf0c232cc90058bb111775177f721
Monotone-Revision: 39f32528b95bdfdf11fdfa90c982474366e48f89

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-03T16:47:27
Monotone-Branch: ca.inverse.sogo
---
 SOPE/sope-patchset-r1632.diff | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/SOPE/sope-patchset-r1632.diff b/SOPE/sope-patchset-r1632.diff
index 2d4fe145d..23e3f821e 100644
--- a/SOPE/sope-patchset-r1632.diff
+++ b/SOPE/sope-patchset-r1632.diff
@@ -319,6 +319,15 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
        return NO;
      }
    
+@@ -414,7 +448,7 @@
+   // Under Oracle 10g, the third parameter of OCILogon() has the form: [//]host[:port][/service_name]
+   // See http://download-west.oracle.com/docs/cd/B12037_01/network.101/b10775/naming.htm#i498306 for
+   // all juicy details.
+-  database = [[NSString stringWithFormat:@"%@:%@", [o serverName], [o port]] UTF8String];
++  database = [[NSString stringWithFormat:@"%@:%@/%@", [o serverName], [o port], [o databaseName]] UTF8String];
+ 
+   // We logon to the database.
+   if (OCILogon(_oci_env, _oci_err, &_oci_ctx, (const OraText*)username, strlen(username),
 @@ -422,6 +456,7 @@
      {
        NSLog(@"FAILED: OCILogon(). username = %s  password = %s"