summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <anschneider@suse.de>2008-02-28 14:06:11 +0100
committerKarolin Seeger <kseeger@samba.org>2008-02-29 16:07:35 +0100
commitf22531b65d88d633e9b217cd4109d9e899c09d1e (patch)
tree833c37598695030655bed6bf51386765825ba69d
parentfbc514eb31cec1b67dced74cbe09457d43b67b12 (diff)
downloadsamba-f22531b65d88d633e9b217cd4109d9e899c09d1e.tar.gz
samba-f22531b65d88d633e9b217cd4109d9e899c09d1e.tar.bz2
samba-f22531b65d88d633e9b217cd4109d9e899c09d1e.zip
Rename the 'hidden' variable to 'administrative share'.
(cherry picked from commit eff3d3bad5a8860b99375cc0be9dc24f3679e416) (This used to be commit 39f712048d7408ba91301b59752f2e87e894a3f0)
-rw-r--r--source3/param/loadparm.c10
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e23c30789a..5651a435de 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -420,7 +420,7 @@ typedef struct {
bool bRead_only;
bool bNo_set_dir;
bool bGuest_only;
- bool bHidden;
+ bool bAdministrative_share;
bool bGuest_ok;
bool bPrint_ok;
bool bMap_system;
@@ -563,7 +563,7 @@ static service sDefault = {
True, /* bRead_only */
True, /* bNo_set_dir */
False, /* bGuest_only */
- False, /* bHidden */
+ False, /* bAdministrative_share */
False, /* bGuest_ok */
False, /* bPrint_ok */
False, /* bMap_system */
@@ -973,7 +973,7 @@ static struct parm_struct parm_table[] = {
{"inherit owner", P_BOOL, P_LOCAL, &sDefault.bInheritOwner, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE},
{"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE},
{"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_HIDE},
- {"hidden", P_BOOL, P_LOCAL, &sDefault.bHidden, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
+ {"administrative share", P_BOOL, P_LOCAL, &sDefault.bAdministrative_share, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
{"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
{"public", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_HIDE},
@@ -2140,7 +2140,7 @@ FN_LOCAL_BOOL(lp_readonly, bRead_only)
FN_LOCAL_BOOL(lp_no_set_dir, bNo_set_dir)
FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
-FN_LOCAL_BOOL(lp_hidden, bHidden)
+FN_LOCAL_BOOL(lp_administrative_share, bAdministrative_share)
FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
@@ -2778,7 +2778,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
ServicePtrs[i]->bAvailable = True;
ServicePtrs[i]->bRead_only = True;
ServicePtrs[i]->bGuest_only = False;
- ServicePtrs[i]->bHidden = True;
+ ServicePtrs[i]->bAdministrative_share = True;
ServicePtrs[i]->bGuest_ok = guest_ok;
ServicePtrs[i]->bPrint_ok = False;
ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 37bd204f75..8a25b6cfd5 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -232,7 +232,7 @@ static uint32 get_share_type(int snum)
type = STYPE_PRINTQ;
if (strequal(lp_fstype(snum), "IPC"))
type = STYPE_IPC;
- if (lp_hidden(snum))
+ if (lp_administrative_share(snum))
type |= STYPE_HIDDEN;
return type;