summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-07-07 18:09:16 +0200
committerStefan Metzmacher <metze@samba.org>2009-07-10 12:24:24 +0200
commit8d534d45a5d21967e2d9bca1ac34a55f1518fe42 (patch)
treef4b65b1f8cdcedfe3e9321c50bfc0801915c7e63
parent598a9892bc4d5db2c75b218ba235fb7736b6a6e6 (diff)
downloadsamba-8d534d45a5d21967e2d9bca1ac34a55f1518fe42.tar.gz
samba-8d534d45a5d21967e2d9bca1ac34a55f1518fe42.tar.bz2
samba-8d534d45a5d21967e2d9bca1ac34a55f1518fe42.zip
s3:smbd: make smbd_do_locking() non static
metze
-rw-r--r--source3/smbd/globals.h17
-rw-r--r--source3/smbd/reply.c25
2 files changed, 26 insertions, 16 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 3d195c84f0..8163213dd0 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -168,6 +168,23 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB session_key,
const struct iovec *vector,
int count);
+struct smbd_lock_element {
+ uint32_t smbpid;
+ enum brl_type brltype;
+ uint64_t offset;
+ uint64_t count;
+};
+
+NTSTATUS smbd_do_locking(struct smb_request *req,
+ files_struct *fsp,
+ uint8_t type,
+ int32_t timeout,
+ uint16_t num_ulocks,
+ struct smbd_lock_element *ulocks,
+ uint16_t num_locks,
+ struct smbd_lock_element *locks,
+ bool *async);
+
void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
const char *reason,
const char *location);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4a915d6f90..98ee83ea83 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -7223,22 +7223,15 @@ uint64_t get_lock_offset(const uint8_t *data, int data_offset,
return offset;
}
-struct smbd_lock_element {
- uint32_t smbpid;
- enum brl_type brltype;
- uint64_t offset;
- uint64_t count;
-};
-
-static NTSTATUS smbd_do_locking(struct smb_request *req,
- files_struct *fsp,
- uint8_t type,
- int32_t timeout,
- uint16_t num_ulocks,
- struct smbd_lock_element *ulocks,
- uint16_t num_locks,
- struct smbd_lock_element *locks,
- bool *async)
+NTSTATUS smbd_do_locking(struct smb_request *req,
+ files_struct *fsp,
+ uint8_t type,
+ int32_t timeout,
+ uint16_t num_ulocks,
+ struct smbd_lock_element *ulocks,
+ uint16_t num_locks,
+ struct smbd_lock_element *locks,
+ bool *async)
{
connection_struct *conn = req->conn;
int i;