Merge remote-tracking branch 'origin/candidate-3.8.4' into candidate-3.8.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

dali/base/dadfs.cpp

@@ -1055,13 +1055,8 @@ static int getScopePermissions(const char *scopename,IUserDescriptor *user,unsig
         {
 #ifdef _DALIUSER_STACKTRACE
             //following debug code to be removed
-            StringBuffer sb;
-            user->getUserName(sb);
-            if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
-            {
-                DBGLOG("UNEXPECTED USER '%s' in %s line %ld",sb.str(),__FILE__, __LINE__);
-                PrintStackReport();
-            }
+            DBGLOG("UNEXPECTED USER (NULL) in dadfs.cpp line %d",__LINE__);
+            PrintStackReport();
 #endif
             user = queryDistributedFileDirectory().queryDefaultUser();
         }

dali/base/dasess.cpp

@@ -514,7 +514,7 @@ public:
                 udesc->getUserName(sb);
                 if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
                 {
-                    DBGLOG("UNEXPECTED USER '%s' in %s line %ld",username,__FILE__, __LINE__);
+                    DBGLOG("UNEXPECTED USER '%s' in dasess.cpp line %d",username.get(), __LINE__);
                     PrintStackReport();
                 }
 #endif
@@ -774,10 +774,11 @@ public:
 #ifdef _DALIUSER_STACKTRACE
         //following debug code to be removed
         StringBuffer sb;
-        udesc->getUserName(sb);
+        if (udesc)
+            udesc->getUserName(sb);
         if (0==sb.length() || !stricmp(sb.str(), "daliuser"))
         {
-            DBGLOG("UNEXPECTED USER '%s' in %s line %ld",sb.str(),__FILE__, __LINE__);
+            DBGLOG("UNEXPECTED USER '%s' in dasess.cpp line %d",sb.str(),__LINE__);
             PrintStackReport();
         }
 #endif

dali/server/daldap.cpp

@@ -124,7 +124,7 @@ public:
             if (username.length()==0)  {
 #ifdef _DALIUSER_STACKTRACE
                 //following debug code to be removed
-                DBGLOG("UNEXPECTED USER '%s' in %s line %ld",NULL,__FILE__, __LINE__);
+                DBGLOG("UNEXPECTED USER (NULL) in daldap.cpp line %d", __LINE__);
                 PrintStackReport();
 #endif
                 username.append(filesdefaultuser);

system/security/LdapSecurity/ldapconnection.cpp

@@ -1186,7 +1186,7 @@ public:
                     //following debug code to be removed
                     if (!username || !stricmp(username, "daliuser"))
                     {
-                        DBGLOG("UNEXPECTED USER '%s' in %s line %ld",username,__FILE__, __LINE__);
+                        DBGLOG("UNEXPECTED USER '%s' in ldapconnection.cpp line %d",username, __LINE__);
                         PrintStackReport();
                     }
 #endif