Changeset 6373

Show
Ignore:
Timestamp:
07/01/08 06:07:24 (5 months ago)
Author:
flynd
Message:

Daemon users no longer return true when checking membership in user group 0 so we need to handle All users group separately.

Location:
trunk/console/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/console/src/console.cpp

    r6372 r6373  
    536536        gUserManager.DropUser(u); 
    537537 
    538         if (isInGroup) 
     538        if (isInGroup || (m_nGroupType == GROUPS_USER && m_nCurrentGroup == 0)) 
    539539        { 
    540540          CreateUserList(); 

  • trunk/console/src/console_print.cpp

    r6372 r6373  
    287287  { 
    288288    // Only show users on the current group and not on the ignore list 
    289     if (!pUser->GetInGroup(m_nGroupType, m_nCurrentGroup) || 
     289    if ((!pUser->GetInGroup(m_nGroupType, m_nCurrentGroup) && 
     290        (m_nGroupType != GROUPS_USER || m_nCurrentGroup != 0)) || 
    290291        (pUser->IgnoreList() && m_nGroupType != GROUPS_SYSTEM && m_nCurrentGroup != GROUP_IGNORE_LIST) ) 
    291292      FOR_EACH_USER_CONTINUE 

  • trunk/console/src/console_tab.cpp

    r4796 r6373  
    7373    { 
    7474      // Ignored users and users not in the current group are unwanted 
    75       if (!pUser->GetInGroup(m_nGroupType, m_nCurrentGroup) || 
     75      if ((!pUser->GetInGroup(m_nGroupType, m_nCurrentGroup) && 
     76          (m_nGroupType != GROUPS_USER || m_nCurrentGroup != 0)) || 
    7677          (pUser->IgnoreList() && m_nGroupType != GROUPS_SYSTEM && m_nCurrentGroup != GROUP_IGNORE_LIST) ) 
    7778        FOR_EACH_USER_CONTINUE