diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-01-15 19:45:18 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-01-15 19:45:18 +0000 |
| commit | f6ac6875d7f54aeaa14ef9e523c6ebdf5c0995be (patch) | |
| tree | f61769d736be3574b47958530dc1fdd93275c067 /usr.sbin/ctm | |
| parent | 515d7c92d3d615e260c93049e2b046aee9be39e8 (diff) | |
| download | src-test2-f6ac6875d7f54aeaa14ef9e523c6ebdf5c0995be.tar.gz src-test2-f6ac6875d7f54aeaa14ef9e523c6ebdf5c0995be.zip | |
Notes
Diffstat (limited to 'usr.sbin/ctm')
| -rw-r--r-- | usr.sbin/ctm/ctm/ctm_pass2.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c index ea298955646f..be4dbf284b2f 100644 --- a/usr.sbin/ctm/ctm/ctm_pass2.c +++ b/usr.sbin/ctm/ctm/ctm_pass2.c @@ -154,7 +154,12 @@ Pass2(FILE *fd) strcmp(tmp,p)) { fprintf(stderr," %s: %s md5 mismatch.\n", sp->Key,name); - if(j & CTM_Q_MD5_Force) { + GETFIELDCOPY(md5,sep); + if(md5 != NULL && strcmp(tmp,md5) == 0) { + fprintf(stderr," %s: %s already applied.\n", + sp->Key,name); + match = CTM_FILTER_DISABLE; + } else if(j & CTM_Q_MD5_Force) { if(Force) fprintf(stderr," Can and will force.\n"); else @@ -165,9 +170,10 @@ Pass2(FILE *fd) } } break; - } - if(j & CTM_Q_MD5_After) { - GETFIELDCOPY(md5,sep); + } else if(j & CTM_Q_MD5_After) { + if(md5 == NULL) { + GETFIELDCOPY(md5,sep); + } break; } /* Unqualified MD5 */ |