From: Theodore Tso <tytso@mit.edu>
Date: Mon, 20 May 1996 22:17:27 +0000 (+0000)
Subject: Remove vestigal ODBM support
X-Git-Tag: krb5-1.0-beta6~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c52f5766c36cb07e8dcbf93249600235bca1468;p=krb5.git

Remove vestigal ODBM support

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8085 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index e21b75b79..a8c32452e 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 20 18:02:07 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* kdb_dbm.c (krb5_dbm_db_create): Remove vestigal ODBM support.
+
 Sat May 18 15:07:09 1996  Ezra Peisach  (epeisach@paris)
 
 	* kdb_dbm.c: Do not provide prototypes for dbm_error or
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index e93865f73..e42e31f9d 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -675,48 +675,16 @@ krb5_dbm_db_create(context, db_name)
     char *okname;
     int fd;
     register krb5_error_code retval = 0;
-#ifndef ODBM
     DBM *db;
-#else
-    char *dirname;
-    char *pagname;
-#endif
 
     if ((retval = k5dbm_init_context(context)))
 	return(retval);
     
-#ifndef ODBM
     db = KDBM_OPEN(context->db_context, db_name, O_RDWR|O_CREAT|O_EXCL, 0600);
     if (db == NULL)
 	retval = errno;
     else
 	KDBM_CLOSE(context->db_context, db);
-#else /* OLD DBM */
-    dirname = gen_dbsuffix(db_name, ".dir");
-    if (!dirname)
-	return ENOMEM;
-    pagname = gen_dbsuffix(db_name, ".pag");
-    if (!pagname) {
-	free_dbsuffix(dirname);
-	return ENOMEM;
-    }    
-
-    fd = open(dirname, O_RDWR|O_CREAT|O_EXCL, 0600);
-    if (fd < 0)
-	retval = errno;
-    else {
-	close(fd);
-	fd = open (pagname, O_RDWR|O_CREAT|O_EXCL, 0600);
-	if (fd < 0)
-	    retval = errno;
-	else
-	    close(fd);
-	if (dbminit(db_name) < 0)
-	    retval = errno;
-    }
-    free_dbsuffix(dirname);
-    free_dbsuffix(pagname);
-#endif /* ODBM */
     if (retval == 0) {
 	okname = gen_dbsuffix(db_name, KDBM_LOCK_EXT(context->db_context));
 	if (!okname)