← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to srclib/apr-util/dbm/apr_dbm.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-02-12 20:06:35 UTC
  • mfrom: (14.3.34 sid)
  • Revision ID: package-import@ubuntu.com-20120212200635-2u9d58jxqkmx91na
Tags: 2.2.22-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/dbm/apr_dbm.c
171
171
#endif
172
172
    apr_snprintf(symname, sizeof(symname), "apr_dbm_type_%s", type);
173
173
 
174
 
    rv = apu_dso_load(&symbol, modname, symname, pool);
 
174
    rv = apu_dso_load(NULL, &symbol, modname, symname, pool);
175
175
    if (rv == APR_SUCCESS || rv == APR_EINIT) { /* previously loaded?!? */
176
176
        *vtable = symbol;
177
177
        if (usertype)