sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

s3: remove some dead code (for setdir command)

Browse Source 
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
This commit is contained in:
Christian Ambach 2013-03-11 22:23:27 +01:00 committed by Jeremy Allison
parent 58e385a5ac
commit fb924d02ec
11 changed files with 5 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs-xml/smbdotconf/misc/setdirectory.xml
View File

@ -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>

30
docs-xml/using_samba/ch08.xml
View File

@ -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>

1
examples/scripts/shares/python/smbparm.py
View File

@ -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"),

1
lib/param/param_functions.c
View File

@ -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)

9
lib/param/param_table.c
View File

@ -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,

1
source3/include/proto.h
View File

@ -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 );

1
source3/include/smb_macros.h
View File

@ -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)))

5
source3/include/smbprofile.h
View File

@ -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)

1
source3/param/loadparm.c
View File

@ -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,

1
source3/profile/profile.c
View File

@ -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 */

4
source3/utils/status_profile.c
View File

@ -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);