propagate from branch 'ca.inverse.sogo.1_3_12' (head b5720d1cdf1d7a97ffae696deda5507c61e52da1)

to branch 'ca.inverse.sogo' (head 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201)

Monotone-Parent: 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201
Monotone-Parent: b5720d1cdf1d7a97ffae696deda5507c61e52da1
Monotone-Revision: 18a9f2ed7229757c1bbe4882195c7c1a807365d8

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-01-30T19:07:34
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2012-01-30 19:07:34 +00:00

View File

@@ -208,7 +208,7 @@ _fetchLDAPDNAndAttrWithHandle (const char *dn, char *attrs[], LDAP *ldapHandle)
if (!(atomsCount % SOGoLDAPContainerSize))
{
atoms = NSZoneRealloc (NULL, atoms,
(int) (SOGoLDAPContainerSizee
(int) (SOGoLDAPContainerSize
+ atomsCount)
* sizeof (_SOGoLDAPValue *));
currentAtom = atoms + atomsCount;
@@ -356,7 +356,7 @@ _convertLDAPAtomToNSDictionary (_SOGoLDAPValue *atom)
static _SOGoLDAPValue *
_initLDAPDefaults ()
{
#error dn, password, uri, configDN should be defined
#warning dn, password, uri, configDN should be defined
const char *dn, *password, *uri, *configDN;
LDAP *ldapHandle;
int rc, opt;