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 e73179f0dbc4c4ca14061b6962b81d6626e6588f..11b0678426e44e0ad580a2112d18bc6d612cacd9 100644 (file)
--- 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 c42f748465f81ccc2fe66959e3d59d4fe1669526..0c756af3d5561ac301d5a8c26da5f71600e543bd 100644 (file)
--- 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=