*** src/modules/standard/mod_auth_dbm.c.org Fri Dec 4 23:43:21 1998 --- src/modules/standard/mod_auth_dbm.c Fri Dec 4 23:44:13 1998 *************** *** 74,80 **** #include "http_core.h" #include "http_log.h" #include "http_protocol.h" ! #include /* * Module definition information - the part between the -START and -END --- 74,80 ---- #include "http_core.h" #include "http_log.h" #include "http_protocol.h" ! #include /* * Module definition information - the part between the -START and -END *************** *** 141,147 **** static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) { ! DBM *f; datum d, q; char *pw = NULL; --- 141,147 ---- static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) { ! GDBM_FILE f; datum d, q; char *pw = NULL; *************** *** 153,165 **** #endif ! if (!(f = dbm_open(auth_dbmpwfile, O_RDONLY, 0664))) { ap_log_rerror(APLOG_MARK, APLOG_ERR, r, "could not open dbm auth file: %s", auth_dbmpwfile); return NULL; } ! d = dbm_fetch(f, q); if (d.dptr) { pw = ap_palloc(r->pool, d.dsize + 1); --- 153,165 ---- #endif ! if (!(f = gdbm_open(auth_dbmpwfile, 0, GDBM_READER, 0664, 0))) { ap_log_rerror(APLOG_MARK, APLOG_ERR, r, "could not open dbm auth file: %s", auth_dbmpwfile); return NULL; } ! d = gdbm_fetch(f, q); if (d.dptr) { pw = ap_palloc(r->pool, d.dsize + 1); *************** *** 167,173 **** pw[d.dsize] = '\0'; /* Terminate the string */ } ! dbm_close(f); return pw; } --- 167,173 ---- pw[d.dsize] = '\0'; /* Terminate the string */ } ! gdbm_close(f); return pw; }