From 4ed5f70eeda59d07e5d10d4cf302359d7a518987 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 30 Jun 2007 09:15:33 +0000 Subject: r23665: Remove two unneeded global variables (This used to be commit 51a3933b3d367e3693daa6842f5a286328f4fd39) --- source3/lib/privileges_basic.c | 19 ++++++------------- source3/rpc_parse/parse_lsa.c | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/source3/lib/privileges_basic.c b/source3/lib/privileges_basic.c index b1ca1765d5..93ecee89dc 100644 --- a/source3/lib/privileges_basic.c +++ b/source3/lib/privileges_basic.c @@ -364,15 +364,10 @@ BOOL user_has_any_privilege(NT_USER_TOKEN *token, const SE_PRIV *privilege) int count_all_privileges( void ) { - static int count; - - if ( count ) - return count; - - /* loop over the array and count it */ - for ( count=0; !se_priv_equal(&privs[count].se_priv, &se_priv_end); count++ ) ; - - return count; + /* + * The -1 is due to the weird SE_END record... + */ + return (sizeof(privs) / sizeof(privs[0])) - 1; } @@ -404,9 +399,8 @@ LUID_ATTR get_privilege_luid( SE_PRIV *mask ) Convert a LUID to a named string ****************************************************************************/ -char* luid_to_privilege_name(const LUID *set) +const char *luid_to_privilege_name(const LUID *set) { - static fstring name; int i; if (set->high != 0) @@ -414,8 +408,7 @@ char* luid_to_privilege_name(const LUID *set) for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) { if ( set->low == privs[i].luid.low ) { - fstrcpy( name, privs[i].name ); - return name; + return privs[i].name; } } diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c index 09f0f835ec..afa138ca1e 100644 --- a/source3/rpc_parse/parse_lsa.c +++ b/source3/rpc_parse/parse_lsa.c @@ -3216,7 +3216,7 @@ void init_q_enum_acct_rights(LSA_Q_ENUM_ACCT_RIGHTS *in, NTSTATUS init_r_enum_acct_rights( LSA_R_ENUM_ACCT_RIGHTS *out, PRIVILEGE_SET *privileges ) { uint32 i; - char *privname; + const char *privname; const char **privname_array = NULL; int num_priv = 0; -- cgit