Merge branch 'master' of github.com:sqlmapproject/sqlmap

This commit is contained in:
Miroslav Stampar
2013-01-18 11:31:25 +01:00
3 changed files with 9 additions and 8 deletions

View File

@@ -79,9 +79,6 @@ class Enumeration(GenericEnumeration):
# In Oracle we get the list of roles as string
roles.add(role)
if isAdminFromPrivileges(roles):
areAdmins.add(user)
if user in kb.data.cachedUsersRoles:
kb.data.cachedUsersRoles[user] = list(roles.union(kb.data.cachedUsersRoles[user]))
else:
@@ -162,4 +159,8 @@ class Enumeration(GenericEnumeration):
errMsg += "for the database users"
raise SqlmapNoneDataException(errMsg)
for user, privileges in kb.data.cachedUsersRoles.items():
if isAdminFromPrivileges(privileges):
areAdmins.add(user)
return kb.data.cachedUsersRoles, areAdmins