summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-04 20:45:43 +0200
committerVolker Lendecke <vl@samba.org>2010-07-04 21:49:03 +0200
commit23a31becacee9da11ebe4dff4a3146e19c95a5be (patch)
treed40c86ff6a78d91f6295ed4803b630fcb565903a /source3
parentb0c83d50f9f609848c19180b6b032e73a1d504cb (diff)
downloadsamba-23a31becacee9da11ebe4dff4a3146e19c95a5be.tar.gz
samba-23a31becacee9da11ebe4dff4a3146e19c95a5be.tar.bz2
samba-23a31becacee9da11ebe4dff4a3146e19c95a5be.zip
s3: Remove unused msg_flags from connections.tdb
This breaks rolling code upgrade!
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/smbd/connection.c4
-rw-r--r--source3/smbd/service.c2
4 files changed, 3 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5f332ef53e..2d79aed03e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5356,8 +5356,7 @@ void msg_force_tdis(struct messaging_context *msg,
bool yield_connection(connection_struct *conn, const char *name);
int count_current_connections( const char *sharename, bool clear );
-bool claim_connection(connection_struct *conn, const char *name,
- uint32 msg_flags);
+bool claim_connection(connection_struct *conn, const char *name);
/* The following definitions come from smbd/dfree.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b042de927c..140d810582 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -841,7 +841,6 @@ struct connections_data {
char addr[24];
char machine[FSTRING_LEN];
time_t start;
- uint32 bcast_msg_flags;
};
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index fe1fcdbdb8..e2d15f1ccd 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -120,8 +120,7 @@ int count_current_connections( const char *sharename, bool clear )
Claim an entry in the connections database.
****************************************************************************/
-bool claim_connection(connection_struct *conn, const char *name,
- uint32 msg_flags)
+bool claim_connection(connection_struct *conn, const char *name)
{
struct db_record *rec;
struct connections_data crec;
@@ -148,7 +147,6 @@ bool claim_connection(connection_struct *conn, const char *name,
sizeof(crec.servicename));
}
crec.start = time(NULL);
- crec.bcast_msg_flags = msg_flags;
strlcpy(crec.machine,get_remote_machine_name(),sizeof(crec.machine));
strlcpy(crec.addr,conn?conn->client_address:
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 472de24d8f..e3f8ce6ed5 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -864,7 +864,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
/*
* Get us an entry in the connections db
*/
- if (!claim_connection(conn, lp_servicename(snum), 0)) {
+ if (!claim_connection(conn, lp_servicename(snum))) {
DEBUG(1, ("Could not store connections entry\n"));
*pstatus = NT_STATUS_INTERNAL_DB_ERROR;
goto err_root_exit;