[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  68f0835c8e1 docs-xml/manpages: 'ceph_new' prefix for config-param of vfs_ceph_new
       via  aca4cf8327d vfs_ceph_new: use 'ceph_new' for config-param prefix
      from  aa043a5808b vfs_ceph_new: handle errno properly for 'readdir'

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 68f0835c8e1c5029cd831c267b75c02185b206c7
Author: Shachar Sharon <ssharon at redhat.com>
Date:   Mon Aug 5 19:12:29 2024 +0300

    docs-xml/manpages: 'ceph_new' prefix for config-param of vfs_ceph_new
    
    With 'ceph_new' prefix used by vfs_ceph_new for config parameters,
    update the relevant man-page accordingly.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15686
    
    Signed-off-by: Shachar Sharon <ssharon at redhat.com>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Thu Aug  8 13:54:34 UTC 2024 on atb-devel-224

commit aca4cf8327dcaef782dedd98a63a020469c45cdb
Author: Shachar Sharon <ssharon at redhat.com>
Date:   Mon Aug 5 16:21:10 2024 +0300

    vfs_ceph_new: use 'ceph_new' for config-param prefix
    
    Use explicit 'ceph_new' prefix to each of the ceph specific config
    parameters to avoid confusion with legacy 'vfs_ceph' module. Hence,
    users will have in their smb.conf a format similar to:
    
    ...
    [smbshare]
            vfs objects = ceph_new
            ceph_new: config_file = /etc/ceph/ceph.conf
            ceph_new: user_id = user1
            ceph_new: filesystem = fs1
            ...
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15686
    
    Signed-off-by: Shachar Sharon <ssharon at redhat.com>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/vfs_ceph_new.8.xml | 12 ++++++------
 source3/modules/vfs_ceph_new.c       | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/vfs_ceph_new.8.xml b/docs-xml/manpages/vfs_ceph_new.8.xml
index 7a65b965ce0..b0640a591a5 100644
--- a/docs-xml/manpages/vfs_ceph_new.8.xml
+++ b/docs-xml/manpages/vfs_ceph_new.8.xml
@@ -111,20 +111,20 @@
 	<variablelist>
 
 		<varlistentry>
-		<term>ceph:config_file = path</term>
+		<term>ceph_new:config_file = path</term>
 		<listitem>
 		<para>
 			Allows one to define a ceph configfile to use. Empty by default.
 		</para>
 		<para>
-			Example: ceph:config_file =
+			Example: ceph_new:config_file =
 			/etc/ceph/ceph.conf
 		</para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>ceph:user_id = name</term>
+		<term>ceph_new:user_id = name</term>
 		<listitem>
 		<para>
 			Allows one to explicitly set the client ID used for the
@@ -132,13 +132,13 @@
 			client default).
 		</para>
 		<para>
-			Example: ceph:user_id = samba
+			Example: ceph_new:user_id = samba
 		</para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>ceph:filesystem = fs_name</term>
+		<term>ceph_new:filesystem = fs_name</term>
 		<listitem>
 		<para>
 			Allows one to explicitly select the CephFS file system
@@ -147,7 +147,7 @@
 			system of the Ceph cluster).
 		</para>
 		<para>
-			Example: ceph:filesystem = myfs2
+			Example: ceph_new:filesystem = myfs2
 		</para>
 		</listitem>
 		</varlistentry>
diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index cf7e6b121db..25e78444fb5 100644
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -159,10 +159,11 @@ static int cephmount_cache_remove(struct cephmount_cached *entry)
 static char *cephmount_get_cookie(TALLOC_CTX * mem_ctx, const int snum)
 {
 	const char *conf_file =
-	    lp_parm_const_string(snum, "ceph", "config_file", ".");
-	const char *user_id = lp_parm_const_string(snum, "ceph", "user_id", "");
+	    lp_parm_const_string(snum, "ceph_new", "config_file", ".");
+	const char *user_id =
+	    lp_parm_const_string(snum, "ceph_new", "user_id", "");
 	const char *fsname =
-	    lp_parm_const_string(snum, "ceph", "filesystem", "");
+	    lp_parm_const_string(snum, "ceph_new", "filesystem", "");
 	return talloc_asprintf(mem_ctx, "(%s/%s/%s)", conf_file, user_id,
 			       fsname);
 }
@@ -174,11 +175,11 @@ static struct ceph_mount_info *cephmount_mount_fs(const int snum)
 	struct ceph_mount_info *mnt = NULL;
 	/* if config_file and/or user_id are NULL, ceph will use defaults */
 	const char *conf_file =
-	    lp_parm_const_string(snum, "ceph", "config_file", NULL);
+	    lp_parm_const_string(snum, "ceph_new", "config_file", NULL);
 	const char *user_id =
-	    lp_parm_const_string(snum, "ceph", "user_id", NULL);
+	    lp_parm_const_string(snum, "ceph_new", "user_id", NULL);
 	const char *fsname =
-	    lp_parm_const_string(snum, "ceph", "filesystem", NULL);
+	    lp_parm_const_string(snum, "ceph_new", "filesystem", NULL);
 
 	DBG_DEBUG("[CEPH] calling: ceph_create\n");
 	ret = ceph_create(&mnt, user_id);


-- 
Samba Shared Repository