Changeset d8c7cf4 in mod_gnutls

Timestamp:

Sep 24, 2010, 2:51:52 AM (9 years ago)

Author:

Nikos Mavrogiannopoulos <nmav@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

be90561

Parents:

771ca63

Message:

Only allow two options for DB. Berkeley DB and gdbm. The other options
such as SDBM had serious limitations. Thanks to Hardy Griech for pointing out.

Files:

• NEWS (modified) (1 diff)
• include/mod_gnutls.h.in (modified) (1 diff)
• src/gnutls_cache.c (modified) (4 diffs)
• src/gnutls_config.c (modified) (2 diffs)

NEWS

@@ -4 +4 @@
 
 - The GnuTLSCache variable now can be given the specific
-  option "sdbm" instead of "dbm". "dbm" will use the default
-  dbm type of libapr while sdbm will force sdbm to be used.
+  option "gdbm" instead of "dbm". "dbm" will use the berkeley
+  db type of libapr while gdbm will force gdbm to be used.
+  sdbm is no longer being used due to serious limitations.
 
 ** Version 0.5.8 (2010-08-18)

include/mod_gnutls.h.in

@@ -64 +64 @@
     mgs_cache_none,
     mgs_cache_dbm,
-    mgs_cache_sdbm,
+    mgs_cache_gdbm,
 #if HAVE_APR_MEMCACHE
     mgs_cache_memcache

src/gnutls_cache.c

@@ -297 +297 @@
 const char* db_type(mgs_srvconf_rec * sc)
 {
-        if (sc->cache_type == mgs_cache_sdbm)
-                return "sdbm";
+        if (sc->cache_type == mgs_cache_gdbm)
+                return "gdbm";
         else
-                return "default";
+                return "db";
 }
 
@@ -556 +556 @@
                                  mgs_srvconf_rec *sc)
 {
-    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
         return dbm_cache_post_config(p, s, sc);
     }
@@ -565 +565 @@
                                 mgs_srvconf_rec *sc)
 {
-    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
         return 0;
     }
@@ -580 +580 @@
 int mgs_cache_session_init(mgs_handle_t *ctxt)
 {
-    if (ctxt->sc->cache_type == mgs_cache_dbm || ctxt->sc->cache_type == mgs_cache_sdbm) {
+    if (ctxt->sc->cache_type == mgs_cache_dbm || ctxt->sc->cache_type == mgs_cache_gdbm) {
         gnutls_db_set_retrieve_function(ctxt->session, dbm_cache_fetch);
         gnutls_db_set_remove_function(ctxt->session, dbm_cache_delete);

src/gnutls_config.c

@@ -349 +349 @@
         sc->cache_type = mgs_cache_dbm;
     }
-    else if (strcasecmp("sdbm", type) == 0) {
-        sc->cache_type = mgs_cache_sdbm;
+    else if (strcasecmp("gdbm", type) == 0) {
+        sc->cache_type = mgs_cache_gdbm;
     }
 #if HAVE_APR_MEMCACHE
@@ -361 +361 @@
     }
 
-    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
         sc->cache_config = ap_server_root_relative(parms->pool, arg);
     } else {