diff options
| author | Paul Park <pjpark@mit.edu> | 1995-05-26 22:45:36 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-05-26 22:45:36 +0000 |
| commit | 6e16566ffb18c0ca9997260417fdf8a2511a0298 (patch) | |
| tree | eaa194014cc31eac97d08a4b9949393c93f8596f /src/admin | |
| parent | a721f68e8b73f2a78664362dd318c4ba8fa451ee (diff) | |
| download | krb5-6e16566ffb18c0ca9997260417fdf8a2511a0298.tar.gz krb5-6e16566ffb18c0ca9997260417fdf8a2511a0298.tar.xz krb5-6e16566ffb18c0ca9997260417fdf8a2511a0298.zip | |
Change to new Berkeley Database naming convention
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5900 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin')
| -rw-r--r-- | src/admin/destroy/ChangeLog | 7 | ||||
| -rw-r--r-- | src/admin/destroy/Makefile.in | 2 | ||||
| -rw-r--r-- | src/admin/destroy/kdb5_destroy.c | 12 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog index 56a7b20531..4338bf6afd 100644 --- a/src/admin/destroy/ChangeLog +++ b/src/admin/destroy/ChangeLog @@ -1,3 +1,10 @@ + +Fri May 26 17:48:41 EDT 1995 Paul Park (pjpark@mit.edu) + * kdb5_destroy.c - Conditionalize implicit knowledge of filename + suffix under BERK_DB_DBM. If this is set, then use ".db" + otherwise, use ".dir" and ".pag". + * Makefile.in - Set BERK_DB_DBM when compiling. + Thu Mar 2 12:18:36 1995 Theodore Y. Ts'o <tytso@dcl> * Makefile.in (ISODELIB): Remove reference to $(ISODELIB). diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index 01303acab6..4beae3d325 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -1,4 +1,4 @@ -CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) +CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DBERK_DB_DBM LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c index 7eeb04c724..964aa4d4a1 100644 --- a/src/admin/destroy/kdb5_destroy.c +++ b/src/admin/destroy/kdb5_destroy.c @@ -87,6 +87,7 @@ main(argc, argv) exit(1); printf("OK, deleting database '%s'...\n", dbname); } +#ifndef BERK_DB_DBM (void) strcpy(dbfilename, dbname); (void) strcat(dbfilename, ".dir"); if (unlink(dbfilename) == -1) { @@ -109,6 +110,17 @@ main(argc, argv) "Database may be partially deleted--inspect files manually!\n"); exit(1); } +#else /* BERK_DB_DBM */ + (void) strcpy(dbfilename, dbname); + (void) strcat(dbfilename, ".db"); + if (unlink(dbfilename) == -1) { + retval = errno; + com_err(argv[0], retval, "deleting database file '%s'",dbfilename); + fprintf(stderr, + "Database may be partially deleted--inspect files manually!\n"); + exit(1); + } +#endif /* BERK_DB_DBM */ (void) strcpy(dbfilename, dbname); (void) strcat(dbfilename, ".ok"); if (unlink(dbfilename) == -1) { |