Changeset 596 for trunk/server/source3/lib/privileges_basic.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/lib/privileges_basic.c (modified) (7 diffs)

trunk/server/source3/lib/privileges_basic.c

@@ -47 +47 @@
 const SE_PRIV se_restore         = SE_RESTORE;
 const SE_PRIV se_take_ownership  = SE_TAKE_OWNERSHIP;
+const SE_PRIV se_security       = SE_SECURITY;
 
 /********************************************************************
@@ -99 +100 @@
 #endif
         {SE_MACHINE_ACCOUNT,    "SeMachineAccountPrivilege",    "Add machines to domain",                  { 0x0, 0x0006 }},
+        {SE_SECURITY,           "SeSecurityPrivilege",          "Manage auditing and security log",        { 0x0, 0x0008 }},
         {SE_TAKE_OWNERSHIP,     "SeTakeOwnershipPrivilege",     "Take ownership of files or other objects",{ 0x0, 0x0009 }},
         {SE_BACKUP,             "SeBackupPrivilege",            "Back up files and directories",           { 0x0, 0x0011 }},
@@ -108 +110 @@
         {SE_DISK_OPERATOR,      "SeDiskOperatorPrivilege",      "Manage disk shares",                      { 0x0, 0x1003 }},
 
+
         {SE_END, "", "", { 0x0, 0x0 }}
 };
@@ -190 +193 @@
 {
         return ( memcmp(mask1, mask2, sizeof(SE_PRIV)) == 0 );
+}
+
+/***************************************************************************
+ check if 2 LUID's are equal.
+****************************************************************************/
+
+static bool luid_equal( const LUID *luid1, const LUID *luid2 )
+{
+        return ( luid1->low == luid2->low && luid1->high == luid2->high);
 }
 
@@ -407 +419 @@
         int i;
 
-        if (set->high != 0)
-                return NULL;
-
         for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
-                if ( set->low == privs[i].luid.low ) {
+                if (luid_equal(set, &privs[i].luid)) {
                         return privs[i].name;
                 }
@@ -478 +487 @@
         int i;
         uint32 num_privs = count_all_privileges();
+        LUID local_luid;
+
+        local_luid.low = luid->low;
+        local_luid.high = luid->high;
 
         for ( i=0; i<num_privs; i++ ) {
-                if ( luid->low == privs[i].luid.low ) {
+                if (luid_equal(&local_luid, &privs[i].luid)) {
                         se_priv_copy( mask, &privs[i].se_priv );
                         return True;
@@ -501 +514 @@
                 SE_PRIV r;
 
-                /* sanity check for invalid privilege.  we really
-                   only care about the low 32 bits */
-
-                if ( privset->set[i].luid.high != 0 )
-                        return False;
-
                 if ( luid_to_se_priv( &privset->set[i].luid, &r ) )
                         se_priv_add( mask, &r );