[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / smbd / conn.c

diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index d126bd39e62d25a67e87fbc92ec4fcc896f458a3..50a71edf9d304f8337e6c5555c5a4378dd292870 100644 (file)
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -6,7 +6,7 @@
    
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -286,6 +285,7 @@ void conn_free_internal(connection_struct *conn)
        free_namearray(conn->veto_list);
        free_namearray(conn->hide_list);
        free_namearray(conn->veto_oplock_list);
+       free_namearray(conn->aio_write_behind_list);
        
        string_free(&conn->user);
        string_free(&conn->dirpath);
@@ -319,13 +319,16 @@ the message contains just a share name and all instances of that
 share are unmounted
 the special sharename '*' forces unmount of all shares
 ****************************************************************************/
-void msg_force_tdis(int msg_type, struct server_id pid, void *buf, size_t len,
-                   void *private_data)
+void msg_force_tdis(struct messaging_context *msg,
+                   void *private_data,
+                   uint32_t msg_type,
+                   struct server_id server_id,
+                   DATA_BLOB *data)
 {
        connection_struct *conn, *next;
        fstring sharename;
 
-       fstrcpy(sharename, (const char *)buf);
+       fstrcpy(sharename, (const char *)data->data);
 
        if (strcmp(sharename, "*") == 0) {
                DEBUG(1,("Forcing close of all shares\n"));