rldap 0.0.1 → 0.0.2

data/ext/constants.h

@@ -1,3 +1,5 @@
+#include <ldap.h>
+
 #define DEFINE_CONST(s) rb_define_const(cLDAP, #s, INT2NUM(s))
 
 /* options */
@@ -5,7 +7,6 @@ DEFINE_CONST(LDAP_OPT_API_FEATURE_INFO);
 DEFINE_CONST(LDAP_OPT_API_INFO);
 DEFINE_CONST(LDAP_OPT_CLIENT_CONTROLS);
 DEFINE_CONST(LDAP_OPT_CONNECT_ASYNC);
-DEFINE_CONST(LDAP_OPT_CONNECT_CB);
 DEFINE_CONST(LDAP_OPT_DEBUG_LEVEL);
 DEFINE_CONST(LDAP_OPT_DEFBASE);
 DEFINE_CONST(LDAP_OPT_DEREF);

data/ext/ldap.c

@@ -15,37 +15,37 @@ static VALUE cLDAP_Message;
 static VALUE eLDAP;
 
 typedef struct {
-	LDAP* ld;
+	LDAP *ld;
 	char connection;
 } RLDAP_WRAP;
 
 typedef struct {
-	LDAP* ld;
-	LDAPMessage* mesg;
+	LDAP *ld;
+	LDAPMessage *mesg;
 	char freed;
 } RLDAP_MSG_WRAP;
 
-static RLDAP_WRAP* get_wrapper(VALUE obj)
+static RLDAP_WRAP *get_wrapper(VALUE obj)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	Data_Get_Struct(obj, RLDAP_WRAP, wrapper);
 	return wrapper;
 }
 
-static RLDAP_MSG_WRAP* get_msg_wrapper(VALUE obj)
+static RLDAP_MSG_WRAP *get_msg_wrapper(VALUE obj)
 {
 	RLDAP_MSG_WRAP* wrapper;
 	Data_Get_Struct(obj, RLDAP_MSG_WRAP, wrapper);
 	return wrapper;
 }
 
-static void free_wrapper(RLDAP_WRAP* wrapper)
+static void free_wrapper(RLDAP_WRAP *wrapper)
 {
 	ldap_memfree(wrapper->ld);
 	xfree(wrapper);
 }
 
-static void free_msg_wrapper(RLDAP_MSG_WRAP* wrapper)
+static void free_msg_wrapper(RLDAP_MSG_WRAP *wrapper)
 {
 	if (wrapper->freed == Qfalse)
 		ldap_msgfree(wrapper->mesg);
@@ -59,7 +59,7 @@ static void rldap_raise(int errno)
 	rb_exc_raise(e);
 }
 
-static VALUE ldapmessage2obj(LDAP* ld, LDAPMessage* msg);
+static VALUE ldapmessage2obj(LDAP *ld, LDAPMessage *msg);
 
 /* class LDAP */
 
@@ -72,7 +72,7 @@ static VALUE rldap_err2string(VALUE klass, VALUE rerrno)
 
 static VALUE rldap_alloc(VALUE klass)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	VALUE obj;
 
 	obj = Data_Make_Struct(klass, RLDAP_WRAP, 0, free_wrapper, wrapper);
@@ -81,12 +81,12 @@ static VALUE rldap_alloc(VALUE klass)
 	return obj;
 }
 
-static VALUE rldap_initialize(int argc, VALUE* argv, VALUE obj)
+static VALUE rldap_initialize(int argc, VALUE *argv, VALUE obj)
 {
 	VALUE rhost, rport;
-	char* host;
+	char *host;
 	int port;
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 
 	rb_scan_args(argc, argv, "11", &rhost, &rport);
 
@@ -97,14 +97,14 @@ static VALUE rldap_initialize(int argc, VALUE* argv, VALUE obj)
 	host = StringValuePtr(rhost);
 	port = FIX2INT(rport);
 
-	wrapper->ld = ldap_open(host, port);
+	wrapper->ld = (LDAP *)ldap_init(host, port);
 
 	return obj;
 }
 
 static VALUE rldap_start_tls(VALUE obj)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	int retval;
 
 	wrapper = get_wrapper(obj);
@@ -117,12 +117,10 @@ static VALUE rldap_start_tls(VALUE obj)
 
 static VALUE rldap_search(VALUE obj, VALUE rbase, VALUE rfilter)
 {
-	RLDAP_WRAP* wrapper;
-	char* base;
-	char* filter;
+	RLDAP_WRAP *wrapper;
+	char *base, *filter;
 	int retval, count, i;
-	LDAPMessage* res;
-	LDAPMessage* msg;
+	LDAPMessage *res, *msg;
 	VALUE ary;
 
 	wrapper = get_wrapper(obj);
@@ -156,12 +154,12 @@ static VALUE rldap_search(VALUE obj, VALUE rbase, VALUE rfilter)
 
 static VALUE rldap_set_option(VALUE obj, VALUE roption, VALUE rvalue)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	int retval;
 	int option;
 	int ival;
-	char* sval;
-	void* val;
+	char *sval;
+	void *val;
 	
 	wrapper = get_wrapper(obj);
 	option = FIX2INT(roption);
@@ -184,7 +182,7 @@ static VALUE rldap_set_option(VALUE obj, VALUE roption, VALUE rvalue)
 
 static VALUE rldap_errno(VALUE obj)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	int errno;
 	
 	wrapper = get_wrapper(obj);
@@ -196,7 +194,7 @@ static VALUE rldap_errno(VALUE obj)
 
 int rldap_errno_c(VALUE obj)
 {
-	RLDAP_WRAP* wrapper;
+	RLDAP_WRAP *wrapper;
 	int errno;
 
 	wrapper = get_wrapper(obj);
@@ -210,7 +208,7 @@ int rldap_errno_c(VALUE obj)
 static VALUE ldapmessage2obj(LDAP* ld, LDAPMessage* msg)
 {
 	VALUE obj;
-	RLDAP_MSG_WRAP* wrapper;
+	RLDAP_MSG_WRAP *wrapper;
 
 	obj = Data_Make_Struct(cLDAP_Message, RLDAP_MSG_WRAP, 0, free_msg_wrapper, wrapper);
 	wrapper->mesg = msg;
@@ -222,26 +220,27 @@ static VALUE ldapmessage2obj(LDAP* ld, LDAPMessage* msg)
 
 static VALUE rldap_msg_dn(VALUE obj)
 {
-	RLDAP_MSG_WRAP* wrapper;
-	char* dn;
+	RLDAP_MSG_WRAP *wrapper;
+	char *dn;
+	VALUE rdn;
 	
 	wrapper = get_msg_wrapper(obj);
 	
 	dn = ldap_get_dn(wrapper->ld, wrapper->mesg);
+	rdn = rb_str_new2(dn);
+	ldap_memfree(dn);
 	
-	return rb_str_new2(dn);
+	return rdn;
 }
 
 static VALUE rldap_msg_get_val(VALUE obj, VALUE key)
 {
-	RLDAP_MSG_WRAP* wrapper;
-	char* attr;
-	BerValue** values;
-	VALUE ary;
+	RLDAP_MSG_WRAP *wrapper;
+	char *attr, *strval;
+	BerValue **values;
+	VALUE ary, str;
 	int i, length;
-	BerValue* value;
-	char* strval;
-	VALUE str;
+	BerValue *value;
 	
 	wrapper = get_msg_wrapper(obj);
 	attr = StringValuePtr(key);
@@ -268,11 +267,16 @@ static VALUE rldap_msg_get_val(VALUE obj, VALUE key)
 
 static VALUE rldap_msg_keys(VALUE obj)
 {
-	RLDAP_MSG_WRAP* wrapper;
-	char* attr;
-	BerElement* ber;
+	RLDAP_MSG_WRAP *wrapper;
+	char *attr;
+	BerElement *ber;
 	VALUE ary;
 
+	ary = rb_iv_get(obj, "@keys");
+
+	if (ary != Qnil)
+		return ary;
+
 	wrapper = get_msg_wrapper(obj);
 	ary = rb_ary_new();
 
@@ -284,6 +288,8 @@ static VALUE rldap_msg_keys(VALUE obj)
 
 	ber_free(ber, 0);
 
+	rb_iv_set(obj, "@keys", ary);
+
 	return ary;
 }
 

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 class LDAP
-  Version = VERSION = '0.0.1'
+  Version = VERSION = '0.0.2'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Henrik Hodne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +00:00
+date: 2010-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []