From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sun, 24 Oct 2010 04:21:26 +0000 (-0400)
Subject: Windows: Add version number to event log start pending message
X-Git-Tag: upstream/1.6.1.pre4^2~38
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a9f90d49c5790dbb86a0ebc348288b4f66c8253f;p=packages%2Fo%2Fopenafs.git

Windows: Add version number to event log start pending message

LICENSE MIT

Reviewed-on: http://gerrit.openafs.org/3034
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit b743b32b8b715edf673833a150f9f3d5a72b0b39)

Change-Id: Id7fb16cc9b7d00cb0a880bbdad9dff7bfffff78b
Reviewed-on: http://gerrit.openafs.org/6803
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/WINNT/afsd/afsd_eventlog.c b/src/WINNT/afsd/afsd_eventlog.c
index e73179f0d..11b067842 100644
--- a/src/WINNT/afsd/afsd_eventlog.c
+++ b/src/WINNT/afsd/afsd_eventlog.c
@@ -14,6 +14,8 @@
 #include <WINNT/afsreg.h>
 #include "afsd.h"
 #include "afsd_eventlog.h"
+#define AFS_VERSION_STRINGS
+#include "afs_component_version_number.h"
 
 static BOOL	GetServicePath(LPTSTR lpPathBuf, PDWORD pdwPathBufSize);
 static BOOL	AddEventSource(void);
@@ -197,7 +199,6 @@ LogEvent(WORD wEventType, DWORD dwEventID, ...)
     case MSG_FLUSH_UNEXPECTED_EVENT:
     case MSG_UNHANDLED_EXCEPTION:
     case MSG_SMB_ZERO_TRANSACTION_COUNT:
-    case MSG_SERVICE_START_PENDING:
     case MSG_SERVICE_INCORRECT_VERSIONS:
     case MSG_SERVICE_RUNNING:
     case MSG_SERVICE_STOPPING:
@@ -206,6 +207,10 @@ LogEvent(WORD wEventType, DWORD dwEventID, ...)
     case MSG_CRYPT_OFF:
     case MSG_CRYPT_ON:
 	break;
+    case MSG_SERVICE_START_PENDING:
+        wNumArgs = 1;
+        lpArgs[0] = AFSVersion;
+        break;
     case MSG_FLUSH_BAD_SHARE_NAME:
     case MSG_FLUSH_OPEN_ENUM_ERROR:
     case MSG_FLUSH_ENUM_ERROR:
diff --git a/src/WINNT/afsd/afsd_eventmessages.mc b/src/WINNT/afsd/afsd_eventmessages.mc
index c42f74846..0c756af3d 100644
--- a/src/WINNT/afsd/afsd_eventmessages.mc
+++ b/src/WINNT/afsd/afsd_eventmessages.mc
@@ -260,7 +260,7 @@ Severity=Informational
 Facility=System
 SymbolicName=MSG_SERVICE_START_PENDING
 Language=English
-OpenAFS Start Pending.
+OpenAFS Start Pending.  Version %1.
 .
 
 MessageId=