Skip to content
Browse files

Merge branch 'master' of ssh://github.com/jeremycx/node-LDAP

  • Loading branch information...
2 parents b5e6af9 + 0b7cb79 commit 5bc0d79e0a3b86b2f49436c0c914822ef270964a @jeremycx committed
Showing with 11 additions and 9 deletions.
  1. +9 −7 binding.gyp
  2. +2 −2 src/LDAP.cc
View
16 binding.gyp
@@ -13,12 +13,12 @@
],
'cflags': [
'-Wall',
- '--verbose',
'-g'
],
'ldflags': [
'-L/usr/local/lib',
- '-lldap'
+ '-lldap',
+ '-lber'
],
'conditions': [
['OS=="linux"', {
@@ -27,13 +27,15 @@
]
}
],
- ['OS=="OSX"', {
- 'ldflags': [
- '-luuid'
+ ['OS=="mac"', {
+ "link_settings": {
+ "libraries": [
+ "-lldap"
]
}
- ],
- ]
+ }
+ ]
+ ]
}
]
}
View
4 src/LDAP.cc
@@ -593,7 +593,7 @@ class LDAPConnection : public ObjectWrap
RETURN_INT(LDAP_SERVER_DOWN);
}
- if (((msgid = ldap_modrdn(c->ld, *dn, *newrdn)) == LDAP_SERVER_DOWN)) {
+ if ((msgid = ldap_modrdn(c->ld, *dn, *newrdn)) == LDAP_SERVER_DOWN) {
close(c);
}
@@ -718,7 +718,7 @@ class LDAPConnection : public ObjectWrap
// get sync controls, if present...
ldap_get_entry_controls( c->ld, entry, &ctrls );
if ( ctrls != NULL ) {
- struct berval entryUUID = { 0 };
+ struct berval entryUUID = { 0, NULL };
int state, i;
BerElement *ber = NULL;

0 comments on commit 5bc0d79

Please sign in to comment.
Something went wrong with that request. Please try again.