Skip to content

Commit 21e6e0a

Browse files
committed
tools: delete cgkrepair
1 parent 2adcde0 commit 21e6e0a

File tree

5 files changed

+11
-386
lines changed

5 files changed

+11
-386
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Makefile.in
2626
/libtool
2727
/stamp-h1
2828

29-
/cgkrepair
3029
/delivery
3130
/delivery-queue
3231
/dldcheck

Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ AM_TESTS_ENVIRONMENT = export TEST_PATH=${top_srcdir}/data;
1010

1111
lib_LTLIBRARIES = libgromox_common.la libgromox_dbop.la libgromox_epoll.la libgromox_mapi.la libgromox_exrpc.la libgromox_rpc.la ${program_plugins}
1212
noinst_LTLIBRARIES = libgromox_abtree.la
13-
pkglibexec_PROGRAMS = cgkrepair delivery delivery-queue event gromox-snapshot http imap midb pop3 timer zcore tools/authtry tools/eidprint tools/textmapquery
13+
pkglibexec_PROGRAMS = delivery delivery-queue event gromox-snapshot http imap midb pop3 timer zcore tools/authtry tools/eidprint tools/textmapquery
1414
if WITH_GNU_LD
1515
version_sc_SYFLAGS = -Wl,--version-script=${srcdir}/default.sym
1616
endif
@@ -64,7 +64,7 @@ if HAVE_PFF
6464
sbin_PROGRAMS += gromox-pff2mt
6565
endif
6666
dist_sbin_SCRIPTS = gromox-abktpull tools/gromox-exm2ical tools/gromox-exm2mt tools/gromox-exm2tnef tools/gromox-exm2vcf tools/gromox-ical2mt tools/gromox-mbox2mt tools/gromox-tnef2mt tools/gromox-vcf2mt
67-
dist_pkglibexec_SCRIPTS = tools/kdb-uidextract tools/kdb-uidextract-limited
67+
dist_pkglibexec_SCRIPTS = cgkrepair tools/kdb-uidextract tools/kdb-uidextract-limited
6868
noinst_DATA = dldcheck.stamp
6969

7070
BUILT_SOURCES = exch/exmdb/rpc.cpp include/exmdb_dispatch.cpp include/mapierr.cpp include/mapitags.cpp include/zrpc_dispatch.cpp include/gromox/paths.h lib/exmdb_rpc.cpp php_mapi/zrpc.cpp
@@ -182,8 +182,6 @@ libgxs_ruleproc_la_LDFLAGS = ${default_SYFLAGS}
182182
libgxs_ruleproc_la_LIBADD = ${vmime_LIBS} libgromox_common.la libgromox_exrpc.la libgxs_mysql_adaptor.la
183183
EXTRA_libgxs_ruleproc_la_DEPENDENCIES = ${default_SYM}
184184

185-
cgkrepair_SOURCES = tools/cgkrepair.cpp tools/genimport.cpp tools/genimport.hpp
186-
cgkrepair_LDADD = ${gromox_mt2exm_LDADD}
187185
pam_gromox_la_CPPFLAGS = ${AM_CPPFLAGS}
188186
pam_gromox_la_SOURCES = tools/pam_gromox.cpp
189187
pam_gromox_la_LIBADD = ${libHX_LIBS} ${pam_LIBS} libgromox_auth.la libgromox_common.la libgxs_mysql_adaptor.la

doc/cgkrepair.8gx

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,9 @@
33
.TH cgkrepair 8gx "" "Gromox" "Gromox admin reference"
44
.SH Name
55
\fBcgkrepair\fP \(em Repair broken Change Key and PCL properties
6-
.SH Synopsis
7-
\fB/usr/libexec/gromox/cgkrepair [options] \-e\fP
8-
[\fIuser\fP]\fB@\fIdomain\fP
6+
.SH Description
7+
This utility has been replaced by
98
.PP
10-
For a given store, cgkrepair looks at all folder and message objects whether
11-
they have reasonably-looking values for PR_CHANGE_KEY and
12-
PR_PREDECESSOR_CHANGE_LIST. It emits a line for objects with problems, along
13-
with status letters in square brackets to
14-
indicate individual tests that have failed.
9+
gromox\-mbop -u ... cgkreset
1510
.PP
16-
message 6f5739h [--P] (new key: 8000008a04a7h)
17-
.PP
18-
The possible flags include:
19-
.IP \(bu 4
20-
Z: The size of PR_CHANGE_KEY did not match the requirements of the MS-OXCFXICS
21-
v25 specification \sc2.2.1.2.7.
22-
.IP \(bu 4
23-
N: PR_CHANGE_KEY is in the future.
24-
.IP \(bu 4
25-
P: PR_PREDECESSOR_LIST contains a Change Key that is in the future or which
26-
does not match the requirements of MS-OXCFXICS.
27-
.PP
28-
When a problem is found, or when \-\-force\-fix is specified, a new Change Key
29-
is issued and the PCL updated. Change Keys are a monotonic counter for recency,
30-
something quite like a timestamp, but not bound to a clock. Fixing Change Keys
31-
can make them go backwards, and since the server now apparently has an "older"
32-
item, clients do not necessarily synchronize it anymore, therefore, .ost files
33-
should be deleted to purge bad CKs from the client side as well.
34-
.SH Options
35-
.TP
36-
\fB\-\-force\-fix\fP
37-
Replace Change Keys and PCLs of all objects regardless of whether they were
38-
considered broken or not.
39-
.TP
40-
\fB\-\-skip\-msg\fP
41-
Only process folder objects.
42-
.TP
43-
\fB\-e\fP [\fIuser\fP]\fB@\fP\fIdomain\fP
44-
Operate on the given private/user store or public/domain mailbox.
45-
.TP
46-
\fB\-n\fP
47-
Perform a dry run.
11+
which is a server-assisted hard reset of CN/CK/PCL.

doc/gromox-mbop.8

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@ when the mailbox has CN corruption and gromox-http/emsmdb has thrown the error
9696
"INSERT INTO messages ... UNIQUE constraint failed: messages.change_number"
9797
.PP
9898
After execution, .ost files referencing the reset mailbox should be deleted.
99-
`gromox\-mbop cgkreset` is different from `/usr/libexec/gromox/cgkrepair` in
100-
that cgkreset does not make any attempts to keep synchronization state; it just
101-
resets everything, unconditionally. On the other hand, cgkrepair is unable to
102-
get to all fields that may need resetting.
99+
`gromox\-mbop cgkreset` is different from the earlier
100+
`/usr/libexec/gromox/cgkrepair` in that cgkreset does not make any attempts to
101+
keep synchronization state; it just resets everything, unconditionally. On the
102+
other hand, cgkrepair (now deleted) was unable to get to all fields that may
103+
need resetting.
103104
.SH clear\-photo
104105
The clear\-photo command will delete the user picture. Note that, when there is
105106
no mailbox-level profile picture set, Gromox server processes may serve an

0 commit comments

Comments
 (0)