← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/apache2/intrepid

« back to all changes in this revision

Viewing changes to srclib/apr-util/dbd/apr_dbd.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Fritsch
  • Date: 2007-10-18 19:35:40 UTC
  • mfrom: (0.13.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071018193540-u9bl0154m45xppyj
Tags: 2.2.6-2
http://bugs.debian.org/445263
http://bugs.debian.org/447164
http://bugs.debian.org/400918
http://bugs.debian.org/443310
http://bugs.debian.org/331631
http://bugs.debian.org/294662
* Avoid calling apr_pollset_poll() and accept_func() when the listening
  sockets have already been closed on graceful stop or reload. This
  hopefully fixes processes not being killed (closes: #445263, #447164)
  and the "Bad file descriptor: apr_socket_accept: (client socket)"
  error message (closes: #400918, #443310)
* Allow logresolve to process long lines (Closes: #331631)
* Remove duplicate config examples (Closes: #294662)
* Include README.backtrace describing how to create a backtrace
* Add CVE reference to 2.2.6-1 changelog entry

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/dbd/apr_dbd.c
125
125
#endif
126
126
 
127
127
#ifdef WIN32
128
 
    sprintf(path, "apr_dbd_%s.dll", name);
 
128
    apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
 
129
#elif defined(NETWARE)
 
130
    apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
129
131
#else
130
 
    sprintf(path, "apr_dbd_%s.so", name);
 
132
    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
131
133
#endif
132
134
    rv = apr_dso_load(&dlhandle, path, pool);
133
135
    if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
134
136
        goto unlock;
135
137
    }
136
 
    sprintf(path, "apr_dbd_%s_driver", name);
 
138
    apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
137
139
    rv = apr_dso_sym((void*)driver, dlhandle, path);
138
140
    if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */
139
141
        apr_dso_unload(dlhandle);
160
162
                                       apr_dbd_t **handle)
161
163
{
162
164
    apr_status_t rv;
163
 
    *handle = driver->open(pool, params);
 
165
    *handle = (driver->open)(pool, params);
164
166
    if (*handle == NULL) {
165
167
        return APR_EGENERAL;
166
168
    }