sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r20340: Join vfs_MkDir to its only caller

Browse Source
This commit is contained in:
Volker Lendecke 2006-12-24 14:29:19 +00:00 committed by Gerald (Jerry) Carter
parent 6dd0886b49
commit cce911780f
2 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/smbd/open.c
View File

@ -1851,27 +1851,45 @@ int close_file_fchmod(files_struct *fsp)
return ret;
}
static NTSTATUS mkdir_internal(connection_struct *conn,
const pstring directory)
static NTSTATUS mkdir_internal(connection_struct *conn, const char *name)
{
SMB_STRUCT_STAT sbuf;
int ret= -1;
mode_t mode;
if(!CAN_WRITE(conn)) {
DEBUG(5,("mkdir_internal: failing create on read-only share "
"%s\n", lp_servicename(SNUM(conn))));
return NT_STATUS_ACCESS_DENIED;
}
if (!check_name(directory, conn)) {
if (!check_name(name, conn)) {
return map_nt_error_from_unix(errno);
}
ret = vfs_MkDir(conn,directory,unix_mode(conn,aDIR,directory,True));
mode = unix_mode(conn, aDIR, name, True);
if (ret == -1) {
if ((ret=SMB_VFS_MKDIR(conn, name, mode)) != 0) {
return map_nt_error_from_unix(errno);
}
if (lp_inherit_perms(SNUM(conn))) {
inherit_access_acl(conn, name, mode);
}
/*
* Check if high bits should have been set,
* then (if bits are missing): add them.
* Consider bits automagically set by UNIX, i.e. SGID bit from parent
* dir.
*/
if (mode & ~(S_IRWXU|S_IRWXG|S_IRWXO)
&& (SMB_VFS_STAT(conn, name, &sbuf) == 0)
&& (mode & ~sbuf.st_mode)) {
SMB_VFS_CHMOD(conn, name,
sbuf.st_mode | (mode & ~sbuf.st_mode));
}
return NT_STATUS_OK;
}

31
source/smbd/vfs.c
View File

@ -306,37 +306,6 @@ BOOL vfs_directory_exist(connection_struct *conn, const char *dname, SMB_STRUCT_
return ret;
}
/*******************************************************************
vfs mkdir wrapper
********************************************************************/
int vfs_MkDir(connection_struct *conn, const char *name, mode_t mode)
{
int ret;
SMB_STRUCT_STAT sbuf;
if ((ret=SMB_VFS_MKDIR(conn, name, mode)) != 0) {
return ret;
}
if (lp_inherit_perms(SNUM(conn))) {
inherit_access_acl(conn, name, mode);
}
/*
* Check if high bits should have been set,
* then (if bits are missing): add them.
* Consider bits automagically set by UNIX, i.e. SGID bit from parent
* dir.
*/
if (mode & ~(S_IRWXU|S_IRWXG|S_IRWXO)
&& (SMB_VFS_STAT(conn,name,&sbuf) == 0)
&& (mode & ~sbuf.st_mode)) {
SMB_VFS_CHMOD(conn,name,sbuf.st_mode | (mode & ~sbuf.st_mode));
}
return 0;
}
/*******************************************************************
Check if an object exists in the vfs.
********************************************************************/