s3:smbd: use connections_snum_used() instead of conn_snum_used() for load_usershare_s...

Before removing the share security descriptor, we should make sure there're
really no active users anymore.

metze

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index f4f37c3b0067df9a69e6363e939a1abae1da946d..4435b996da614615fe3e50a29317b585ad2fb173 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -574,7 +574,7 @@ static WERROR init_srv_share_info_ctr(struct pipes_struct *p,
 
        /* Ensure all the usershares are loaded. */
        become_root();
-       load_usershare_shares(msg_ctx_to_sconn(p->msg_ctx), conn_snum_used);
+       load_usershare_shares(NULL, connections_snum_used);
        load_registry_shares();
        num_services = lp_numservices();
        unbecome_root();

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 8fa248c8cb58fa9d1da7bfd3eccdea22010a084f..31775bf5f4594b458b7d405156b4cf63e16e8daa 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -2092,7 +2092,7 @@ static bool api_RNetShareEnum(struct smbd_server_connection *sconn,
        /* Ensure all the usershares are loaded. */
        become_root();
        load_registry_shares();
-       count = load_usershare_shares(sconn, conn_snum_used);
+       count = load_usershare_shares(NULL, connections_snum_used);
        unbecome_root();
 
        data_len = fixed_len = string_len = 0;

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index fa3d28cf44d179113962a0ef5bb3fc938e2b99fe..5ee78978672b4a4718234c8b1f57e5596bcc31bf 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1491,7 +1491,7 @@ struct junction_map *enum_msdfs_links(struct smbd_server_connection *sconn,
        /* Ensure all the usershares are loaded. */
        become_root();
        load_registry_shares();
-       sharecount = load_usershare_shares(sconn, conn_snum_used);
+       sharecount = load_usershare_shares(NULL, connections_snum_used);
        unbecome_root();
 
        for(i=0;i < sharecount;i++) {