The branch, master has been updated
via 9620791... s3: Remove unused delete_negative_conn_cache()
via ffab1a2... s3: Remove unused flush_negative_conn_cache()
via 53bf5f0... s3: Remove some unnecessary variables from
libsmb/conn_cache.c
via a3f43e3... s3: Fix a comment in conn_cache.c
via 0421098... s3: Fix a 64-bit error
via daecb74... s3: Remove some pointless SMB_ASSERTs
via 56f9d18... s3: Remove some pointless casts
from 6dcbb84... Attempt to fix one of the last two bugs with the full
Windows ACL support.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 96207912cb4a4073849be95458a4e4e2d54bbb34
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:51:50 2009 +0100
s3: Remove unused delete_negative_conn_cache()
commit ffab1a23187c720402008513e73d3fb5a17de40a
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:50:39 2009 +0100
s3: Remove unused flush_negative_conn_cache()
commit 53bf5f0064757ec6bad9cbe7bd8a0b34108fc4d7
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:47:35 2009 +0100
s3: Remove some unnecessary variables from libsmb/conn_cache.c
commit a3f43e3d86a1445ad775a151dbd9b08c06c7ded9
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:46:16 2009 +0100
s3: Fix a comment in conn_cache.c
commit 04210986f1cae2cd17984b95b96cfd3561ad49da
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:40:24 2009 +0100
s3: Fix a 64-bit error
commit daecb747e47884af9107a06cc4f03cabb1ab83aa
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:36:00 2009 +0100
s3: Remove some pointless SMB_ASSERTs
commit 56f9d18fba6a6b426cb3ea539571cea2111cca46
Author: Volker Lendecke <[email protected]>
Date: Thu Dec 24 13:14:18 2009 +0100
s3: Remove some pointless casts
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 2 -
source3/libsmb/conncache.c | 76 +++++++++++++------------------------------
2 files changed, 23 insertions(+), 55 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f303c70..f81ab91 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3057,8 +3057,6 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state
*cli,
NTSTATUS check_negative_conn_cache_timeout( const char *domain, const char
*server, unsigned int failed_cache_timeout );
NTSTATUS check_negative_conn_cache( const char *domain, const char *server);
void add_failed_connection_entry(const char *domain, const char *server,
NTSTATUS result) ;
-void delete_negative_conn_cache(const char *domain, const char *server);
-void flush_negative_conn_cache( void );
void flush_negative_conn_cache_for_domain(const char *domain);
/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
diff --git a/source3/libsmb/conncache.c b/source3/libsmb/conncache.c
index b440d61..46dc6d6 100644
--- a/source3/libsmb/conncache.c
+++ b/source3/libsmb/conncache.c
@@ -7,7 +7,8 @@
Copyright (C) Andrew Bartlett 2002
Copyright (C) Gerald (Jerry) Carter 2003
Copyright (C) Marc VanHeyningen 2008
-
+ Copyright (C) Volker Lendecke 2009
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -37,11 +38,6 @@
/**
- * prefix used for all entries put into the general cache
- */
-static const char NEGATIVE_CONN_CACHE_PREFIX[] = "NEG_CONN_CACHE";
-
-/**
* Marshalls the domain and server name into the key for the gencache
* record
*
@@ -53,15 +49,16 @@ static const char NEGATIVE_CONN_CACHE_PREFIX[] =
"NEG_CONN_CACHE";
*/
static char *negative_conn_cache_keystr(const char *domain, const char *server)
{
- const char NEGATIVE_CONN_CACHE_KEY_FMT[] = "%s/%s,%s";
char *keystr = NULL;
- SMB_ASSERT(domain != NULL);
+ if (domain == NULL) {
+ return NULL;
+ }
if (server == NULL)
server = "";
- keystr = talloc_asprintf(talloc_tos(),NEGATIVE_CONN_CACHE_KEY_FMT,
- NEGATIVE_CONN_CACHE_PREFIX, domain, server);
+ keystr = talloc_asprintf(talloc_tos(), "NEG_CONN_CACHE/%s,%s",
+ domain, server);
if (keystr == NULL) {
DEBUG(0, ("negative_conn_cache_keystr: malloc error\n"));
}
@@ -100,13 +97,16 @@ static char *negative_conn_cache_valuestr(NTSTATUS status)
*/
static NTSTATUS negative_conn_cache_valuedecode(const char *value)
{
- NTSTATUS result = NT_STATUS_OK;
+ unsigned int v = NT_STATUS_V(NT_STATUS_INTERNAL_ERROR);;
- SMB_ASSERT(value != NULL);
- if (sscanf(value, "%x", &(NT_STATUS_V(result))) != 1)
- DEBUG(0, ("negative_conn_cache_valuestr: unable to parse "
+ if (value != NULL) {
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+ if (sscanf(value, "%x", &v) != 1) {
+ DEBUG(0, ("negative_conn_cache_valuedecode: unable to parse "
"value field '%s'\n", value));
- return result;
+ }
+ return NT_STATUS(v);
}
/**
@@ -143,7 +143,7 @@ NTSTATUS check_negative_conn_cache( const char *domain,
const char *server)
if (key == NULL)
goto done;
- if (gencache_get(key, &value, (time_t *) NULL))
+ if (gencache_get(key, &value, NULL))
result = negative_conn_cache_valuedecode(value);
done:
DEBUG(9,("check_negative_conn_cache returning result %d for domain %s "
@@ -154,29 +154,6 @@ NTSTATUS check_negative_conn_cache( const char *domain,
const char *server)
}
/**
- * Delete any negative cache entry for the given domain/server
- *
- * @param[in] domain
- * @param[in] server may be either a FQDN or an IP address
- */
-void delete_negative_conn_cache(const char *domain, const char *server)
-{
- char *key = NULL;
-
- key = negative_conn_cache_keystr(domain, server);
- if (key == NULL)
- goto done;
-
- gencache_del(key);
- DEBUG(9,("delete_negative_conn_cache removing domain %s server %s\n",
- domain, server));
- done:
- TALLOC_FREE(key);
- return;
-}
-
-
-/**
* Add an entry to the failed connection cache
*
* @param[in] domain
@@ -189,7 +166,10 @@ void add_failed_connection_entry(const char *domain, const
char *server,
char *key = NULL;
char *value = NULL;
- SMB_ASSERT(!NT_STATUS_IS_OK(result));
+ if (NT_STATUS_IS_OK(result)) {
+ /* Nothing failed here */
+ return;
+ }
key = negative_conn_cache_keystr(domain, server);
if (key == NULL) {
@@ -204,8 +184,7 @@ void add_failed_connection_entry(const char *domain, const
char *server,
}
if (gencache_set(key, value,
- time((time_t *) NULL)
- + FAILED_CONNECTION_CACHE_TIMEOUT))
+ time(NULL) + FAILED_CONNECTION_CACHE_TIMEOUT))
DEBUG(9,("add_failed_connection_entry: added domain %s (%s) "
"to failed conn cache\n", domain, server ));
else
@@ -220,15 +199,6 @@ void add_failed_connection_entry(const char *domain, const
char *server,
}
/**
- * Deletes all records from the negative connection cache in all domains
- */
-void flush_negative_conn_cache( void )
-{
- flush_negative_conn_cache_for_domain("*");
-}
-
-
-/**
* Deletes all records for a specified domain from the negative connection
* cache
*
@@ -246,10 +216,10 @@ void flush_negative_conn_cache_for_domain(const char
*domain)
goto done;
}
- gencache_iterate(delete_matches, (void *) NULL, key_pattern);
+ gencache_iterate(delete_matches, NULL, key_pattern);
DEBUG(8, ("flush_negative_conn_cache_for_domain: flushed domain %s\n",
domain));
-
+
done:
TALLOC_FREE(key_pattern);
return;
--
Samba Shared Repository
