From 59e666d16e78c41dd9d8c2f979cb46c79a5da582 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 20 Feb 2011 17:28:06 +0000
Subject: [PATCH] --is-dba (related) update for Sybase

---
 plugins/generic/enumeration.py | 2 +-
 xml/queries.xml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 5ddbcbe48..7f63799be 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -136,7 +136,7 @@ class Enumeration:
         if Backend.getIdentifiedDbms() == DBMS.MYSQL:
             self.getCurrentUser()
             query = queries[Backend.getIdentifiedDbms()].is_dba.query % kb.data.currentUser.split("@")[0]
-        elif Backend.getIdentifiedDbms() == DBMS.MSSQL and user is not None:
+        elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) and user is not None:
             query = queries[Backend.getIdentifiedDbms()].is_dba.query2 % user
         else:
             query = queries[Backend.getIdentifiedDbms()].is_dba.query
diff --git a/xml/queries.xml b/xml/queries.xml
index 05a9c0f2d..f13aad968 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -487,7 +487,7 @@
         <banner query="SELECT @@VERSION"/>
         <current_user query="SELECT SUSER_NAME()"/>
         <current_db query="SELECT DB_NAME()"/>
-        <is_dba query="PATINDEX('%sa_role%', SHOW_ROLE())>0"/>
+        <is_dba query="PATINDEX('%sa_role%', SHOW_ROLE())>0" query2="EXISTS(SELECT * FROM master..syslogins, master..sysloginroles WHERE srid=0 and name='%s')"/>
         <users>
             <inband query="SELECT name FROM master..syslogins"/>
             <blind/>