Postfix for CORE-5269, fixed SS case, thanks to Pavel

FirebirdSQL · Aug 5, 2016 · 70912f2 · 70912f2
1 parent 781a41d
commit 70912f2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/jrd/Mapping.cpp b/src/jrd/Mapping.cpp
@@ -1438,6 +1438,7 @@ ULONG mapUser(const bool throwNotFoundError,
 			Sync sync(spCache().getSync(), FB_FUNCTION);
 			sync.lock(SYNC_SHARED);
 
+			MAP_DEBUG(fprintf(stderr, "GP: name=%s sql=%s trusted=%s\n", name.c_str(), sql_role.c_str(), trusted_role.c_str()));
 			if (!spCache().getPrivileges(db, name, sql_role, trusted_role, *system_privileges))
 			{
 				sync.unlock();

diff --git a/src/jrd/svc.cpp b/src/jrd/svc.cpp
@@ -2050,7 +2050,7 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
 #ifdef DEV_BUILD
 	if (svc_debug)
 	{
-		::printf("%s %s\n", svc_service_run->serv_name, svc_switches.c_str());
+		::fprintf(stderr, "%s %s\n", svc_service_run->serv_name, svc_switches.c_str());
 		return;
 	}
 #endif

diff --git a/src/jrd/trace/TraceCmdLine.cpp b/src/jrd/trace/TraceCmdLine.cpp
@@ -419,7 +419,6 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
 
 		pwd = "";
 		user = "";
-		role = "";
 		adminRole = false;
 	}