The branch, master has been updated
via b1f7164 s3: Fix a valgrind error
via d126414 s3: Move server_info_struct to nmbd
from b4ca1fa s3: Replace delete_token_list by an array
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b1f7164aa86789a2cdca4ccbe9395abfda0751cb
Author: Volker Lendecke <v...@samba.org>
Date: Wed Nov 23 17:43:35 2011 +0100
s3: Fix a valgrind error
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Wed Nov 23 19:17:20 CET 2011 on sn-devel-104
commit d126414b47d8d8f9a6530a819a4f68aac0654617
Author: Volker Lendecke <v...@samba.org>
Date: Wed Nov 23 16:14:10 2011 +0100
s3: Move server_info_struct to nmbd
That's the only place where it's used.
-----------------------------------------------------------------------
Summary of changes:
source3/include/nameserv.h | 9 +++++++++
source3/include/smb.h | 9 ---------
source3/locking/locking.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 53ffd6f..378d25e 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -232,6 +232,15 @@ struct browse_cache_record {
time_t death_time; /* The time the record must be removed. */
};
+/* used for server information: client, nameserv and ipc */
+struct server_info_struct {
+ fstring name;
+ uint32 type;
+ fstring comment;
+ fstring domain; /* used ONLY in ipc.c NOT namework.c */
+ bool server_added; /* used ONLY in ipc.c NOT namework.c */
+};
+
/* This is used to hold the list of servers in my domain, and is
contained within lists of domains. */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 95f0a71..b46f498 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -518,15 +518,6 @@ typedef struct {
fstring domain; /* domain that the client specified */
} userdom_struct;
-/* used for server information: client, nameserv and ipc */
-struct server_info_struct {
- fstring name;
- uint32 type;
- fstring comment;
- fstring domain; /* used ONLY in ipc.c NOT namework.c */
- bool server_added; /* used ONLY in ipc.c NOT namework.c */
-};
-
/* used for network interfaces */
struct interface {
struct interface *next, *prev;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 1062f04..611b2d2 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1610,7 +1610,7 @@ void set_delete_on_close_lck(files_struct *fsp,
/* Delete this entry. */
TALLOC_FREE(dt->delete_token);
*dt = lck->delete_tokens[
- lck->num_delete_tokens];
+ lck->num_delete_tokens-1];
lck->num_delete_tokens -= 1;
return;
}
--
Samba Shared Repository
