summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-10-05 18:50:18 +0000
committerJeremy Allison <jra@samba.org>2000-10-05 18:50:18 +0000
commitbbd7f7bf0fd4f6cda41989c3371d7bf18f49a592 (patch)
tree63e4f012a5cab611ca74f0ec2b4b8b97d6a1b7be /source3/include
parentfde7328900a6bef12aa93d11f5dc3e0838f2f7fc (diff)
downloadsamba-bbd7f7bf0fd4f6cda41989c3371d7bf18f49a592.tar.gz
samba-bbd7f7bf0fd4f6cda41989c3371d7bf18f49a592.tar.bz2
samba-bbd7f7bf0fd4f6cda41989c3371d7bf18f49a592.zip
Herb's fixes for profiling & compiler warnings.
Jeremy. (This used to be commit 7914e9351abb5271ebb4990c3b1fe495d15a4eda)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/include/smb.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0959218ae6..8d061f2522 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3862,14 +3862,13 @@ char *vfswrap_getwd(char *path);
int vfswrap_utime(char *path, struct utimbuf *times);
int vfswrap_ftruncate(int fd, SMB_OFF_T offset);
BOOL vfswrap_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
-size_t vfswrap_get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc);
-BOOL vfswrap_set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd);
/*The following definitions come from smbd/vfs.c */
int vfs_init_default(connection_struct *conn);
BOOL vfs_init_custom(connection_struct *conn);
int vfs_stat(connection_struct *conn, char *fname, SMB_STRUCT_STAT *st);
+int vfs_fstat(connection_struct *conn, int fd, SMB_STRUCT_STAT *st);
BOOL vfs_directory_exist(connection_struct *conn, char *dname, SMB_STRUCT_STAT *st);
int vfs_mkdir(connection_struct *conn, char *fname, mode_t mode);
int vfs_unlink(connection_struct *conn, char *fname);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c869650373..02ef940085 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -622,8 +622,7 @@ struct current_user
#define NUM_FLUSH_REASONS 8 /* Keep this in sync with the enum below. */
enum flush_reason_enum { SEEK_FLUSH, READ_FLUSH, WRITE_FLUSH, READRAW_FLUSH,
- OPLOCK_RELEASE_FLUSH, CLOSE_FLUSH, SYNC_FLUSH, SIZECHANGE_FLUSH };
-
+ OPLOCK_RELEASE_FLUSH, CLOSE_FLUSH, SYNC_FLUSH, SIZECHANGE_FLUSH };
/* Defines for the sent_oplock_break field above. */
#define NO_BREAK_SENT 0
#define EXCLUSIVE_BREAK_SENT 1