The branch main has been updated by rmacklem:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=62e7ac83ae14fcc1847d607e98284bd4a98e7127

commit 62e7ac83ae14fcc1847d607e98284bd4a98e7127
Author:     Rick Macklem <[email protected]>
AuthorDate: 2026-06-16 16:15:25 +0000
Commit:     Rick Macklem <[email protected]>
CommitDate: 2026-06-16 16:15:25 +0000

    Revert "rpc.tlsservd.c: Pin max threads at 1 for now"
    
    This reverts commit 7a289fe3cd5c6de7ddbe394b7700b20b0bafdb3e.
    
    Hopefully, commit fc7993cf2d6d has fixed the underlying
    problem reported by PR#289734, so I am reverting this
    temporary work-around.
    
    I will delay MFC'ng this for a while, to see if the
    problem occurs again.
    
    MFC after:      3 months
---
 usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c 
b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index fb0501b2db4c..f07385a2baa7 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -168,12 +168,7 @@ main(int argc, char **argv)
 
        rpctls_verbose = false;
        ncpu = (u_int)sysconf(_SC_NPROCESSORS_ONLN);
-#ifdef notnow
        rpctls_maxthreads = ncpu > 1 ? ncpu / 2 : 1;
-#else
-       /* XXX For now, until fixed properly!! */
-       rpctls_maxthreads = 1;
-#endif
 
        while ((ch = getopt_long(argc, argv, "2C:D:dhl:N:n:mp:r:uvWw", longopts,
            NULL)) != -1) {
@@ -204,8 +199,6 @@ main(int argc, char **argv)
                        if (rpctls_maxthreads < 1 || rpctls_maxthreads > ncpu)
                                errx(1, "maximum threads must be between 1 and "
                                    "number of CPUs (%d)", ncpu);
-                       /* XXX For now, until fixed properly!! */
-                       rpctls_maxthreads = 1;
                        break;
                case 'n':
                        hostname[0] = '@';

Reply via email to