Permalink
Browse files

minor fixes for compiling on node v0.6.10+

	*node_events.h doesn't exist anymore
	*EIO_ functions don't return ints anymore
	*fix build.sh
  • Loading branch information...
wankdanker committed Mar 2, 2012
1 parent abaedc7 commit c7a334c8828902b3fa0bff692d30342c15818f0a
Showing with 6 additions and 7 deletions.
  1. +1 −1 build.sh
  2. +5 −6 ldapauth.cc
View
@@ -1,3 +1,3 @@
#!/bin/sh
-node-waf configure build && cp build/default/ldapauth.node ./
+node-waf configure build && cp build/Release/ldapauth.node ./
View
@@ -39,7 +39,6 @@ Invoke user supplied JS callback
#include <v8.h>
#include <node.h>
-#include <node_events.h>
#include <ldap.h>
#include <unistd.h>
#include <stdlib.h>
@@ -96,7 +95,7 @@ struct search_request : auth_request
};
// Runs on background thread, performing the actual LDAP request.
-static int EIO_Authenticate(eio_req *req)
+static void EIO_Authenticate(eio_req *req)
{
struct auth_request *auth_req = (struct auth_request*)(req->data);
@@ -125,8 +124,8 @@ static int EIO_Authenticate(eio_req *req)
auth_req->connected = true;
auth_req->authenticated = (ldap_result == LDAP_SUCCESS);
}
-
- return 0;
+
+ return;
}
// Called on main event loop when background thread has completed
@@ -312,7 +311,7 @@ static void SearchAncestors(LDAP *ldap, char* group, char* base, std::vector<cha
ldap_msgfree(groupSearchResultMessage);
}
-static int EIO_Search(eio_req *req)
+static void EIO_Search(eio_req *req)
{
struct search_request *search_req = (struct search_request*)(req->data);
LDAP *ldap = ldap_open(search_req->host, search_req->port);
@@ -347,7 +346,7 @@ static int EIO_Search(eio_req *req)
ldap_unbind_s(ldap);
}
- return 0;
+ return;
}
static int EIO_AfterSearch(eio_req *req)

0 comments on commit c7a334c

Please sign in to comment.