diff options
| author | Volker Lendecke <vl@samba.org> | 2011-12-13 16:07:18 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-12-13 19:00:37 +0100 |
| commit | 5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922 (patch) | |
| tree | 1515192bc8a3d3b9ca9d982ce0dd57839182f4a4 | |
| parent | 34d58c9d92f852e908acb78e040c1a22ce1591c1 (diff) | |
| download | samba-5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922.tar.gz samba-5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922.tar.bz2 samba-5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922.zip | |
s3: Move can_delete_directory to smbd/, remove shim
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Dec 13 19:00:37 CET 2011 on sn-devel-104
| -rw-r--r-- | source3/lib/smbd_shim.c | 9 | ||||
| -rw-r--r-- | source3/lib/smbd_shim.h | 3 | ||||
| -rw-r--r-- | source3/smbd/dir.c | 4 | ||||
| -rw-r--r-- | source3/smbd/globals.c | 1 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 |
5 files changed, 2 insertions, 17 deletions
diff --git a/source3/lib/smbd_shim.c b/source3/lib/smbd_shim.c index 72ae366ec3..a7d386b29c 100644 --- a/source3/lib/smbd_shim.c +++ b/source3/lib/smbd_shim.c @@ -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) { diff --git a/source3/lib/smbd_shim.h b/source3/lib/smbd_shim.h index 89cae2b694..0b802fe01b 100644 --- a/source3/lib/smbd_shim.h +++ b/source3/lib/smbd_shim.h @@ -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, 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 */ |