← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apache2/saucy

« back to all changes in this revision

Viewing changes to srclib/apr-util/ldap/apr_ldap_rebind.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/ldap/apr_ldap_rebind.c
81
81
    get_apd
82
82
#endif
83
83
 
 
84
#if APR_HAS_THREADS
84
85
    /* run after apr_thread_mutex_create cleanup */
85
86
    apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
86
87
                              apr_pool_cleanup_null);
87
88
 
88
 
#if APR_HAS_THREADS
89
89
    if (apr_ldap_xref_lock == NULL) {
90
90
        retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
91
91
    }