Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 27 insertions, 2 deletions

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 4e76b97ccf..16599005b9 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -31,6 +31,8 @@ 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);
 static int (*gpfs_putacl_fn)(char *pathname, int flags, void *acl);
+static int (*gpfs_get_realfilename_path_fn)(char *pathname, char *filenamep,
+					    int *buflen);
 
 
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
@@ -43,7 +45,7 @@ bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
 	if (!gpfs_share_modes) {
 		return True;
 	}
-	
+
 	if (gpfs_set_share_fn == NULL) {
 		return False;
 	}
@@ -104,7 +106,7 @@ int set_gpfs_lease(int fd, int leasetype)
 	if (leasetype == F_WRLCK) {
 		gpfs_type = GPFS_LEASE_WRITE;
 	}
-	
+
 	/* we unconditionally set CAP_LEASE, rather than looking for
 	   -1/EACCES as there is a bug in some versions of
 	   libgpfs_gpl.so which results in a leaked fd on /dev/ss0
@@ -134,6 +136,17 @@ int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
 	return gpfs_putacl_fn(pathname, flags, acl);
 }
 
+int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
+				    int *buflen)
+{
+	if (gpfs_get_realfilename_path_fn == NULL) {
+		errno = ENOSYS;
+		return -1;
+	}
+
+	return gpfs_get_realfilename_path_fn(pathname, filenamep, buflen);
+}
+
 static bool init_gpfs_function_lib(void *plibhandle_pointer,
 				   const char *libname,
 				   void *pfn_pointer, const char *fn_name)
@@ -142,6 +155,9 @@ static bool init_gpfs_function_lib(void *plibhandle_pointer,
 	void **libhandle_pointer = (void **)plibhandle_pointer;
 	void **fn_pointer = (void **)pfn_pointer;
 
+	DEBUG(10, ("trying to load name %s from %s\n",
+		   fn_name, libname));
+
 	if (*libhandle_pointer == NULL) {
 		*libhandle_pointer = dlopen(libname, RTLD_LAZY);
 		did_open_here = true;
@@ -187,6 +203,8 @@ void init_gpfs(void)
 	init_gpfs_function(&gpfs_set_lease_fn, "gpfs_set_lease");
 	init_gpfs_function(&gpfs_getacl_fn, "gpfs_getacl");
 	init_gpfs_function(&gpfs_putacl_fn, "gpfs_putacl");
+	init_gpfs_function(&gpfs_get_realfilename_path_fn,
+			   "gpfs_get_realfilename_path");
 
 	gpfs_share_modes = lp_parm_bool(-1, "gpfs", "sharemodes", True);
 	gpfs_leases      = lp_parm_bool(-1, "gpfs", "leases", True);
@@ -226,6 +244,13 @@ int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
 	return -1;
 }
 
+int smbd_gpfs_get_realfilename_path(char *pathname, char *fileamep,
+				    int *buflen)
+{
+	errno = ENOSYS;
+	return -1;
+}
+
 void init_gpfs(void)
 {
 	return;