param: change fstype to use a constant string

Substitution isn't really necessary for this parameter.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/docs-xml/smbdotconf/misc/fstype.xml b/docs-xml/smbdotconf/misc/fstype.xml
index c7df18c38b39954f58f4a74f6b7a7037f8b9b481..d210c1087745538f031c301a09f3675af6962ba6 100644 (file)
--- a/docs-xml/smbdotconf/misc/fstype.xml
+++ b/docs-xml/smbdotconf/misc/fstype.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="fstype"
                 context="S"
                         type="string"
+                 constant="1"
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 8956ecefe0ce214f2d8bc1881543c71a89542013..4631691e7ef48a2a2713118e54d89e678d87aab7 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -170,7 +170,7 @@ static enum srvsvc_ShareType get_share_type(int snum)
                type = lp_administrative_share(snum)
                        ? STYPE_PRINTQ_HIDDEN : STYPE_PRINTQ;
        }
-       if (strequal(lp_fstype(talloc_tos(), snum), "IPC")) {
+       if (strequal(lp_fstype(snum), "IPC")) {
                type = lp_administrative_share(snum)
                        ? STYPE_IPC_HIDDEN : STYPE_IPC;
        }

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 9ff250f5c0f5f5e5905f1f7d8377fb1276a87669..f7f77534ee4e02b694a360232d158909776bafb5 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1948,7 +1948,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
                if (lp_printable(snum)) {
                        type = STYPE_PRINTQ;
                }
-               if (strequal("IPC",lp_fstype(talloc_tos(),snum))) {
+               if (strequal("IPC",lp_fstype(snum))) {
                        type = STYPE_IPC;
                }
                SSVAL(p,14,type);               /* device type */

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 3d2750161fe8a4fa881ba82298c4441a25983351..6b56239f19c1c3f1c602440c9434727471954056 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -971,7 +971,7 @@ void reply_tcon_and_X(struct smb_request *req)
                }
        } else {
                /* NT sets the fstype of IPC$ to the null string */
-               const char *fstype = IS_IPC(conn) ? "" : lp_fstype(ctx, SNUM(conn));
+               const char *fstype = IS_IPC(conn) ? "" : lp_fstype(SNUM(conn));
 
                if (tcon_flags & TCONX_FLAG_EXTENDED_RESPONSE) {
                        /* Return permissions. */

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 30614cd2bc39cc7afdeec0e5583f71032d6460c8..a25f2d40fc8c59cc95f3809fd175bb605f0e8760 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -256,7 +256,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
        if (dev[0] == '?' || !dev[0]) {
                if (lp_printable(snum)) {
                        fstrcpy(dev,"LPT1:");
-               } else if (strequal(lp_fstype(talloc_tos(), snum), "IPC")) {
+               } else if (strequal(lp_fstype(snum), "IPC")) {
                        fstrcpy(dev, "IPC");
                } else {
                        fstrcpy(dev,"A:");
@@ -272,7 +272,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
                if (!strequal(dev, "LPT1:")) {
                        return NT_STATUS_BAD_DEVICE_TYPE;
                }
-       } else if (strequal(lp_fstype(talloc_tos(), snum), "IPC")) {
+       } else if (strequal(lp_fstype(snum), "IPC")) {
                if (!strequal(dev, "IPC")) {
                        return NT_STATUS_BAD_DEVICE_TYPE;
                }

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 8dc5b2338768d7bc6654db7a707b6e326c5dc66b..aebb58a34a68f48a41aca8d2c005936aebf5742c 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3077,7 +3077,7 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
        int data_len = 0, len;
        const char *vname = volume_label(talloc_tos(), SNUM(conn));
        int snum = SNUM(conn);
-       char *fstype = lp_fstype(talloc_tos(), SNUM(conn));
+       char *fstype = lp_fstype(SNUM(conn));
        const char *filename = NULL;
        uint32 additional_flags = 0;
        struct smb_filename smb_fname;
@@ -3626,7 +3626,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                         * Thursby MAC extension... ONLY on NTFS filesystems
                         * once we do streams then we don't need this
                         */
-                       if (strequal(lp_fstype(talloc_tos(), SNUM(conn)),"NTFS")) {
+                       if (strequal(lp_fstype(SNUM(conn)),"NTFS")) {
                                data_len = 88;
                                SIVAL(pdata,84,0x100); /* Don't support mac... */
                                break;