| /trunk/debian/patches/templates_fallback_to_compiled.patch |
|---|
| File deleted |
| /trunk/debian/patches/series |
|---|
| 1,4 → 1,3 |
| makefile_install_config.patch |
| repair_ssl_session_db_on_version_mismatch.patch |
| makefile_install_config.patch |
| welcome_is_template.patch |
| templates_fallback_to_compiled.patch |
| accountd_makefile_typo.patch |
| /trunk/debian/patches/repair_ssl_session_db_on_version_mismatch.patch |
|---|
| 1,15 → 1,11 |
| --- a/lib/mydb_db3.c |
| +++ b/lib/mydb_db3.c |
| @@ -208,7 +208,11 @@ static int init(const char *dbdir, int m |
| @@ -208,7 +208,7 @@ static int init(const char *dbdir, int m |
| if (!(r = myinit(dbdir, myflags))) |
| return(0); |
| - if (r != ENOENT) { |
| + if (r != ENOENT |
| +#ifdef DB_VERSION_MISMATCH |
| + && r != DB_VERSION_MISMATCH |
| +#endif |
| + ) { |
| + if (r != ENOENT && r != DB_VERSION_MISMATCH) { |
| log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r)); |
| return MYDB_IOERROR; |
| } |