s3: remove some dead code (for setdir command)

set dir seems to have been a special SMB command used by Pathworks clients
the supporting code for it was already removed in 2007, so just remove all
remnants related to it (smb.conf parameter, documentation, ...)

Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Mar 12 01:03:37 CET 2013 on sn-devel-104

diff --git a/docs-xml/smbdotconf/misc/setdirectory.xml b/docs-xml/smbdotconf/misc/setdirectory.xml
deleted file mode 100644 (file)
index 5e7b379..0000000
--- a/docs-xml/smbdotconf/misc/setdirectory.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<samba:parameter name="set directory"
-                context="S"
-                        type="boolean"
-                xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>
-       If <command moreinfo="none">set directory = no</command>, then  users of the 
-       service may not use the setdir command to change directory.
-       </para>
-
-       <para>
-       The <command moreinfo="none">setdir</command> command is only implemented 
-       in the Digital Pathworks client. See the Pathworks documentation 
-       for details.
-       </para>
-</description>
-
-<value type="default">no</value>
-</samba:parameter>

diff --git a/docs-xml/using_samba/ch08.xml b/docs-xml/using_samba/ch08.xml
index 91e216a25cbf62458f0c1d6fea95a1a50dca3f42..7465b8a67b2ab4670efc691ea4fd112088d150d3 100644 (file)
--- a/docs-xml/using_samba/ch08.xml
+++ b/docs-xml/using_samba/ch08.xml
@@ -1795,27 +1795,7 @@ panic action</title>
 </sect2>
 
 
-
-
-
-<sect2 role="" label="8.6.13" id="ch08-SECT-6.0.13">
-<indexterm id="ch08-idx-965993-0"><primary>set directory option</primary></indexterm>
-<title>
-set directory</title>
-
-
-<para>This boolean share-level option allows <indexterm id="ch08-idx-965497-0"><primary>Digital Pathworks clients, option for</primary></indexterm>Digital Pathworks clients to use the <literal>setdir</literal> command to change directories on the server. If you are not using the Digital Pathworks client, you should not need to alter this option. The default value for this option is <literal>no</literal>. You can override it per share as follows:</para>
-
-
-<programlisting>[data]
-       set directory = yes</programlisting>
-</sect2>
-
-
-
-
-
-<sect2 role="" label="8.6.14" id="ch08-SECT-6.0.14">
+<sect2 role="" label="8.6.13" id="ch08-SECT-6.0.14">
 <indexterm id="ch08-idx-965994-0"><primary>smbrun option</primary></indexterm>
 <title>
 smbrun</title>
@@ -1832,7 +1812,7 @@ smbrun</title>
 
 
 
-<sect2 role="" label="8.6.15" id="ch08-SECT-6.0.15">
+<sect2 role="" label="8.6.14" id="ch08-SECT-6.0.15">
 <indexterm id="ch08-idx-965995-0"><primary>status option</primary></indexterm>
 <title>
 status</title>
@@ -1850,7 +1830,7 @@ status</title>
 
 
 
-<sect2 role="" label="8.6.16" id="ch08-SECT-6.0.16">
+<sect2 role="" label="8.6.15" id="ch08-SECT-6.0.16">
 <indexterm id="ch08-idx-965996-0"><primary>strict sync option</primary></indexterm>
 <title>
 strict sync</title>
@@ -1867,7 +1847,7 @@ strict sync</title>
 
 
 
-<sect2 role="" label="8.6.17" id="ch08-SECT-6.0.17">
+<sect2 role="" label="8.6.16" id="ch08-SECT-6.0.17">
 <indexterm id="ch08-idx-965997-0"><primary>sync always option</primary></indexterm>
 <title>
 sync always</title>
@@ -1884,7 +1864,7 @@ sync always</title>
 
 
 
-<sect2 role="" label="8.6.18" id="ch08-SECT-6.0.18">
+<sect2 role="" label="8.6.17" id="ch08-SECT-6.0.18">
 <indexterm id="ch08-idx-965998-0"><primary>strip dot option</primary></indexterm>
 <title>
 strip dot</title>

diff --git a/examples/scripts/shares/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
index f0bc1ecb89d52269f6c0d3f8689cd9fc593750df..287b3572c01058b0396e20c22f45e8d8fcdbc82e 100644 (file)
--- a/examples/scripts/shares/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
@@ -68,7 +68,6 @@ parm_table = {
        "USESPNEGO"              : ("use spnego", SambaParmBool, P_GLOBAL, "Yes"),
        "FAKEOPLOCKS"            : ("fake oplocks", SambaParmBool, P_LOCAL, "No"),
        "FORCECREATEMODE"        : ("force create mode", SambaParmString, P_LOCAL, "00"),
-       "SETDIRECTORY"           : ("set directory", SambaParmBoolRev, P_LOCAL, "No"),
        "SMBPORTS"               : ("smb ports", SambaParmString, P_GLOBAL, "445 139"),
        "LOCKDIR"                : ("lock directory", SambaParmString, P_GLOBAL, "/var/lib/samba"),
        "BROWSEABLE"             : ("browseable", SambaParmBool, P_LOCAL, "Yes"),

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 4cf3ad7698582e3d76614c61704c38b0b64aa556..7cb3a691120fb677a001ba34bab6807ec55068c1 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -92,7 +92,6 @@ FN_LOCAL_BOOL(hide_special_files, bHideSpecialFiles)
 FN_LOCAL_BOOL(hideunreadable, bHideUnReadable)
 FN_LOCAL_BOOL(hideunwriteable_files, bHideUnWriteableFiles)
 FN_LOCAL_BOOL(access_based_share_enum, bAccessBasedShareEnum)
-FN_LOCAL_BOOL(no_set_dir, bNo_set_dir)
 FN_LOCAL_BOOL(guest_ok, bGuest_ok)
 FN_LOCAL_BOOL(guest_only, bGuest_only)
 FN_LOCAL_BOOL(administrative_share, bAdministrative_share)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 620f5f679b7fccc8aca0a1a3753921b32c61d52d..c65a73824f8e01f85ec9bde09668e49ed0cc9f72 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3725,15 +3725,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
        },
-       {
-               .label          = "set directory",
-               .type           = P_BOOLREV,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bNo_set_dir),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_SHARE,
-       },
        {
                .label          = "allow insecure wide links",
                .type           = P_BOOL,

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c36125e53eff5e3fc15786ebbe0df80d651678cd..00a9a69d73e1d7834a4b8264a0a3c393cd836673 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1278,7 +1278,6 @@ bool lp_hideunwriteable_files(int );
 bool lp_browseable(int );
 bool lp_access_based_share_enum(int );
 bool lp_readonly(int );
-bool lp_no_set_dir(int );
 bool lp_guest_ok(int );
 bool lp_guest_only(int );
 bool lp_administrative_share(int );

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 8b9d94181f37195f721e5ba6cd393baed43ec73a..ff3aced755346dd02ee83703e1e360b67fdd463f 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -72,7 +72,6 @@
 #define VALID_SNUM(snum)   (lp_snum_ok(snum))
 #define GUEST_OK(snum)     (VALID_SNUM(snum) && lp_guest_ok(snum))
 #define GUEST_ONLY(snum)   (VALID_SNUM(snum) && lp_guest_only(snum))
-#define CAN_SETDIR(snum)   (!lp_no_set_dir(snum))
 #define CAN_PRINT(conn)    ((conn) && lp_print_ok(SNUM(conn)))
 #define MAP_HIDDEN(conn)   ((conn) && lp_map_hidden(SNUM(conn)))
 #define MAP_SYSTEM(conn)   ((conn) && lp_map_system(SNUM(conn)))

diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 6e136a08fccbfb38683dd6e10c4349c762bd6e7b..9bcee42f8e5cdf9ed097abbe7f36ae03f1810099 100644 (file)
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -563,11 +563,6 @@ enum profile_stats_values
 #define SMBinvalid_count __profile_stats_value(PR_VALUE_SMBINVALID, count)
 #define SMBinvalid_time __profile_stats_value(PR_VALUE_SMBINVALID, time)
 
-/* Pathworks setdir command */
-       PR_VALUE_PATHWORKS_SETDIR,
-#define pathworks_setdir_count __profile_stats_value(PR_VALUE_PATHWORKS_SETDIR, count)
-#define pathworks_setdir_time __profile_stats_value(PR_VALUE_PATHWORKS_SETDIR, time)
-
 /* These are the TRANS2 sub commands */
        PR_VALUE_TRANS2_OPEN,
 #define Trans2_open_count __profile_stats_value(PR_VALUE_TRANS2_OPEN, count)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 75b63c52317aa3c2c9a46a180d4ff804380cf23d..d1c2a6383edd1ec715bceb250b2e7192f47b53fb 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -214,7 +214,6 @@ static struct loadparm_service sDefault =
        .bAccessBasedShareEnum = false,
        .bAvailable = true,
        .bRead_only = true,
-       .bNo_set_dir = true,
        .bGuest_only = false,
        .bAdministrative_share = false,
        .bGuest_ok = false,

diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 0287860ff2994e4f97704d5a4db00262f614344b..5f9433f999b5268b94710ab8cf19d0550b83549a 100644 (file)
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -329,7 +329,6 @@ bool profile_setup(struct messaging_context *msg_ctx, bool rdonly)
            "SMBsendend",               /* PR_VALUE_SMBSENDEND */
            "SMBsendtxt",               /* PR_VALUE_SMBSENDTXT */
            "SMBinvalid",               /* PR_VALUE_SMBINVALID */
-           "pathworks_setdir",         /* PR_VALUE_PATHWORKS_SETDIR */
            "Trans2_open",              /* PR_VALUE_TRANS2_OPEN */
            "Trans2_findfirst",         /* PR_VALUE_TRANS2_FINDFIRST */
            "Trans2_findnext",          /* PR_VALUE_TRANS2_FINDNEXT */

diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index e01b1652abf940e1ca824d3ae1cf8da858a0a8d8..0f722196a51f697dcb9f64f4c894a893e77fa22d 100644 (file)
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -298,10 +298,6 @@ bool status_profile_dump(bool verbose)
        d_printf("invalid_count:                  %u\n", profile_p->SMBinvalid_count);
        d_printf("invalid_time:                   %u\n", profile_p->SMBinvalid_time);
 
-       profile_separator("Pathworks Calls");
-       d_printf("setdir_count:                   %u\n", profile_p->pathworks_setdir_count);
-       d_printf("setdir_time:                    %u\n", profile_p->pathworks_setdir_time);
-
        profile_separator("Trans2 Calls");
        d_printf("open_count:                     %u\n", profile_p->Trans2_open_count);
        d_printf("open_time:                      %u\n", profile_p->Trans2_open_time);