Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent...

[ira/wip.git] / source3 / smbd / connection.c

diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index e9f1b82fbfe72123da598262b2a5c56b7bf45066..3b72a9505a13d33c5c0f4a969ce30bcf1483edc7 100644 (file)
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -2,17 +2,17 @@
    Unix SMB/CIFS implementation.
    connection claim routines
    Copyright (C) Andrew Tridgell 1998
-   
+
    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
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
 */
@@ -63,7 +63,7 @@ static int count_fn(struct db_record *rec,
                    void *udp)
 {
        struct count_stat *cs = (struct count_stat *)udp;
- 
+
        if (crec->cnum == -1) {
                return 0;
        }
@@ -117,6 +117,15 @@ int count_current_connections( const char *sharename, bool clear  )
        return cs.curr_connections;
 }
 
+/****************************************************************************
+ Count the number of connections open across all shares.
+****************************************************************************/
+
+int count_all_current_connections(void)
+{
+        return count_current_connections(NULL, True /* clear stale entries */);
+}
+
 /****************************************************************************
  Claim an entry in the connections database.
 ****************************************************************************/
@@ -128,10 +137,11 @@ bool claim_connection(connection_struct *conn, const char *name,
        struct connections_data crec;
        TDB_DATA dbuf;
        NTSTATUS status;
+       char addr[INET6_ADDRSTRLEN];
 
        DEBUG(5,("claiming [%s]\n", name));
 
-       if (!(rec = connections_fetch_entry(NULL, conn, name))) {
+       if (!(rec = connections_fetch_entry(talloc_tos(), conn, name))) {
                DEBUG(0, ("connections_fetch_entry failed\n"));
                return False;
        }
@@ -142,16 +152,17 @@ bool claim_connection(connection_struct *conn, const char *name,
        crec.pid = procid_self();
        crec.cnum = conn?conn->cnum:-1;
        if (conn) {
-               crec.uid = conn->uid;
-               crec.gid = conn->gid;
+               crec.uid = conn->server_info->utok.uid;
+               crec.gid = conn->server_info->utok.gid;
                strlcpy(crec.servicename, lp_servicename(SNUM(conn)),
                        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:client_addr(),
+       strlcpy(crec.addr,conn?conn->client_address:
+                       client_addr(get_client_fd(),addr,sizeof(addr)),
                sizeof(crec.addr));
 
        dbuf.dptr = (uint8 *)&crec;
@@ -213,109 +224,3 @@ bool register_message_flags(bool doreg, uint32 msg_flags)
 
        return True;
 }
-
-/*********************************************************************
-*********************************************************************/
-
-static TDB_DATA* make_pipe_rec_key( struct pipe_open_rec *prec )
-{
-       TDB_DATA *kbuf = NULL;
-       fstring key_string;
-       
-       if ( !prec )
-               return NULL;
-       
-       if ( (kbuf = TALLOC_P(prec, TDB_DATA)) == NULL ) {
-               return NULL;
-       }
-       
-       snprintf( key_string, sizeof(key_string), "%s/%d/%d",
-               prec->name, procid_to_pid(&prec->pid), prec->pnum );
-               
-       *kbuf = string_term_tdb_data(talloc_strdup(prec, key_string));
-       if (kbuf->dptr == NULL )
-               return NULL;
-
-       return kbuf;
-}
-
-/*********************************************************************
-*********************************************************************/
-
-static void fill_pipe_open_rec( struct pipe_open_rec *prec, smb_np_struct *p )
-{
-       prec->pid = pid_to_procid(sys_getpid());
-       prec->pnum = p->pnum;
-       prec->uid = geteuid();
-       fstrcpy( prec->name, p->name );
-
-       return;
-}
-
-/*********************************************************************
-*********************************************************************/
-
-bool store_pipe_opendb( smb_np_struct *p )
-{
-       struct db_record *dbrec;
-       struct pipe_open_rec *prec;
-       TDB_DATA *key;
-       TDB_DATA data;
-       bool ret = False;
-       
-       if ( (prec = TALLOC_P( NULL, struct pipe_open_rec)) == NULL ) {
-               DEBUG(0,("store_pipe_opendb: talloc failed!\n"));
-               return False;
-       }
-       
-       fill_pipe_open_rec( prec, p );
-       if ( (key = make_pipe_rec_key( prec )) == NULL ) {
-               goto done;
-       }
-       
-       data.dptr = (uint8 *)prec;
-       data.dsize = sizeof(struct pipe_open_rec);
-
-       if (!(dbrec = connections_fetch_record(prec, *key))) {
-               DEBUG(0, ("connections_fetch_record failed\n"));
-               goto done;
-       }
-
-       ret = NT_STATUS_IS_OK(dbrec->store(dbrec, data, TDB_REPLACE));
-       
-done:
-       TALLOC_FREE( prec );    
-       return ret;
-}
-
-/*********************************************************************
-*********************************************************************/
-
-bool delete_pipe_opendb( smb_np_struct *p )
-{
-       struct db_record *dbrec;
-       struct pipe_open_rec *prec;
-       TDB_DATA *key;
-       bool ret = False;
-       
-       if ( (prec = TALLOC_P( NULL, struct pipe_open_rec)) == NULL ) {
-               DEBUG(0,("store_pipe_opendb: talloc failed!\n"));
-               return False;
-       }
-       
-       fill_pipe_open_rec( prec, p );
-       if ( (key = make_pipe_rec_key( prec )) == NULL ) {
-               goto done;
-       }
-       
-       if (!(dbrec = connections_fetch_record(prec, *key))) {
-               DEBUG(0, ("connections_fetch_record failed\n"));
-               goto done;
-       }
-
-       ret = NT_STATUS_IS_OK(dbrec->delete_rec(dbrec));
-       
-done:
-       TALLOC_FREE( prec );
-       return ret;
-}