Changeset b072204 in mod_gnutls


Ignore:
Timestamp:
Mar 3, 2008, 9:04:01 AM (11 years ago)
Author:
Nokis Mavrogiannopoulos <nmav@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
fc4c2e47
Parents:
b333517
git-author:
Nikos Mavrogiannopoulos <nmav@…> (03/03/08 09:04:01)
git-committer:
Nokis Mavrogiannopoulos <nmav@…> (03/03/08 09:04:01)
Message:

corrected SRP enable flag, and corrected the DBM hook support. It now free data needed by some DBM providers.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • autogen.sh

    rb333517 rb072204  
    11#!/bin/sh
    22
    3 if [ -z $ACLOCAL ]; then
    4         ACLOCAL=aclocal
    5 fi
    6 if [ -z $AUTOCONF ]; then
    7         AUTOCONF=autoconf
    8 fi
    9 if [ -z $AUTOHEADER ]; then
    10         AUTOHEADER=autoheader
    11 fi
    123if [ -z $AUTORECONF ]; then
    134        AUTORECONF=autoreconf
     
    156
    167#rm -rf autom4te.cache
    17 $AUTORECONF -f -i
     8$AUTORECONF -f -v -i
    189#touch stamp-h.in
    1910
    20 for x in providers/*; do
    21         if [ -e $x/autogen.sh ]; then
    22                 echo Generating Config files in $x
    23                 (cd $x; ./autogen.sh $*)
    24         fi
    25 done
  • configure.ac

    rb333517 rb072204  
    4242               [unconditionally disable the SRP functionality]),
    4343       use_srp=$enableval, use_srp=yes)
     44
     45SRP_CFLAGS=""
    4446if test "$use_srp" != "no"; then
    45         AC_DEFINE_UNQUOTED(ENABLE_SRP, 1, [whether to enable SRP])
     47        SRP_CFLAGS="-DENABLE_SRP=1"
    4648fi
    4749AC_MSG_CHECKING([whether to enable SRP functionality])
     
    5456AC_SUBST(have_apr_memcache)
    5557
    56 MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     58MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
    5759MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_EXTRA_LIBS}"
    5860
     
    6971echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    7072echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
     73echo "   * SRP Authentication:          ${use_srp}"
    7174echo ""
    7275echo "---"
  • src/gnutls_cache.c

    rb333517 rb072204  
    11/**
    22 *  Copyright 2004-2005 Paul Querna
     3 *  Portions Copyright 2008 Nikos Mavrogiannopoulos
    34 *
    45 *  Licensed under the Apache License, Version 2.0 (the "License");
     
    346347                }
    347348            }
     349            apr_dbm_freedatum( dbm, dbmval);
    348350           
    349351        }
     
    402404
    403405    if (dbmval.dptr == NULL || dbmval.dsize <= sizeof(apr_time_t)) {
     406        apr_dbm_freedatum( dbm, dbmval);
    404407        apr_dbm_close(dbm);
    405408        return data;
    406409    }
    407     apr_dbm_close(dbm);
    408410
    409411    data.size = dbmval.dsize - sizeof(apr_time_t);
     
    411413    data.data = gnutls_malloc(data.size);
    412414    if (data.data == NULL) {
     415        apr_dbm_freedatum( dbm, dbmval);
     416        apr_dbm_close(dbm);
    413417        return data;
    414418    }
    415419   
    416420    memcpy(data.data, dbmval.dptr+sizeof(apr_time_t), data.size);
     421
     422    apr_dbm_freedatum( dbm, dbmval);
     423    apr_dbm_close(dbm);
    417424
    418425    return data;
  • src/mod_gnutls.c

    rb333517 rb072204  
    1717
    1818#include "mod_gnutls.h"
    19 
    2019
    2120static void gnutls_hooks(apr_pool_t * p)
Note: See TracChangeset for help on using the changeset viewer.