[SCM] Samba Shared Repository - branch master updated

[Brown, James William]

On 1/4/2024 7:46 AM, Stefan Metzmacher wrote:

@@ -3905,7 +3937,24 @@ static int moveip(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
                return ret;
        }

-       return 0;
+       /*
+        * It isn't strictly necessary to wait until takeover runs are
+        * re-enabled but doing so can't hurt.
+        */
+       ret = disable_takeover_runs(mem_ctx,
+                                   ctdb,
+                                   0,
+                                   connected_pnn,
+                                   connected_count);
+       if (ret != 0) {
+               fprintf(stderr, "Failed to enable takeover runs\n");
+               return ret;
+       }

Message should be "Failed to disable takeover runs\n" like previous change at 3886.