diff options
| author | James Peach <jpeach@samba.org> | 2006-03-22 23:49:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:42 -0500 |
| commit | 40d0707827ee154bcb03013abe6f72f1026a70c9 (patch) | |
| tree | b465d32e79fc65a682aa55dd96e4a665109bfc15 /source3/include | |
| parent | e836508704dd964e22e8bfc0f8e9ec520a2c94f2 (diff) | |
| download | samba-40d0707827ee154bcb03013abe6f72f1026a70c9.tar.gz samba-40d0707827ee154bcb03013abe6f72f1026a70c9.tar.bz2 samba-40d0707827ee154bcb03013abe6f72f1026a70c9.zip | |
r14668: Set the FILE_STATUS_OFFLINE bit by observing the events a DMAPI-based
HSM is interested in. Tested on both IRIX and SLES9.
(This used to be commit 514a767c57f8194547e5b708ad2573ab9a0719c6)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/debug.h | 1 | ||||
| -rw-r--r-- | source3/include/smb.h | 3 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h index b6fb50a9ac..2cf1ceaead 100644 --- a/source3/include/debug.h +++ b/source3/include/debug.h @@ -102,6 +102,7 @@ extern int DEBUGLEVEL; #define DBGC_ACLS 15 #define DBGC_LOCKING 16 #define DBGC_MSDFS 17 +#define DBGC_DMAPI 18 /* So you can define DBGC_CLASS before including debug.h */ #ifndef DBGC_CLASS diff --git a/source3/include/smb.h b/source3/include/smb.h index 26b4b69266..8faf3877ce 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1567,7 +1567,8 @@ minimum length == 18. */ enum smbd_capability { - KERNEL_OPLOCK_CAPABILITY + KERNEL_OPLOCK_CAPABILITY, + DMAPI_ACCESS_CAPABILITY }; /* if a kernel does support oplocks then a structure of the following diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 3ae8814cfd..554dbbc087 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -76,6 +76,10 @@ (DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)))) #endif +#define SMB_WARN(condition, message) \ + ((condition) ? (void)0 : \ + DEBUG(0, ("WARNING: %s: %s\n", #condition, message))) + #define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) /* these are useful macros for checking validity of handles */ |