projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f614f64
)
war on lhfs
author
Art Cancro
<ajc@citadel.org>
Wed, 27 Jan 2021 21:40:17 +0000
(16:40 -0500)
committer
Art Cancro
<ajc@citadel.org>
Wed, 27 Jan 2021 21:40:17 +0000
(16:40 -0500)
citadel/COPYING
patch
|
blob
|
history
citadel/README.txt
patch
|
blob
|
history
citadel/control.c
patch
|
blob
|
history
citadel/include/citadel_dirs.h
patch
|
blob
|
history
citadel/utillib/citadel_dirs.c
patch
|
blob
|
history
diff --git
a/citadel/COPYING
b/citadel/COPYING
index 9e761eb0d79a5a4811ab2a7d7f9a137bc2700453..242017fb978efae06084c9b13533ac16096a561a 100644
(file)
--- a/
citadel/COPYING
+++ b/
citadel/COPYING
@@
-1,5
+1,5
@@
-Copyright: (C) 1987-202
0
Citadel development team; GPL V3
+Copyright: (C) 1987-202
1
Citadel development team; GPL V3
* In addition, as a special exception, we hereby declare that our
favorite type of software is called "open source" -- NOT "free
* In addition, as a special exception, we hereby declare that our
favorite type of software is called "open source" -- NOT "free
diff --git
a/citadel/README.txt
b/citadel/README.txt
index 502c7ec2a32e56914d05b86d7497afa3a9e34ac0..3b5829d61b9d0a1343b607f63e7e71dc0c7dd89e 100644
(file)
--- a/
citadel/README.txt
+++ b/
citadel/README.txt
@@
-4,7
+4,7
@@
* The condensed version:
1. Create a user on your system under which to run Citadel
* The condensed version:
1. Create a user on your system under which to run Citadel
- 2. Install supported versions of Berkeley DB, libical, and
libsieve
.
+ 2. Install supported versions of Berkeley DB, libical, and
Expat
.
3. ./configure && make && make install
4. Run the "setup" program
3. ./configure && make && make install
4. Run the "setup" program
diff --git
a/citadel/control.c
b/citadel/control.c
index 3ab6ac84fa3a8918bd9135cfc6d1906fbf9c68b5..a99bbf6f67f56d671539926c7b1b0ffae247a715 100644
(file)
--- a/
citadel/control.c
+++ b/
citadel/control.c
@@
-123,7
+123,7
@@
void migrate_legacy_control_record(void)
struct legacy_ctrl_format c;
memset(&c, 0, sizeof(c));
struct legacy_ctrl_format c;
memset(&c, 0, sizeof(c));
- fp = fopen(
file_citadel_control
, "rb+");
+ fp = fopen(
"citadel.control"
, "rb+");
if (fp != NULL) {
syslog(LOG_INFO, "control: legacy format record found -- importing to db");
fread(&c, sizeof(struct legacy_ctrl_format), 1, fp);
if (fp != NULL) {
syslog(LOG_INFO, "control: legacy format record found -- importing to db");
fread(&c, sizeof(struct legacy_ctrl_format), 1, fp);
@@
-137,8
+137,8
@@
void migrate_legacy_control_record(void)
CtdlSetConfigLong( "MMfulltext", c.MMfulltext);
fclose(fp);
CtdlSetConfigLong( "MMfulltext", c.MMfulltext);
fclose(fp);
- if (unlink(
file_citadel_control
) != 0) {
- fprintf(stderr, "Unable to remove legacy control record
%s after migrating it.\n", file_citadel_control
);
+ if (unlink(
"citadel.control"
) != 0) {
+ fprintf(stderr, "Unable to remove legacy control record
after migrating it.\n"
);
fprintf(stderr, "Exiting to prevent data corruption.\n");
exit(CTDLEXIT_CONFIG);
}
fprintf(stderr, "Exiting to prevent data corruption.\n");
exit(CTDLEXIT_CONFIG);
}
diff --git
a/citadel/include/citadel_dirs.h
b/citadel/include/citadel_dirs.h
index b654f17db3be7b11919a602b29f2173e9a720f9e..b30b4c6f2aec009074d763c8f0c235cd05216df5 100644
(file)
--- a/
citadel/include/citadel_dirs.h
+++ b/
citadel/include/citadel_dirs.h
@@
-30,7
+30,6
@@
extern char ctdl_utilbin_dir[PATH_MAX];
/* some of the frequently used files */
/* some of the frequently used files */
-extern char file_citadel_control[PATH_MAX];
extern char file_citadel_config[PATH_MAX];
extern char file_lmtp_socket[PATH_MAX];
extern char file_lmtp_unfiltered_socket[PATH_MAX];
extern char file_citadel_config[PATH_MAX];
extern char file_lmtp_socket[PATH_MAX];
extern char file_lmtp_unfiltered_socket[PATH_MAX];
diff --git
a/citadel/utillib/citadel_dirs.c
b/citadel/utillib/citadel_dirs.c
index a20db278f520e1828f38942e205713962ebfdc12..dfaaee8dbd51f708f073c0b8ce32982c7f72981b 100644
(file)
--- a/
citadel/utillib/citadel_dirs.c
+++ b/
citadel/utillib/citadel_dirs.c
@@
-47,7
+47,6
@@
char ctdl_sbin_dir[PATH_MAX]="";
char ctdl_bin_dir[PATH_MAX]="";
/* some of our files, that are needed in several places */
char ctdl_bin_dir[PATH_MAX]="";
/* some of our files, that are needed in several places */
-char file_citadel_control[PATH_MAX]="";
char file_citadel_config[PATH_MAX]="";
char file_lmtp_socket[PATH_MAX]="";
char file_lmtp_unfiltered_socket[PATH_MAX]="";
char file_citadel_config[PATH_MAX]="";
char file_lmtp_socket[PATH_MAX]="";
char file_lmtp_unfiltered_socket[PATH_MAX]="";
@@
-179,12
+178,7
@@
void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir,
"%srefcount_adjustments.dat",
ctdl_autoetc_dir);
StripSlashes(file_arcq, 0);
"%srefcount_adjustments.dat",
ctdl_autoetc_dir);
StripSlashes(file_arcq, 0);
- snprintf(file_citadel_control,
- sizeof file_citadel_control,
- "%scitadel.control",
- ctdl_autoetc_dir
- );
- StripSlashes(file_citadel_control, 0);
+
snprintf(file_citadel_config,
sizeof file_citadel_config,
"%scitadel.config",
snprintf(file_citadel_config,
sizeof file_citadel_config,
"%scitadel.config",
@@
-272,7
+266,6
@@
void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir,
DBG_PRINT(ctdl_sbin_dir);
DBG_PRINT(ctdl_bin_dir);
DBG_PRINT(ctdl_utilbin_dir);
DBG_PRINT(ctdl_sbin_dir);
DBG_PRINT(ctdl_bin_dir);
DBG_PRINT(ctdl_utilbin_dir);
- DBG_PRINT(file_citadel_control);
DBG_PRINT(file_citadel_config);
DBG_PRINT(file_lmtp_socket);
DBG_PRINT(file_lmtp_unfiltered_socket);
DBG_PRINT(file_citadel_config);
DBG_PRINT(file_lmtp_socket);
DBG_PRINT(file_lmtp_unfiltered_socket);