summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2013-03-11 22:23:27 +0100
committerJeremy Allison <jra@samba.org>2013-03-12 01:03:37 +0100
commitfb924d02ec05f7106beeeb409becbc39e00ddac9 (patch)
tree06c3c5818f40f49e187d5ee01c7dc6c0f259407f /source3
parent58e385a5ac37c072a4eef3baa7926b799a732e94 (diff)
downloadsamba-fb924d02ec05f7106beeeb409becbc39e00ddac9.tar.gz
samba-fb924d02ec05f7106beeeb409becbc39e00ddac9.tar.bz2
samba-fb924d02ec05f7106beeeb409becbc39e00ddac9.zip
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
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/include/smb_macros.h1
-rw-r--r--source3/include/smbprofile.h5
-rw-r--r--source3/param/loadparm.c1
-rw-r--r--source3/profile/profile.c1
-rw-r--r--source3/utils/status_profile.c4
6 files changed, 0 insertions, 13 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c36125e53e..00a9a69d73 100644
--- 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 8b9d94181f..ff3aced755 100644
--- 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 6e136a08fc..9bcee42f8e 100644
--- 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 75b63c5231..d1c2a6383e 100644
--- 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 0287860ff2..5f9433f999 100644
--- 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 e01b1652ab..0f722196a5 100644
--- 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);