diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/client/smbmount.c | 3 | ||||
| -rw-r--r-- | source3/lib/gencache.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c index 4438964b83..d8254ef23a 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -386,6 +386,9 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat c = NULL; if (!closed) { + /* close the name cache so that close_our_files() doesn't steal its FD */ + namecache_shutdown(); + /* redirect stdout & stderr since we can't know that the library functions we use are using DEBUG. */ if ( (fd = open("/dev/null", O_WRONLY)) < 0) diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 85599c92d3..fd44616270 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -83,10 +83,13 @@ BOOL gencache_init(void) BOOL gencache_shutdown(void) { + int ret; /* tdb_close routine returns -1 on error */ if (!cache) return False; DEBUG(5, ("Closing cache file\n")); - return tdb_close(cache) != -1; + ret = tdb_close(cache); + cache = NULL; + return ret != -1; } |