summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-11-17 19:16:38 +0000
committerJeremy Allison <jra@samba.org>1997-11-17 19:16:38 +0000
commit9f804556c4d0bb68f9b7acaf2b679bc0a02ea8f9 (patch)
tree869fdc138c242f9a059e62562ef267043941ec09 /source3/include
parent30dfa00877514274aef2cd3e1bd954b017beed10 (diff)
downloadsamba-9f804556c4d0bb68f9b7acaf2b679bc0a02ea8f9.tar.gz
samba-9f804556c4d0bb68f9b7acaf2b679bc0a02ea8f9.tar.bz2
samba-9f804556c4d0bb68f9b7acaf2b679bc0a02ea8f9.zip
loadparm.c : Added "veto oplock files" parameter.
make_printerdef.c: Fixed warning. quotas.c: Fixed irix root errors. server.c: Fixed oplock reference count bug. smb.h: Added IS_VETO_OPLOCK_PATH(). Jeremy. (This used to be commit c28487df63e29bc0f8d2ece876a07a2a076d4c73)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/include/smb.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1724c312db..fceb83b282 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -300,6 +300,7 @@ char *lp_volume(int );
char *lp_mangled_map(int );
char *lp_veto_files(int );
char *lp_hide_files(int );
+char *lp_veto_oplocks(int );
char *lp_driverlocation(int );
BOOL lp_alternate_permissions(int );
BOOL lp_revalidate(int );
diff --git a/source3/include/smb.h b/source3/include/smb.h
index afa9e3d9b9..6056ccd70f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1502,6 +1502,7 @@ typedef struct
int num_files_open;
name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
+ name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */
} connection_struct;
@@ -1680,6 +1681,7 @@ struct connect_record
#define MAP_ARCHIVE(cnum) (OPEN_CNUM(cnum) && lp_map_archive(SNUM(cnum)))
#define IS_HIDDEN_PATH(cnum,path) (is_in_path((path),Connections[(cnum)].hide_list))
#define IS_VETO_PATH(cnum,path) (is_in_path((path),Connections[(cnum)].veto_list))
+#define IS_VETO_OPLOCK_PATH(cnum,path) (is_in_path((path),Connections[(cnum)].veto_oplock_list))
#define SMBENCRYPT() (lp_encrypted_passwords())