ruby-ldap 0.9.13 → 0.9.14

data/ChangeLog

@@ -1,3 +1,16 @@
+Wed Aug 28 13:21:53 UTC 2013 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.14
+  * Fixed option parsing bug for LDAP::Conn.sasl_bind. Thanks to Brian Leake.
+  * Added possibility to use :nocanon option in rb_ldap_conn_sasl_bind.
+    See ldap_set_option(3) for more information. Thanks to Brian Leake.
+  * Added function conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls)  => self
+    Modify the RDN of the entry with DN, dn, giving it the new RDN in parent new_parent_dn,
+    new_rdn. If delete_old_rdn is true, the old RDN value will be deleted from the entry.
+    Thanks to Marek Veber.
+  * Added option LDAP_OPT_NETWORK_TIMEOUT for openLDAP. Thanks to David Campbell.
+  * Fixed build error with GCC 4.8.1. Thanks to Kouhei Sutou.
+  * Add missing ldap_raname_s() function availability check. Thanks to Kouhei Sutou.
+
 Wed Jun  5 17:44:47 UTC 2013 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.13
   * Prevent SyntaxError raised under Ruby 2.0.0 by line 107 regex

data/NOTES

@@ -1,3 +1,18 @@
+0.9.14
+-----
+
+* Fixed option parsing bug for LDAP::Conn.sasl_bind. Thanks to Brian Leake.
+* Added possibility to use :nocanon option in rb_ldap_conn_sasl_bind.
+  See ldap_set_option(3) for more information. Thanks to Brian Leake.
+* Added function conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls)  => self
+  Modify the RDN of the entry with DN, dn, giving it the new RDN in parent new_parent_dn,
+  new_rdn. If delete_old_rdn is true, the old RDN value will be deleted from the entry.
+  Thanks to Marek Veber.
+* Added option LDAP_OPT_NETWORK_TIMEOUT for openLDAP. Thanks to David Campbell.
+* Fixed build error with GCC 4.8.1. Thanks to Kouhei Sutou.
+* Add missing ldap_raname_s() function availability check. Thanks to Kouhei Sutou.
+
+
 0.9.13
 -----
 

data/conn.c

@@ -471,6 +471,15 @@ rb_ldap_conn_set_option (VALUE self, VALUE opt, VALUE data)
 
   switch (copt)
     {
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+    case LDAP_OPT_NETWORK_TIMEOUT:
+      {
+        struct timeval tv;
+        tv = rb_time_interval(data);
+        optdata = &tv;
+      }
+      break;
+#endif
     case LDAP_OPT_REFERRALS:
       optdata = (void *) NUM2INT (data);
       break;
@@ -595,6 +604,20 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
       ldapdata->err = ldap_get_option (NULL, copt, (void *) info);
       data = (long *) info;
     }
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+  else if (copt == LDAP_OPT_NETWORK_TIMEOUT)
+    {
+      struct timeval tv;
+      ldapdata->err = ldap_get_option (ldapdata->ldap, copt, &tv);
+      if (!tv.tv_sec)
+        {
+          long x = -1;
+          data = &x;
+        }
+      else
+        data = (void *) tv.tv_sec;
+    }
+#endif
   else
     {
       data = (void *) ALLOCA_N (char, LDAP_GET_OPT_MAX_BUFFER_SIZE);
@@ -616,6 +639,9 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
 	case LDAP_OPT_RESTART:
 	case LDAP_OPT_PROTOCOL_VERSION:
 	case LDAP_OPT_ERROR_NUMBER:
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+	case LDAP_OPT_NETWORK_TIMEOUT:
+#endif
 #ifdef USE_OPENLDAP2
 #ifdef LDAP_OPT_X_TLS
 	case LDAP_OPT_X_TLS:
@@ -674,7 +700,7 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
     }
   else
     {
-      rb_raise (rb_eLDAP_Error, ldap_err2string (ldapdata->err));
+      rb_raise (rb_eLDAP_Error, "%s", ldap_err2string (ldapdata->err));
     };
 #else
   rb_notimplement ();
@@ -1626,6 +1652,42 @@ rb_ldap_conn_modrdn_s (VALUE self, VALUE dn, VALUE newrdn, VALUE delete_p)
   return self;
 };
 
+#if defined(HAVE_LDAPCONTROL) && defined(HAVE_LDAP_RENAME_S)
+/*
+ * call-seq:
+ * conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls)  => self
+ *
+ * Modify the RDN of the entry with DN, +dn+, giving it the new RDN in parent +new_parent_dn+,
+ * +new_rdn+. If +delete_old_rdn+ is *true*, the old RDN value will be deleted
+ * from the entry.
+ */
+VALUE
+rb_ldap_conn_rename_s (VALUE self, VALUE dn, VALUE newrdn, VALUE newparentdn, VALUE delete_p,
+			VALUE serverctrls, VALUE clientctrls)
+{
+  RB_LDAP_DATA *ldapdata;
+  char *c_dn;
+  char *c_newrdn;
+  char *c_newparentdn;
+  int c_delete_p;
+  LDAPControl **sctrls, **cctrls;
+
+  GET_LDAP_DATA (self, ldapdata);
+  c_dn = StringValueCStr (dn);
+  c_newrdn = StringValueCStr (newrdn);
+  c_newparentdn = StringValueCStr (newparentdn);
+  c_delete_p = (delete_p == Qtrue) ? 1 : 0;
+  sctrls = rb_ldap_get_controls (serverctrls);
+  cctrls = rb_ldap_get_controls (clientctrls);
+
+  ldapdata->err =
+    ldap_rename_s (ldapdata->ldap, c_dn, c_newrdn, c_newparentdn, c_delete_p, sctrls, cctrls);
+  Check_LDAP_Result (ldapdata->err);
+
+  return self;
+}
+#endif
+
 /*
  * call-seq:
  * conn.delete(dn)  => self
@@ -1817,6 +1879,9 @@ Init_ldap_conn ()
   rb_ldap_conn_define_method ("add", rb_ldap_conn_add_s, 2);
   rb_ldap_conn_define_method ("modify", rb_ldap_conn_modify_s, 2);
   rb_ldap_conn_define_method ("modrdn", rb_ldap_conn_modrdn_s, 3);
+#if defined(HAVE_LDAPCONTROL) && defined(HAVE_LDAP_RENAME_S)
+  rb_ldap_conn_define_method ("rename", rb_ldap_conn_rename_s, 6);
+#endif
   rb_ldap_conn_define_method ("delete", rb_ldap_conn_delete_s, 1);
 #if defined(HAVE_LDAP_COMPARE_S)
   rb_ldap_conn_define_method ("compare", rb_ldap_conn_compare_s, 3);

data/extconf.rb

@@ -245,6 +245,7 @@ have_func("ldap_sort_entries")
 have_func("ldapssl_init")  # NS SDK
 have_func("ldap_sslinit")  # WLDAP32
 have_func("ldap_sasl_bind_s")
+have_func("ldap_rename_s")
 have_func("ldap_compare_s")
 have_func("ldap_add_ext_s")
 have_func("ldap_compare_ext_s")

data/ldap.c

@@ -407,6 +407,9 @@ Init_ldap ()
 #ifdef LDAP_OPT_TIMELIMIT
   rb_ldap_define_opt (LDAP_OPT_TIMELIMIT);
 #endif
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+  rb_ldap_define_opt (LDAP_OPT_NETWORK_TIMEOUT);
+#endif
 #ifdef LDAP_OPT_THREAD_FN_PTRS
   rb_ldap_define_opt (LDAP_OPT_THREAD_FN_PTRS);
 #endif

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 12
-#define RB_LDAP_VERSION "0.9.13"
+#define RB_LDAP_PATCH_VERSION 14
+#define RB_LDAP_VERSION "0.9.14"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 
@@ -62,6 +62,7 @@ typedef struct rb_ldapmod_data
   LDAPMod *mod;
 } RB_LDAPMOD_DATA;
 
+struct timeval rb_time_interval(VALUE num);
 
 #ifndef HAVE_LDAP_MEMFREE
 # define ldap_memfree(ptr) free(ptr)
@@ -141,13 +142,13 @@ VALUE rb_ldap_mod_vals (VALUE);
 
 #define Check_LDAP_Result(err) { \
   if( (err) != LDAP_SUCCESS && (err) != LDAP_SIZELIMIT_EXCEEDED ){ \
-    rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
+    rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
   } \
 }
 
 #define Check_LDAP_OPT_Result(err) { \
   if( (err) != LDAP_OPT_SUCCESS ){ \
-    rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
+    rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
   } \
 }
 

data/saslconn.c

@@ -106,7 +106,7 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
 {
   RB_LDAP_DATA *ldapdata;
 
-  VALUE arg1, arg2, arg3, arg4, arg5, sasl_options = Qnil;
+  VALUE arg1, arg2, arg3, arg4, arg5, sasl_options, other_options = Qnil;
   int version;
   char *dn = NULL;
   char *mechanism = NULL;
@@ -145,19 +145,32 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
       rb_raise (rb_eLDAP_Error, "already bound.");
     };
 
-  switch (rb_scan_args (argc, argv, "24", &arg1, &arg2, &arg3, &arg4, &arg5, &sasl_options))
+  switch (rb_scan_args (argc, argv, "25", &arg1, &arg2, &arg3, &arg4, &arg5, &sasl_options, &other_options))
     {
+    case 7:
+      /* Parse through the hash.  Currently there's only one option, nothing fancy needed. */
+      if (!NIL_P(rb_ldap_indifferent_hash_aref(other_options, "nocanon")))
+        {
+          /* Inspired by the ldapsearch -N option, inspired by the code in OpenLDAP (BSD style license) in clients/tools/common.c */
+          ldapdata->err = ldap_set_option( ldapdata->ldap, LDAP_OPT_X_SASL_NOCANON, LDAP_OPT_ON);
+          Check_LDAP_Result(ldapdata->err); 
+        }
     case 6:
       /* nothing. this requires credentials to be parsed first. we'll get defaults after arg-scanning */
     case 5:
-      clientctrls = rb_ldap_get_controls (arg5);
+      if(!NIL_P(arg5))
+        clientctrls = rb_ldap_get_controls (arg5);
       /* down seems more likely */
     case 4:
-      serverctrls = rb_ldap_get_controls (arg4);
+      if(!NIL_P(arg4))
+        serverctrls = rb_ldap_get_controls (arg4);
       /* down seems more likely */
     case 3:
-      cred->bv_val = StringValueCStr (arg3);
-      cred->bv_len = RSTRING_LEN (arg3);
+      if(!NIL_P(arg3))
+        {
+          cred->bv_val = StringValueCStr (arg3);
+          cred->bv_len = RSTRING_LEN (arg3);
+        }
       /* down seems more likely */
     case 2:			/* don't need the cred for GSSAPI */
       dn = StringValuePtr (arg1);

data/test/moz_cert.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'rubygems'
-# gem 'ruby-ldap', '~> 0.9.12'
 require 'ldap'
 require 'optparse'
 require 'pp'

metadata

@@ -1,17 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldap
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
+  prerelease: 
 platform: ruby
 authors:
 - Alexey Chebotar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies: []
-description: |
-  It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape SDK and Active Directory). The common API for application development is described in RFC1823 and is supported by Ruby/LDAP.
+description: ! 'It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape
+  SDK and Active Directory). The common API for application development is described
+  in RFC1823 and is supported by Ruby/LDAP.
+
+'
 email: alexey.chebotar@gmail.com
 executables: []
 extensions:
@@ -24,68 +28,69 @@ files:
 - NOTES
 - README
 - TODO
-- extconf.rb
-- lib/ldap/control.rb
-- lib/ldap/ldif.rb
-- lib/ldap/schema.rb
+- test/ext.rb
+- test/compare.rb
+- test/bind-sasl.rb
+- test/misc1.rb
 - test/add.rb
+- test/tc_schema.rb
 - test/add2.rb
+- test/search.rb
 - test/add3.rb
-- test/bind-ldaps.rb
-- test/bind-sasl.rb
+- test/modrdn.rb
 - test/bind-ssl.rb
-- test/bind.rb
-- test/compare.rb
-- test/conf.rb
+- test/setup.rb
+- test/search3.rb
 - test/delete.rb
-- test/ext.rb
-- test/misc1.rb
-- test/misc2.rb
-- test/modrdn.rb
-- test/moz_cert.rb
-- test/search.rb
 - test/search2.rb
-- test/search3.rb
-- test/setup.rb
-- test/subschema.rb
 - test/tc_conn.rb
-- test/tc_ldif.rb
-- test/tc_schema.rb
-- test/tc_search.rb
 - test/ts_ldap.rb
+- test/conf.rb
+- test/misc2.rb
+- test/bind-ldaps.rb
+- test/tc_search.rb
+- test/bind.rb
+- test/tc_ldif.rb
+- test/subschema.rb
+- test/moz_cert.rb
+- lib/ldap/schema.rb
+- lib/ldap/control.rb
+- lib/ldap/ldif.rb
+- extconf.rb
 - rbldap.h
 - win/winlber.h
 - win/winldap.h
-- clientauth.c
 - conn.c
+- sslconn.c
 - entry.c
+- clientauth.c
 - ldap.c
-- misc.c
 - mod.c
 - saslconn.c
-- sslconn.c
+- misc.c
 - win/wldap32.def
 homepage: http://ruby-ldap.sourceforge.net/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-ldap
-rubygems_version: 2.0.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby/LDAP is an extension module for Ruby
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: df51bf1583a52ae481a36a094cc0b13485cb4427
-  data.tar.gz: c68dcb046b37bf72da38bb609a4b20a041bae0ad
-SHA512:
-  metadata.gz: 61ca227999a49618d0a87076578c7a2699f0d0fd39fab8ebfa95f011178bfeff8b120f88dc63137cec493f8d168a9a32a8462c56e1020b9b115a41e27dc9ce4f
-  data.tar.gz: 91b6abc130135548351a4a6450eeab35add793246d118db165d91c0fefd5c79cde9047b89401219e3a7a77527e0578cb93b19e0ecddda5c45e8d0bc10d657095