summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-22 15:54:41 +0100
committerChristian Ambach <ambi@samba.org>2012-02-10 18:08:01 +0100
commit318346a9373df9b16c436b8539362ff8d341960e (patch)
tree010bdc2dabfc10bda6809b7a222678c246b2fa4e /source3/modules
parent8ad2b6a55e23922570659a4e4fb88e1b7d710772 (diff)
downloadsamba-318346a9373df9b16c436b8539362ff8d341960e.tar.gz
samba-318346a9373df9b16c436b8539362ff8d341960e.tar.bz2
samba-318346a9373df9b16c436b8539362ff8d341960e.zip
s3:vfs_gpfs: make "gpfs:getrealfilename" a per share option
metze Signed-off-by: Christian Ambach <ambi@samba.org>
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/gpfs.c8
-rw-r--r--source3/modules/vfs_gpfs.c14
2 files changed, 15 insertions, 7 deletions
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 57a5a0c9fb..5ce23810c4 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -25,8 +25,6 @@
#include "gpfs_gpl.h"
#include "vfs_gpfs.h"
-static bool gpfs_getrealfilename;
-
static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
static int (*gpfs_set_lease_fn)(int fd, unsigned int leaseType);
static int (*gpfs_getacl_fn)(char *pathname, int flags, void *acl);
@@ -145,8 +143,7 @@ int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length)
int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
int *buflen)
{
- if ((!gpfs_getrealfilename)
- || (gpfs_get_realfilename_path_fn == NULL)) {
+ if (gpfs_get_realfilename_path_fn == NULL) {
errno = ENOSYS;
return -1;
}
@@ -262,8 +259,5 @@ void init_gpfs(void)
init_gpfs_function(&gpfs_ftruncate_fn, "gpfs_ftruncate");
init_gpfs_function(&gpfs_lib_init_fn,"gpfs_lib_init");
- gpfs_getrealfilename = lp_parm_bool(-1, "gpfs", "getrealfilename",
- True);
-
return;
}
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 088d8c0d6b..8400c50d2e 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -41,6 +41,7 @@ struct gpfs_config_data {
bool syncio;
bool winattr;
bool ftruncate;
+ bool getrealfilename;
};
@@ -125,6 +126,16 @@ static int vfs_gpfs_get_real_filename(struct vfs_handle_struct *handle,
char real_pathname[PATH_MAX+1];
int buflen;
bool mangled;
+ struct gpfs_config_data *config;
+
+ SMB_VFS_HANDLE_GET_DATA(handle, config,
+ struct gpfs_config_data,
+ return -1);
+
+ if (!config->getrealfilename) {
+ return SMB_VFS_NEXT_GET_REAL_FILENAME(handle, path, name,
+ mem_ctx, found_name);
+ }
mangled = mangle_is_mangled(name, handle->conn->params);
if (mangled) {
@@ -1363,6 +1374,9 @@ int vfs_gpfs_connect(struct vfs_handle_struct *handle, const char *service,
config->ftruncate = lp_parm_bool(SNUM(handle->conn), "gpfs",
"ftruncate", true);
+ config->getrealfilename = lp_parm_bool(SNUM(handle->conn), "gpfs",
+ "getrealfilename", true);
+
SMB_VFS_HANDLE_SET_DATA(handle, config,
NULL, struct gpfs_config_data,
return -1);