merge of '5b2a32ba5341455fbf5f685a68a8b18fd5d22fb8'

and '9495d1f289e6a977a13ee774c20ad749628a99ac'

Monotone-Parent: 5b2a32ba5341455fbf5f685a68a8b18fd5d22fb8
Monotone-Parent: 9495d1f289e6a977a13ee774c20ad749628a99ac
Monotone-Revision: dd55b0862cf04b300528e65ce2245dd5ff05b730

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-09-14T20:50:41
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-09-14 20:50:41 +00:00
3 changed files with 7 additions and 6 deletions
+1
View File
@@ -26,6 +26,7 @@
#import <Foundation/NSString.h>
#import <SOGo/NSDictionary+Utilities.h>
#import "NGVCard+SOGo.h"
@implementation NGVCard (SOGoExtensions)
+4 -3
View File
@@ -25,11 +25,12 @@
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSString.h>
#import <SOGo/NSDictionary+Utilities.h>
#import "NGVList+SOGo.h"
#import <NGCards/NGVCardReference.h>
#import <SOGo/NSDictionary+Utilities.h>
#import "NGVList+SOGo.h"
@implementation NGVList (SOGoExtensions)
- (NSString *) ldifString
+2 -3
View File
@@ -170,11 +170,10 @@
success = NO;
store = X509_STORE_new();
store = X509_STORE_new ();
if (store)
{
lookup = X509_STORE_add_lookup(store,X509_LOOKUP_file());
lookup = X509_STORE_add_lookup (store, X509_LOOKUP_file());
if (lookup)
{
X509_LOOKUP_load_file (lookup, NULL, X509_FILETYPE_DEFAULT);