sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: Move can_delete_directory to smbd/, remove shim

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Dec 13 19:00:37 CET 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-12-13 16:07:18 +01:00 committed by Volker Lendecke
parent 34d58c9d92
commit 5efd7e16c2
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/lib/smbd_shim.c
View File

@ -51,15 +51,6 @@ void send_stat_cache_delete_message(struct messaging_context *msg_ctx,
}
}
NTSTATUS can_delete_directory(struct connection_struct *conn,
const char *dirname)
{
if (shim.can_delete_directory) {
return shim.can_delete_directory(conn, dirname);
}
return NT_STATUS_OK;
}
bool change_to_root_user(void)
{
if (shim.change_to_root_user) {

3
source3/lib/smbd_shim.h
View File

@ -35,9 +35,6 @@ struct smbd_shim
void (*send_stat_cache_delete_message)(struct messaging_context *msg_ctx,
const char *name);
NTSTATUS (*can_delete_directory)(struct connection_struct *conn,
const char *dirname);
bool (*change_to_root_user)(void);
void (*contend_level2_oplocks_begin)(files_struct *fsp,

4
source3/smbd/dir.c
View File

@ -1674,8 +1674,8 @@ bool SearchDir(struct smb_Dir *dirp, const char *name, long *poffset)
Is this directory empty ?
*****************************************************************/
NTSTATUS smbd_can_delete_directory(struct connection_struct *conn,
const char *dirname)
NTSTATUS can_delete_directory(struct connection_struct *conn,
const char *dirname)
{
NTSTATUS status = NT_STATUS_OK;
long dirpos = 0;

1
source3/smbd/globals.c
View File

@ -151,7 +151,6 @@ static const struct smbd_shim smbd_shim_fns =
{
.cancel_pending_lock_requests_by_fid = smbd_cancel_pending_lock_requests_by_fid,
.send_stat_cache_delete_message = smbd_send_stat_cache_delete_message,
.can_delete_directory = smbd_can_delete_directory,
.change_to_root_user = smbd_change_to_root_user,
.contend_level2_oplocks_begin = smbd_contend_level2_oplocks_begin,

2
source3/smbd/proto.h
View File

@ -241,8 +241,6 @@ void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset);
bool SearchDir(struct smb_Dir *dirp, const char *name, long *poffset);
NTSTATUS can_delete_directory(struct connection_struct *conn,
const char *dirname);
NTSTATUS smbd_can_delete_directory(struct connection_struct *conn,
const char *dirname);
/* The following definitions come from smbd/dmapi.c */