From 636f146abf0a75cd3b21a57b50627ee149a635ab Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 6 Oct 2000 03:21:49 +0000 Subject: Restructuring of vfs layer to include a "this" pointer - can be an fsp or a conn struct depending on the call. We need this to have a clean NT ACL call interface. This will break any existing VFS libraries (that's why this is pre-release code). Andrew gets credit for this one :-) :-). In addition - added Herb's WITH_PROFILE changes - Herb - please examine the changes I've made to the smbd/reply.c code you added. The original code was very ugly and I have replaced it with a START_PROFILE(x)/END_PROFILE(x) pair using the preprocessor. Please check this compiles ok with the --with-profile switch. Jeremy. (This used to be commit b07611f8159b0b3f42e7e02611be9f4d56de96f5) --- source3/smbd/conn.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'source3/smbd/conn.c') diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c index c1f42be098..cd4ca9ded4 100644 --- a/source3/smbd/conn.c +++ b/source3/smbd/conn.c @@ -170,19 +170,11 @@ void conn_free(connection_struct *conn) /* Free vfs_connection_struct */ #ifdef HAVE_LIBDL - if (conn->vfs_conn != NULL) { + if (conn->dl_handle != NULL) { /* Close dlopen() handle */ - if (conn->vfs_conn->dl_handle) { - dlclose(conn->vfs_conn->dl_handle); - } -#endif /* HAVE_LIBDL */ - - if (conn->vfs_conn->groups != NULL) { - free(conn->vfs_conn->groups); - } - delete_nt_token(&conn->vfs_conn->nt_user_token); - free(conn->vfs_conn); + dlclose(conn->dl_handle); } +#endif /* HAVE_LIBDL */ DLIST_REMOVE(Connections, conn); -- cgit