diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-09-04 09:16:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:13 +1000 |
| commit | 6d2b1ef71d5e0b61559c99d58857ce533a036044 (patch) | |
| tree | 9fad432c00d8690b8124544f839b047a12971b09 | |
| parent | aefe60da8c6a5e48d807fa2e64d332b67fae25b8 (diff) | |
| download | samba-6d2b1ef71d5e0b61559c99d58857ce533a036044.tar.gz samba-6d2b1ef71d5e0b61559c99d58857ce533a036044.tar.bz2 samba-6d2b1ef71d5e0b61559c99d58857ce533a036044.zip | |
libcli/security Remove 'always true' return from se_priv_put_all_privileges
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
| -rw-r--r-- | libcli/security/privileges.c | 3 | ||||
| -rw-r--r-- | libcli/security/privileges.h | 2 | ||||
| -rw-r--r-- | source3/lib/privileges.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libcli/security/privileges.c b/libcli/security/privileges.c index 4c288a7f3a..938f34b858 100644 --- a/libcli/security/privileges.c +++ b/libcli/security/privileges.c @@ -187,7 +187,7 @@ uint64_t sec_privilege_mask(enum sec_privilege privilege) put all valid privileges into a mask ****************************************************************************/ -bool se_priv_put_all_privileges(uint64_t *privilege_mask) +void se_priv_put_all_privileges(uint64_t *privilege_mask) { int i; uint32_t num_privs = ARRAY_SIZE(privs); @@ -196,7 +196,6 @@ bool se_priv_put_all_privileges(uint64_t *privilege_mask) for ( i=0; i<num_privs; i++ ) { *privilege_mask |= privs[i].privilege_mask; } - return true; } /********************************************************************* diff --git a/libcli/security/privileges.h b/libcli/security/privileges.h index 77a786192d..788125e163 100644 --- a/libcli/security/privileges.h +++ b/libcli/security/privileges.h @@ -54,7 +54,7 @@ uint64_t sec_privilege_mask(enum sec_privilege privilege); put all privileges into a mask ****************************************************************************/ -bool se_priv_put_all_privileges(uint64_t *privilege_mask); +void se_priv_put_all_privileges(uint64_t *privilege_mask); /********************************************************************* Lookup the uint64_t value for a privilege name diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index af4c0966f7..62ed0a35e0 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -488,9 +488,7 @@ bool grant_all_privileges( const struct dom_sid *sid ) { uint64_t mask; - if (!se_priv_put_all_privileges(&mask)) { - return False; - } + se_priv_put_all_privileges(&mask); return grant_privilege_bitmap( sid, mask ); } |