s3: Make is_executable() available in lib/

(cherry picked from commit 612361bdcaf4256eb54913423e127d0628b35356)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index af43b34071d299cb77d818fdc32ef4f7b2a602e2..b62d7b57ef138a7294d2ea713d80a61228444c4f 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1242,6 +1242,7 @@ const char *strip_hostname(const char *s);
 bool tevent_req_poll_ntstatus(struct tevent_req *req,
                              struct tevent_context *ev,
                              NTSTATUS *status);
+bool is_executable(const char *fname);
 
 /* The following definitions come from lib/util_file.c  */
 
@@ -6608,7 +6609,6 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
                                    const char *inherit_from_dir,
                                    const char *fname,
                                    SMB_STRUCT_STAT *psbuf);
-bool is_executable(const char *fname);
 bool is_stat_open(uint32 access_mask);
 bool request_timed_out(struct timeval request_time,
                       struct timeval timeout);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 238981debc1263cf3a607966f080495dd9748214..343a763f976cab2d473da6a4059f75b1dc23d2d5 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3075,3 +3075,20 @@ bool tevent_req_poll_ntstatus(struct tevent_req *req,
        }
        return ret;
 }
+
+/*******************************************************************
+ Return True if the filename is one of the special executable types.
+********************************************************************/
+
+bool is_executable(const char *fname)
+{
+       if ((fname = strrchr_m(fname,'.'))) {
+               if (strequal(fname,".com") ||
+                   strequal(fname,".dll") ||
+                   strequal(fname,".exe") ||
+                   strequal(fname,".sym")) {
+                       return True;
+               }
+       }
+       return False;
+}

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 38e4e16b1de414900d885b79fd9f3543102e8d82..e0cb944f114bddabd92879280c4dcdead3ad5198 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -660,23 +660,6 @@ static NTSTATUS open_file(files_struct *fsp,
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
- Return True if the filename is one of the special executable types.
-********************************************************************/
-
-bool is_executable(const char *fname)
-{
-       if ((fname = strrchr_m(fname,'.'))) {
-               if (strequal(fname,".com") ||
-                   strequal(fname,".dll") ||
-                   strequal(fname,".exe") ||
-                   strequal(fname,".sym")) {
-                       return True;
-               }
-       }
-       return False;
-}
-
 /****************************************************************************
  Check if we can open a file with a share mode.
  Returns True if conflict, False if not.