r12537: finally found the difference between us and w2k3 that caused w2k

domain joins to be agonisingly slow! The join is now instant, and
login is fast too
(This used to be commit 1b65713bbc4f44efee24b86900004a222028b733)

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 3ac75a8ea3f869bad58e487adee9e10046fa9c0d..059aad8c665013b7e296648d635151f18cf24f5d 100644 (file)
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -135,11 +135,18 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
 
        /* setup a GETDC reply */
        ZERO_STRUCT(reply);
+       reply.command = NETLOGON_RESPONSE_FROM_PDC2;
+
+#if 0
+       /* newer testing shows that the reply command type is not
+          changed based on whether a username is given in the
+          reply. This was what was causing the w2k join to be so
+          slow */
        if (netlogon->req.pdc2.user_name[0]) {
                reply.command = NETLOGON_RESPONSE_FROM_PDC_USER;
-       } else {
-               reply.command = NETLOGON_RESPONSE_FROM_PDC2;
        }
+#endif
+
        pdc = &reply.req.response2;
 
        /* TODO: accurately depict which services we are running */