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

diff --git a/source3/lib/smbd_shim.c b/source3/lib/smbd_shim.c
index 72ae366ec36e74e3eb30b52fbc710344affe1387..a7d386b29cf9320821b85666b3173356ea8d724f 100644 (file)
--- 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 89cae2b694df07bb1eef73d2d7a38bbd626f41c1..0b802fe01b1d0e6a0e0e3a57117e65e76eb66457 100644 (file)
--- 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 a7dc537074255f9d7280251a092a9c01d4c630b5..63a7887f3e55e621f371b15bcbc04f4676edb5fd 100644 (file)
--- 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 aa17f69c873a6adc89d69b6684015ce547abf46a..82de70a388a61da28d9f1a9f34fb898955e46955 100644 (file)
--- 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 34b252006b2d3275f2a5c8064d0a33a421327120..daaa914141dbfaa0497f8576caca9777a12f20e0 100644 (file)
--- 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  */