From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 3 Jun 2019 20:39:44 +0000 (-0700)
Subject: Common source file change not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a652f6e7c2c14310e2f6f030660b73e48aeeba80;p=thirdparty%2Fopen-vm-tools.git

Common source file change not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/panic/panic.c b/open-vm-tools/lib/panic/panic.c
index efc9b86b6..d91f47684 100644
--- a/open-vm-tools/lib/panic/panic.c
+++ b/open-vm-tools/lib/panic/panic.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -540,8 +540,8 @@ Panic_Panic(const char *format,
     * panic loop detection.  In particular, try not to call
     * any of our functions (that may call Panic()).
     */
-
    fputs(buf, stderr);
+
 #ifdef _WIN32
    /*
     * This would nominally be Win32U_OutputDebugString.  However,
@@ -555,11 +555,6 @@ Panic_Panic(const char *format,
    OutputDebugStringA(buf);
 #endif
 
-   /*
-    * Make sure Panic gets logged
-    */
-   Log_DisableThrottling();
-
    /*
     * Panic loop detection:
     *	 first time - do the whole report and shutdown sequence
@@ -569,6 +564,7 @@ Panic_Panic(const char *format,
 
    switch (count++) {
    case 0:
+      Log_DisableThrottling(); // Make sure Panic gets logged
       break;
    case 1:
       Log("PANIC: %s", buf);