summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-07-29 16:14:39 +0200
committerVolker Lendecke <vl@samba.org>2011-07-29 16:43:17 +0200
commit0102c6e2bc289352ab726d68956c126727cf8d81 (patch)
treec8c70d9814e7f8cf41dfccb831199935d0ab642f /source3
parent6d67d41444aef527215d985bdcdb0f214de875f9 (diff)
downloadsamba-0102c6e2bc289352ab726d68956c126727cf8d81.tar.gz
samba-0102c6e2bc289352ab726d68956c126727cf8d81.tar.bz2
samba-0102c6e2bc289352ab726d68956c126727cf8d81.zip
s3: Make is_executable() available in lib/
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/util.c17
-rw-r--r--source3/smbd/open.c17
-rw-r--r--source3/smbd/proto.h1
4 files changed, 18 insertions, 18 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 35c26c2bb1..9eff02606d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -606,6 +606,7 @@ bool tevent_req_poll_ntstatus(struct tevent_req *req,
bool any_nt_status_not_ok(NTSTATUS err1, NTSTATUS err2, NTSTATUS *result);
int timeval_to_msec(struct timeval t);
char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname);
+bool is_executable(const char *fname);
/* The following definitions come from lib/util_cmdline.c */
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b8fc319a6f..b320931146 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2238,3 +2238,20 @@ char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname)
return ptr;
}
+
+/*******************************************************************
+ 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 82125832cb..2529cbe0ce 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -698,23 +698,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.
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 763a946a16..02c82f7d2a 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -589,7 +589,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);