libcli/security Make sec_privilege_from_index() return SEC_PRIV_INVALID on failure

This is clearer and more consistent than using a magic -1 return

Andrew Bartlett

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

diff --git a/libcli/security/privileges.c b/libcli/security/privileges.c
index 5c33f04693c076688c7309524d39b9fed84e1d47..f5fa836472962a48bfc71925905e81661683d77c 100644 (file)
--- a/libcli/security/privileges.c
+++ b/libcli/security/privileges.c
@@ -379,7 +379,7 @@ enum sec_privilege sec_privilege_from_index(int idx)
        if (idx >= 0 && idx<ARRAY_SIZE(privs)) {
                return privs[idx].luid;
        }
-       return -1;
+       return SEC_PRIV_INVALID;
 }
 
 /*

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index dedb21cd3932d6ee6e12c970685ab3dda242ce83..0a304d380cc2f2a4d4fa340062d8a1f0a626b928 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -300,7 +300,7 @@ static NTSTATUS dcesrv_lsa_EnumPrivs(struct dcesrv_call_state *dce_call, TALLOC_
 
        i = *r->in.resume_handle;
 
-       while (((priv = sec_privilege_from_index(i)) != -1) &&
+       while (((priv = sec_privilege_from_index(i)) != SEC_PRIV_INVALID) &&
               r->out.privs->count < r->in.max_count) {
                struct lsa_PrivEntry *e;
                privname = sec_privilege_name(priv);