From 5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 13 Dec 2011 16:07:18 +0100 Subject: s3: Move can_delete_directory to smbd/, remove shim Autobuild-User: Volker Lendecke Autobuild-Date: Tue Dec 13 19:00:37 CET 2011 on sn-devel-104 --- source3/smbd/dir.c | 4 ++-- source3/smbd/globals.c | 1 - source3/smbd/proto.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index a7dc537074..63a7887f3e 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -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; diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c index aa17f69c87..82de70a388 100644 --- a/source3/smbd/globals.c +++ b/source3/smbd/globals.c @@ -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, diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 34b252006b..daaa914141 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -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 */ -- cgit