diff options
| author | James Peach <jpeach@samba.org> | 2006-03-21 02:56:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:39 -0500 |
| commit | 97ee5b1afa342eea40f973f5370c9f620c63bd01 (patch) | |
| tree | 79ed1975a7b968b445702b258d98bb8d66ed925f /source3/include | |
| parent | 1d5ab8fd05123dd46e64a6249db2928c89aec2f2 (diff) | |
| download | samba-97ee5b1afa342eea40f973f5370c9f620c63bd01.tar.gz samba-97ee5b1afa342eea40f973f5370c9f620c63bd01.tar.bz2 samba-97ee5b1afa342eea40f973f5370c9f620c63bd01.zip | |
r14600: Refactor capability interface from being IRIX-specific to using only
the POSIX interface. Note that this removes support for inherited
capabilities. This wasn't used, and probably should not be.
(This used to be commit 763f4c01488a96aec000c18bca313da37ed1df1b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 18 | ||||
| -rw-r--r-- | source3/include/smb.h | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 4bd84c877a..9f6f8b2471 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -362,24 +362,6 @@ #include <execinfo.h> #endif -#ifdef HAVE_SYS_CAPABILITY_H - -#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) && !defined(_PPC_STATFS_H) -#define _I386_STATFS_H -#define _PPC_STATFS_H -#define BROKEN_REDHAT_7_STATFS_WORKAROUND -#endif - -#include <sys/capability.h> - -#ifdef BROKEN_REDHAT_7_STATFS_WORKAROUND -#undef _I386_STATFS_H -#undef _PPC_STATFS_H -#undef BROKEN_REDHAT_7_STATFS_WORKAROUND -#endif - -#endif - #if defined(HAVE_RPC_RPC_H) /* * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h. diff --git a/source3/include/smb.h b/source3/include/smb.h index 59948edf40..26b4b69266 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1566,7 +1566,9 @@ minimum length == 18. * Capabilities abstracted for different systems. */ -#define KERNEL_OPLOCK_CAPABILITY 0x1 +enum smbd_capability { + KERNEL_OPLOCK_CAPABILITY +}; /* if a kernel does support oplocks then a structure of the following typee is used to describe how to interact with the kernel */ |