sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Make use of smbd_gpfs_get_realfilename_path in unix_convert

Browse Source 
(cherry picked from commit b37684ffcec4ba0beada55d37bcaf4f5e79bcd58)

Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Volker Lendecke 2008-12-10 12:32:24 +01:00 committed by Michael Adam
parent de8bb17255
commit 110bb22449
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/modules/gpfs.c
View File

@ -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,
@ -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;

61
source3/modules/vfs_gpfs.c
View File

@ -72,7 +72,64 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
return ret;
}
static int vfs_gpfs_get_real_filename(struct vfs_handle_struct *handle,
const char *path,
const char *name,
TALLOC_CTX *mem_ctx,
char **found_name)
{
int result;
char *full_path;
char real_pathname[PATH_MAX+1];
int buflen;
full_path = talloc_asprintf(talloc_tos(), "%s/%s", path, name);
if (full_path == NULL) {
errno = ENOMEM;
return -1;
}
buflen = sizeof(real_pathname) - 1;
result = smbd_gpfs_get_realfilename_path(full_path, real_pathname,
&buflen);
TALLOC_FREE(full_path);
if (result == -1) {
DEBUG(10, ("smbd_gpfs_get_realfilename_path returned %s\n",
strerror(errno)));
return -1;
}
/*
* GPFS does not necessarily null-terminate the returned path
* but instead returns the buffer length in buflen.
*/
if (buflen < sizeof(real_pathname)) {
real_pathname[buflen] = '\0';
} else {
real_pathname[sizeof(real_pathname)-1] = '\0';
}
DEBUG(10, ("smbd_gpfs_get_realfilename_path: %s/%s -> %s\n",
path, name, real_pathname));
name = strrchr_m(real_pathname, '/');
if (name == NULL) {
errno = ENOENT;
return -1;
}
*found_name = talloc_strdup(mem_ctx, name+1);
if (*found_name == NULL) {
errno = ENOMEM;
return -1;
}
return 0;
}
static void gpfs_dumpacl(int level, struct gpfs_acl *gacl)
{
@ -817,6 +874,10 @@ static vfs_op_tuple gpfs_op_tuples[] = {
SMB_VFS_OP_LINUX_SETLEASE,
SMB_VFS_LAYER_OPAQUE },
{ SMB_VFS_OP(vfs_gpfs_get_real_filename),
SMB_VFS_OP_GET_REAL_FILENAME,
SMB_VFS_LAYER_OPAQUE },
{ SMB_VFS_OP(gpfsacl_fget_nt_acl),
SMB_VFS_OP_FGET_NT_ACL,
SMB_VFS_LAYER_TRANSPARENT },