mirror of
https://github.com/samba-team/samba.git
synced 2025-12-12 12:23:50 +03:00
r23665: Remove two unneeded global variables
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
9b231149c7
commit
51a3933b3d
@@ -364,15 +364,10 @@ BOOL user_has_any_privilege(NT_USER_TOKEN *token, const SE_PRIV *privilege)
|
|||||||
|
|
||||||
int count_all_privileges( void )
|
int count_all_privileges( void )
|
||||||
{
|
{
|
||||||
static int count;
|
/*
|
||||||
|
* The -1 is due to the weird SE_END record...
|
||||||
if ( count )
|
*/
|
||||||
return count;
|
return (sizeof(privs) / sizeof(privs[0])) - 1;
|
||||||
|
|
||||||
/* loop over the array and count it */
|
|
||||||
for ( count=0; !se_priv_equal(&privs[count].se_priv, &se_priv_end); count++ ) ;
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -404,9 +399,8 @@ LUID_ATTR get_privilege_luid( SE_PRIV *mask )
|
|||||||
Convert a LUID to a named string
|
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;
|
int i;
|
||||||
|
|
||||||
if (set->high != 0)
|
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++ ) {
|
for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
|
||||||
if ( set->low == privs[i].luid.low ) {
|
if ( set->low == privs[i].luid.low ) {
|
||||||
fstrcpy( name, privs[i].name );
|
return privs[i].name;
|
||||||
return name;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 )
|
NTSTATUS init_r_enum_acct_rights( LSA_R_ENUM_ACCT_RIGHTS *out, PRIVILEGE_SET *privileges )
|
||||||
{
|
{
|
||||||
uint32 i;
|
uint32 i;
|
||||||
char *privname;
|
const char *privname;
|
||||||
const char **privname_array = NULL;
|
const char **privname_array = NULL;
|
||||||
int num_priv = 0;
|
int num_priv = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user