Browse Source

Merge pull request #3359 from RussWhitehead/fixStackdump38x

HPCC-7838 - stack dump changes break in string function

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 years ago
parent
commit
e9bc5d6f23
3 changed files with 4 additions and 4 deletions
  1. 1 1
      dali/base/dadfs.cpp
  2. 2 2
      dali/base/dasess.cpp
  3. 1 1
      system/security/LdapSecurity/ldapconnection.cpp

+ 1 - 1
dali/base/dadfs.cpp

@@ -1057,7 +1057,7 @@ static int getScopePermissions(const char *scopename,IUserDescriptor *user,unsig
             //following debug code to be removed
             StringBuffer sb;
             user->getUserName(sb);
-            if (0==sb.length() || !strcmpi(sb.str(), "daliuser"))
+            if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
             {
                 DBGLOG("UNEXPECTED USER '%s' in %s line %ld",sb.str(),__FILE__, __LINE__);
                 PrintStackReport();

+ 2 - 2
dali/base/dasess.cpp

@@ -512,7 +512,7 @@ public:
                 //following debug code to be removed
                 StringBuffer sb;
                 udesc->getUserName(sb);
-                if (0==sb.length() || !strcmpi(sb.str(), "daliuser"))
+                if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
                 {
                     DBGLOG("UNEXPECTED USER '%s' in %s line %ld",username,__FILE__, __LINE__);
                     PrintStackReport();
@@ -775,7 +775,7 @@ public:
         //following debug code to be removed
         StringBuffer sb;
         udesc->getUserName(sb);
-        if (0==sb.length() || !strcmpi(sb.str(), "daliuser"))
+        if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
         {
             DBGLOG("UNEXPECTED USER '%s' in %s line %ld",sb.str(),__FILE__, __LINE__);
             PrintStackReport();

+ 1 - 1
system/security/LdapSecurity/ldapconnection.cpp

@@ -1184,7 +1184,7 @@ public:
                 {
 #ifdef _DALIUSER_STACKTRACE
                     //following debug code to be removed
-                    if (!username || !strcmpi(username, "daliuser"))
+                    if (!username || !stricmp(username, "daliuser"))
                     {
                         DBGLOG("UNEXPECTED USER '%s' in %s line %ld",username,__FILE__, __LINE__);
                         PrintStackReport();