sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r23665: Remove two unneeded global variables

Browse Source 
(This used to be commit 51a3933b3d)
This commit is contained in:
Volker Lendecke 2007-06-30 09:15:33 +00:00 committed by Gerald (Jerry) Carter
parent ffe11a657f
commit 4ed5f70eed
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/lib/privileges_basic.c
View File

@ -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;
}
}

2
source3/rpc_parse/parse_lsa.c
View File

@ -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;