ruby-ldap3 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4904684569075e822679cfd8af4b0e1d6e284370b18c3aa31a977e4a31da9fbd
-  data.tar.gz: ccf467f897301b6e80b22e0e9789d88e31d57c20e259701da404b19559e41913
+  metadata.gz: 7e95b5803604a211b957f2c4b47cf5ec11438e5ed88ffd8fdda03a51da94df71
+  data.tar.gz: 4629ddac3d4a5d9ff75c52a43e7f5b978ff9a608ec0404740944a42468b2a08d
 SHA512:
-  metadata.gz: 83167cc6cb5a02c09267762d02cd2bca641c8344c3be05ec52ba99f79ef76a6769909c34b0053553ac1bd68265e24c4c984821d32d10439cb87dbe4a06335f49
-  data.tar.gz: 1e8678db6143d04169ed46089ae4fbbb600bc5b9a63a3bdcec3c88b4c247c3b365cee343cce6699f7948d5d6109827f8f4caeb3bd6569108029e2e0b96962589
+  metadata.gz: 99f1c50af3132f1dd69c5e693f654cb92b513e1085d3c668e8bef88e084294c9e0ab6d3f02e715f250cb575087196e725f124cc545109fdbdb4ed8c941ca8766
+  data.tar.gz: b3c7f244a2762aa37460cd0fa50f61e219642ab2888a0fb1a55458c4c844bd322f1d7fc7fbe7fbb2589da841b2a5aec6da0b692e583cf07e251ab08c93c069f2

data/NOTES

@@ -1,6 +1,10 @@
+0.10.1
+-----
+* bearded/ruby-ldap PRs 44, 45, 46 pulled up
+
 0.10.0
 -----
-* Project forked, renamed to ruby-ldap3, porting to Ruby 3.x with previous PRs
+* Project forked, renamed to ruby-ldap3
 
 0.9.20
 -----

data/conn.c

@@ -1855,14 +1855,20 @@ Init_ldap_conn ()
 {
   rb_ldap_sort_obj = Qnil;
 
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 30000
   rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cData);
+#endif
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 30000
+  rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cObject);
+  rb_undef_alloc_func(rb_cLDAP_Conn);
+#endif
   rb_define_attr (rb_cLDAP_Conn, "referrals", 1, 0);
   rb_define_attr (rb_cLDAP_Conn, "controls", 1, 0);
   rb_define_attr (rb_cLDAP_Conn, "sasl_quiet", 1, 1);
-#if RUBY_VERSION_CODE < 170
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10700
   rb_define_singleton_method (rb_cLDAP_Conn, "new", rb_ldap_class_new, -1);
 #endif
-#if RUBY_VERSION_CODE >= 173
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10703
   rb_define_alloc_func (rb_cLDAP_Conn, rb_ldap_conn_s_allocate);
 #else
   rb_define_singleton_method (rb_cLDAP_Conn, "allocate",

data/entry.c

@@ -8,7 +8,7 @@
 
 VALUE rb_cLDAP_Entry;
 
-#if RUBY_VERSION_CODE >= 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10900
 static void
 rb_ldap_entry_mark(RB_LDAPENTRY_DATA *edata)
 {
@@ -88,11 +88,11 @@ rb_ldap_entry_new (LDAP * ldap, LDAPMessage * msg)
 {
   VALUE val;
   RB_LDAPENTRY_DATA *edata;
-#if RUBY_VERSION_CODE >= 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10900
   char *c_dn;
 #endif
 
-#if RUBY_VERSION_CODE >= 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10900
   val = Data_Make_Struct (rb_cLDAP_Entry, RB_LDAPENTRY_DATA,
 			  rb_ldap_entry_mark, rb_ldap_entry_free, edata);
 #else
@@ -102,7 +102,7 @@ rb_ldap_entry_new (LDAP * ldap, LDAPMessage * msg)
   edata->ldap = ldap;
   edata->msg = msg;
 
-#if RUBY_VERSION_CODE >= 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10900
   /* get dn */
   c_dn = ldap_get_dn(ldap, msg);
   if (c_dn) {
@@ -128,14 +128,14 @@ VALUE
 rb_ldap_entry_get_dn (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   char *cdn;
   VALUE dn;
 #endif
 
   GET_LDAPENTRY_DATA (self, edata);
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   cdn = ldap_get_dn (edata->ldap, edata->msg);
   if (cdn)
     {
@@ -166,7 +166,7 @@ VALUE
 rb_ldap_entry_get_values (VALUE self, VALUE attr)
 {
   RB_LDAPENTRY_DATA *edata;
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   char *c_attr;
   struct berval **c_vals;
   int i;
@@ -175,7 +175,7 @@ rb_ldap_entry_get_values (VALUE self, VALUE attr)
 #endif
 
   GET_LDAPENTRY_DATA (self, edata);
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   c_attr = StringValueCStr (attr);
 
   c_vals = ldap_get_values_len (edata->ldap, edata->msg, c_attr);
@@ -213,7 +213,7 @@ VALUE
 rb_ldap_entry_get_attributes (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   VALUE vals;
   char *attr;
   BerElement *ber = NULL;
@@ -223,7 +223,7 @@ rb_ldap_entry_get_attributes (VALUE self)
 
   GET_LDAPENTRY_DATA (self, edata);
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   vals = rb_ary_new ();
   for (attr = ldap_first_attribute (edata->ldap, edata->msg, &ber);
        attr != NULL;
@@ -259,7 +259,7 @@ rb_ldap_entry_get_attributes (VALUE self)
 VALUE
 rb_ldap_entry_to_hash (VALUE self)
 {
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   VALUE attrs = rb_ldap_entry_get_attributes (self);
   VALUE hash = rb_hash_new ();
   VALUE attr, vals;
@@ -269,7 +269,7 @@ rb_ldap_entry_to_hash (VALUE self)
   VALUE hash, dn_ary;
 #endif
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   Check_Type (attrs, T_ARRAY);
   rb_hash_aset (hash, rb_tainted_str_new2 ("dn"),
 		rb_ary_new3 (1, rb_ldap_entry_get_dn (self)));
@@ -305,7 +305,7 @@ rb_ldap_entry_inspect (VALUE self)
   str = rb_str_new (0, strlen (c) + 10 + 16 + 1);	/* 10:tags 16:addr 1:nul */
   sprintf (RSTRING_PTR (str), "#<%s:0x%lx\n", c, self);
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   RSTRING(str)->len = strlen (RSTRING_PTR (str));
 #else
   rb_str_set_len(str, strlen (RSTRING_PTR (str)));

data/extconf.rb

@@ -257,6 +257,12 @@ have_func("ldap_sasl_interactive_bind_s")
 
 $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
 
+def rb_ldap_rb_ver_code
+  ( _major, _minor, _teeny ) = RUBY_VERSION.split(/\D/)
+  _rvc = _major.to_i * 10000 + _minor.to_i * 100 + _teeny.to_i
+end
+$defs << "-DRB_LDAP_RVC=#{rb_ldap_rb_ver_code}"
+
 create_makefile("ldap")
 
 

data/ldap.c

@@ -201,7 +201,8 @@ rb_ldap_hash2mods (VALUE self, VALUE op, VALUE hash)
   VALUE tmp;
 
   tmp = rb_assoc_new (op, rb_ary_new ());
-  rb_iterate (rb_each, hash, rb_ldap_hash2mods_i, tmp);
+  /* Explicitly cast value per: https://github.com/bearded/ruby-ldap/issues/47#issuecomment-1645066553 */
+  rb_iterate (rb_each, hash, (rb_block_call_func_t) rb_ldap_hash2mods_i, tmp);
 
   return rb_ary_entry (tmp, 1);
 }

data/misc.c

@@ -131,7 +131,7 @@ rb_ldap_control_s_allocate (VALUE klass)
   return Data_Wrap_Struct (klass, 0, rb_ldap_control_free, ctl);
 }
 
-#if RUBY_VERSION_CODE < 170
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10700
 static VALUE
 rb_ldap_control_s_new (int argc, VALUE argv[], VALUE klass)
 {
@@ -479,11 +479,11 @@ Init_ldap_misc ()
 
 #ifdef HAVE_LDAPCONTROL
   rb_cLDAP_Control = rb_define_class_under (rb_mLDAP, "Control", rb_cObject);
-#if RUBY_VERSION_CODE < 170
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10700
   rb_define_singleton_method (rb_cLDAP_Control, "new",
                              rb_ldap_control_s_new, -1);
 #endif
-#if RUBY_VERSION_CODE >= 173
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10703
   rb_define_alloc_func (rb_cLDAP_Control, rb_ldap_control_s_allocate);
 #else
   rb_define_singleton_method (rb_cLDAP_Control, "allocate",

data/mod.c

@@ -283,7 +283,7 @@ rb_ldap_mod_inspect (VALUE self)
   str = rb_str_new (0, strlen (c) + 10 + 16 + 1);	/* 10:tags 16:addr 1:nul */
   sprintf (RSTRING_PTR (str), "#<%s:0x%lx ", c, self);
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
   RSTRING(str)->len = strlen (RSTRING_PTR (str));
 #else
   rb_str_set_len(str, strlen (RSTRING_PTR (str)));
@@ -336,10 +336,10 @@ void
 Init_ldap_mod ()
 {
   rb_cLDAP_Mod = rb_define_class_under (rb_mLDAP, "Mod", rb_cObject);
-#if RUBY_VERSION_CODE < 170
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10700
   rb_define_singleton_method (rb_cLDAP_Mod, "new", rb_ldap_class_new, -1);
 #endif
-#if RUBY_VERSION_CODE >= 173
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10703
   rb_define_alloc_func (rb_cLDAP_Mod, rb_ldap_mod_s_allocate);
 #else
   rb_define_singleton_method (rb_cLDAP_Mod, "allocate",

data/rbldap.h

@@ -28,7 +28,7 @@
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
 #define RB_LDAP_PATCH_VERSION 20
-#define RB_LDAP_VERSION "0.10.0"
+#define RB_LDAP_VERSION "0.10.1"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 
@@ -55,7 +55,7 @@ typedef struct rb_ldapentry_data
 {
   LDAP *ldap;
   LDAPMessage *msg;
-#if RUBY_VERSION_CODE >= 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 10900
   VALUE dn;
   VALUE attr;
 #endif
@@ -173,7 +173,7 @@ VALUE rb_ldap_mod_vals (VALUE);
   }; \
 }
 
-#if RUBY_VERSION_CODE < 190
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC < 10900
 #define GET_LDAPENTRY_DATA(obj,ptr) { \
   Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
   if( ! ptr->msg ){ \
@@ -205,3 +205,14 @@ VALUE rb_ldap_mod_vals (VALUE);
         rb_define_method(rb_cLDAP_Mod,method,cfunc,argc)
 
 #endif
+
+#if defined(RB_LDAP_RVC) && RB_LDAP_RVC >= 20700
+# if defined rb_tainted_str_new
+#  undef rb_tainted_str_new
+# endif
+# if defined rb_tainted_str_new2
+#  undef rb_tainted_str_new2
+# endif
+# define rb_tainted_str_new(p,l)	rb_str_new((p),(l))
+# define rb_tainted_str_new2(p)		rb_str_new_cstr((p))
+#endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldap3
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Shane Curcuru
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-25 00:00:00.000000000 Z
+date: 2025-01-26 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