diff options
| author |  Sadie Powell | 2021-01-29 18:15:32 +0000 |
|---|---|---|
| committer | Sadie Powell | 2021-01-29 18:15:32 +0000 |
| commit | bb35650b5721e5d951f15060e4ecf474a8343ced (patch) | |
| tree | 315cfbd8ac4cf02c1f6ce608aed8f9530f784a0d /include/modules | |
| parent | Allow using fixedpart/fixedquit with an empty message. (diff) | |
| parent | Remove unnecessary chdirs in the helper script. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'include/modules')
| -rw-r--r-- | include/modules/cap.h | 6 | ||||
| -rw-r--r-- | include/modules/dns.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/modules/cap.h b/include/modules/cap.h index 600876374..3af3f8082 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -303,6 +303,12 @@ namespace Cap { } + /** Retrieves the underlying cap. */ + operator const Cap::Capability*() const + { + return ref ? *ref : NULL; + } + /** Check whether a user has the referenced capability turned on. * @param user User to check * @return True if the user is using the referenced capability, false otherwise diff --git a/include/modules/dns.h b/include/modules/dns.h index 4fc3ae295..3c3293e04 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -57,6 +57,7 @@ namespace DNS enum Error { ERROR_NONE, + ERROR_DISABLED, ERROR_UNKNOWN, ERROR_UNLOADED, ERROR_TIMEDOUT, |