libcli/security Remove 'always true' return from se_priv_put_all_privileges

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/libcli/security/privileges.c b/libcli/security/privileges.c
index 4c288a7f3a49b3f28af6cff49a2c77aaa5103646..938f34b858f88a4e1f3e2be1a86be112c46c0883 100644 (file)
--- 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
 ****************************************************************************/
 
  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);
 {
        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;
        }
        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 77a786192daf33541cdaf0853601f9d1383a4c09..788125e163555f9b9acbe00a6c937d5ee35df2a8 100644 (file)
--- 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
 ****************************************************************************/
 
  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
 
 /*********************************************************************
  Lookup the uint64_t value for a privilege name

diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index af4c0966f7709bd88fedd2fca5032e2d5dabf3f1..62ed0a35e0a78fe96beb6112f7fee00ae6f46b5b 100644 (file)
--- 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;
 
 {
        uint64_t mask;
 

-       if (!se_priv_put_all_privileges(&mask)) {
-               return False;
-       }
+       se_priv_put_all_privileges(&mask);

 
        return grant_privilege_bitmap( sid, mask );
 }
 
        return grant_privilege_bitmap( sid, mask );
 }