@@ -32,6 +32,7 @@ sbin_PROGRAMS = fedfs-null \
fedfs-lookup-replication
LDADD = $(LIBTIRPC) $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
$(LIBSQLITE3) $(LIBIDN) $(LIBUUID) \
+ $(LIBCRYPTO) $(LIBSSL) \
$(top_builddir)/src/libadmin/libadmin.la \
$(top_builddir)/src/libjunction/libjunction.la \
$(top_builddir)/src/libnsdb/libnsdb.la \
@@ -1627,12 +1627,15 @@ out:
static FedFsStatus
nsdb_delete_nsdbparams(nsdb_t host)
{
+ const char *old_certfile;
FedFsStatus retval;
sqlite3 *db;
xlog(D_CALL, "%s: deleting parameters for NSDB '%s'",
__func__, host->fn_hostname);
+ old_certfile = nsdb_certfile(host);
+
retval = FEDFS_ERR_IO;
db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE);
if (db == NULL)
@@ -1642,6 +1645,7 @@ nsdb_delete_nsdbparams(nsdb_t host)
if (retval != FEDFS_OK)
goto out_close;
+ nsdb_connsec_remove_certfile(old_certfile);
retval = FEDFS_OK;
out_close:
@@ -1746,7 +1750,7 @@ nsdb_delete_nsdb(const char *hostname, const unsigned short port)
nsdb_t host;
FedFsStatus retval;
- retval = nsdb_new_nsdb(hostname, port, &host);
+ retval = nsdb_lookup_nsdb(hostname, port, &host);
if (retval != FEDFS_OK)
return retval;
@@ -28,7 +28,7 @@ sbin_PROGRAMS = nfsref
nfsref_SOURCES = add.c lookup.c nfsref.c remove.c
LDADD = $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
$(LIBSQLITE3) $(LIBIDN) $(LIBUUID) \
- $(LIBURIPARSER) \
+ $(LIBURIPARSER) $(LIBCRYPTO) $(LIBSSL) \
$(top_builddir)/src/libnsdb/libnsdb.la \
$(top_builddir)/src/libxlog/libxlog.la \
$(top_builddir)/src/libjunction/libjunction.la
@@ -30,7 +30,7 @@ sbin_PROGRAMS = nsdb-annotate nsdb-describe nsdb-list \
nsdb-create-fsl nsdb-delete-fsl nsdb-update-fsl
LDADD = $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
$(LIBSQLITE3) $(LIBIDN) $(LIBUUID) \
- $(LIBURIPARSER) \
+ $(LIBURIPARSER) $(LIBCRYPTO) $(LIBSSL) \
$(top_builddir)/src/libnsdb/libnsdb.la \
$(top_builddir)/src/libxlog/libxlog.la \
$(top_builddir)/src/libjunction/libjunction.la
@@ -28,7 +28,7 @@ sbin_PROGRAMS = nsdbparams
nsdbparams_SOURCES = delete.c list.c main.c show.c update.c
LDADD = $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
$(LIBSQLITE3) $(LIBIDN) $(LIBUUID) $(LIBCAP) \
- $(LIBURIPARSER) \
+ $(LIBURIPARSER) $(LIBCRYPTO) $(LIBSSL) \
$(top_builddir)/src/libnsdb/libnsdb.la \
$(top_builddir)/src/libjunction/libjunction.la \
$(top_builddir)/src/libxlog/libxlog.la
An NSDB's certfile should be removed when an NSDB is deleted. This change affects both fedfsd and the nsdbparams command. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- src/fedfsc/Makefile.am | 1 + src/libnsdb/nsdb.c | 6 +++++- src/nfsref/Makefile.am | 2 +- src/nsdbc/Makefile.am | 2 +- src/nsdbparams/Makefile.am | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-)