msnfs41client: nfsbuildtest msnfs41client code signing, log nfs minor version, 2025-06-05
Posted by Anonymous on Thu 5th Jun 2025 14:58
raw | new post

From 06bdee535db2985de0461efb87f4b91da521a5a1 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 5 Jun 2025 13:51:29 +0200
Subject: [PATCH 1/2] tests: nfsbuildtest msnfs41client build cmd should use
 WDK test certificate for code signing

nfsbuildtest msnfs41client build cmd should use WDK test certificate
for *.(exe|dll) code signing

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 tests/nfsbuildtest/nfsbuildtest.ksh93 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
index 8e4bb2a..13aa759 100644
--- a/tests/nfsbuildtest/nfsbuildtest.ksh93
+++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
@@ -522,6 +522,9 @@ function msnfs41client_build
                sed -i -E 's/<LinkIncremental>true<\/LinkIncremental>/<LinkIncremental>false<\/LinkIncremental>/g' $(find 'build.vc19' -name \*.vcxproj)
        fi

+       # Use WDK test certificate to sign *.(exe|dll) files
+       export CERTIFICATE_THUMBPRINT="$(powershell -c 'Get-ChildItem -Path Cert:\CurrentUser\My | Where-Object {$_.Subject -like "*WDKTestCert*"} | Select-Object -ExpandProperty Thumbprint')"
+
        #
        # build ms-nfs41-client
        #
--
2.45.1

From 579098be4f2e83eaa018b361f6cb620a4f8d2c89 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 5 Jun 2025 15:20:22 +0200
Subject: [PATCH 2/2] daemon: log entry for successful mount should log the NFS
 minor version

Log entry for successful mount should log the NFS minor version,
so admins can see which minor NFSv4 version is used.

Also demote related NFS minor version debug output to log level 1.

Reported-by: Lionel Cons <lionelcons1972@gmail.com>
Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 daemon/mount.c     | 13 ++++++++-----
 daemon/namespace.c |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/daemon/mount.c b/daemon/mount.c
index be8854f..06e7c78 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -1,5 +1,6 @@
 /* NFSv4.1 client for Windows
- * Copyright (C) 2012 The Regents of the University of Michigan
+ * Copyright (C) 2012 The Regents of the University of Michigan
+ * Copyright (C) 2024-2025 Roland Mainz <roland.mainz@nrubsig.org>
  *
  * Olga Kornievskaia <aglo@umich.edu>
  * Casey Bodley <cbodley@umich.edu>
@@ -199,20 +200,22 @@ out:
     if (status == 0) {
 #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
         logprintf("mount(hostport='%s', use_nfspubfh=%d, path='%s', "
-            "authid=(0x%lx.0x%lx)) success, root=0x%p\n",
+            "authid=(0x%lx.0x%lx)) success, root=0x%p, NFS version=4.%d\n",
             args->hostport?args->hostport:"<NULL>",
             (int)args->use_nfspubfh,
             args->path?args->path:"<NULL>",
             (long)authenticationid.HighPart,
             (long)authenticationid.LowPart,
-            root);
+            root,
+            (int)root->nfsminorvers);
 #else
         logprintf("mount(hostport='%s', use_nfspubfh=%d, path='%s') success, "
-            "root=0x%p\n",
+            "root=0x%p, NFS version=4.%d\n",
             args->hostport?args->hostport:"<NULL>",
             (int)args->use_nfspubfh,
             args->path?args->path:"<NULL>",
-            root);
+            root,
+            (int)root->nfsminorvers);
 #endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
     }
     else {
diff --git a/daemon/namespace.c b/daemon/namespace.c
index 4511b52..b77b499 100644
--- a/daemon/namespace.c
+++ b/daemon/namespace.c
@@ -414,7 +414,7 @@ int nfs41_root_mount_addrs(

 retry_nfs41_exchange_id:
     if (nfsminorvers_autonegotiate) {
-        DPRINTF(0, ("nfs41_root_mount_addrs: "
+        DPRINTF(1, ("nfs41_root_mount_addrs: "
             "Autonegotiating NFS version, "
             "trying NFSv4.%d\n",
             (int)root->nfsminorvers));
@@ -449,7 +449,7 @@ retry_nfs41_exchange_id:

     /* Enable NFS features after NFSv4.x minor version negotiation */
     if (root->nfsminorvers >= 2) {
-        DPRINTF(0, ("nfs41_root_mount_addrs: Enabling NFSv4.2 OPs\n"));
+        DPRINTF(1, ("nfs41_root_mount_addrs: Enabling NFSv4.2 OPs\n"));
         root->supports_nfs42_read_plus  = true;
         root->supports_nfs42_seek       = true;
         root->supports_nfs42_allocate   = true;
--
2.45.1