diff options
| author | pst <pst@FreeBSD.org> | 1995-08-02 23:08:18 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1995-08-02 23:08:18 +0000 |
| commit | 8d218a37bd2b60abc5c1267bee0adc008f8004d9 (patch) | |
| tree | 57f9d8f43bfc417a4ddd56a768406b55cea31146 /eBones/usr.sbin | |
| parent | e8ffa878fc09e10391cfe1777019da005f3dfa5c (diff) | |
| download | FreeBSD-src-8d218a37bd2b60abc5c1267bee0adc008f8004d9.zip FreeBSD-src-8d218a37bd2b60abc5c1267bee0adc008f8004d9.tar.gz | |
Make the DB/DBM routines generic (ifdef FreeBSD considered evil), and
also fix a string allocation bug.
Submitted by: Havard Eidnes
Diffstat (limited to 'eBones/usr.sbin')
| -rw-r--r-- | eBones/usr.sbin/kdb_destroy/kdb_destroy.c | 26 | ||||
| -rw-r--r-- | eBones/usr.sbin/kdb_util/kdb_util.c | 6 |
2 files changed, 18 insertions, 14 deletions
diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c index 29c68a8..95206fe 100644 --- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c +++ b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c @@ -4,12 +4,12 @@ * <Copyright.MIT>. * * from: kdb_destroy.c,v 4.0 89/01/24 21:49:02 jtkohl Exp $ - * $Id: kdb_destroy.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $ + * $Id: kdb_destroy.c,v 1.2 1995/01/25 19:57:27 ache Exp $ */ #ifndef lint static char rcsid[] = -"$Id: kdb_destroy.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $"; +"$Id: kdb_destroy.c,v 1.2 1995/01/25 19:57:27 ache Exp $"; #endif lint #include <strings.h> @@ -17,24 +17,28 @@ static char rcsid[] = #include "krb.h" #include "krb_db.h" +#ifdef dbm_pagfno +#define DB +#endif + main() { char answer[10]; /* user input */ char dbm[256]; /* database path and name */ char dbm1[256]; /* database path and name */ -#ifndef __FreeBSD__ - char *file1, *file2; /* database file names */ -#else +#ifdef DB char *file; /* database file names */ +#else + char *file1, *file2; /* database file names */ #endif strcpy(dbm, DBM_FILE); -#ifndef __FreeBSD__ +#ifdef __FreeBSD__ + file = strcat(dbm, ".db"); +#else strcpy(dbm1, DBM_FILE); file1 = strcat(dbm, ".dir"); file2 = strcat(dbm1, ".pag"); -#else - file = strcat(dbm, ".db"); #endif printf("You are about to destroy the Kerberos database "); @@ -43,10 +47,10 @@ main() fgets(answer, sizeof(answer), stdin); if (answer[0] == 'y' || answer[0] == 'Y') { -#ifndef __FreeBSD__ - if (unlink(file1) == 0 && unlink(file2) == 0) -#else +#ifdef DB if (unlink(file) == 0) +#else + if (unlink(file1) == 0 && unlink(file2) == 0) #endif fprintf(stderr, "Database deleted at %s\n", DBM_FILE); else diff --git a/eBones/usr.sbin/kdb_util/kdb_util.c b/eBones/usr.sbin/kdb_util/kdb_util.c index 7bc8559..97f7a65e 100644 --- a/eBones/usr.sbin/kdb_util/kdb_util.c +++ b/eBones/usr.sbin/kdb_util/kdb_util.c @@ -12,12 +12,12 @@ * Written July 9, 1987 by Jeffrey I. Schiller * * from: kdb_util.c,v 4.4 90/01/09 15:57:20 raeburn Exp $ - * $Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $ + * $Id: kdb_util.c,v 1.2 1995/05/30 06:40:44 rgrimes Exp $ */ #ifndef lint static char rcsid[] = -"$Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $"; +"$Id: kdb_util.c,v 1.2 1995/05/30 06:40:44 rgrimes Exp $"; #endif lint #include <stdio.h> @@ -220,7 +220,7 @@ load_db (db_file, input_file) long time_explode(); int code; char *temp_db_file; - temp1 = strlen(db_file+2); + temp1 = strlen(db_file)+2; temp_db_file = malloc (temp1); strcpy(temp_db_file, db_file); strcat(temp_db_file, "~"); |
