lib/witness: change srv_witness_startup to take hostname and version.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>

diff --git a/lib/witness/server.c b/lib/witness/server.c
index 8a155011365572980e95edbb52ac39f24b438aca..7f6f0dd177f6272241c8e098e1e0b9050f3c2215 100644 (file)
--- a/lib/witness/server.c
+++ b/lib/witness/server.c
@@ -94,10 +94,10 @@ static bool srv_witness_startup_witness_interfaces_from_config(struct WitnessSer
 }
 #endif
 
-bool srv_witness_startup(struct WitnessServerState *s)
+bool srv_witness_startup(struct WitnessServerState *s,
+                        const char *server_global_name,
+                        uint32_t version)
 {
-       uint32_t version = lp_parm_int(-1, "witness", "max version", 0);
-
        switch (version) {
        case 1:
                s->WitnessServiceVersion = WITNESS_V1;
@@ -111,7 +111,7 @@ bool srv_witness_startup(struct WitnessServerState *s)
        }
 
        //s->ServerGlobalName = talloc_strdup(s, lp_parm_const_string(-1, "witness", "server global name", lp_netbios_name()));
-       s->ServerGlobalName = talloc_strdup(s, lp_netbios_name());
+       s->ServerGlobalName = talloc_strdup(s, server_global_name);
        if (s->ServerGlobalName == NULL) {
                return false;
        }

diff --git a/lib/witness/witness.h b/lib/witness/witness.h
index ea0aae199271d32afdd153a0c4658fffbbda566b..3f5a72d2e4ec09ec9ec5f94a9c4b97705ec1c875 100644 (file)
--- a/lib/witness/witness.h
+++ b/lib/witness/witness.h
@@ -45,7 +45,9 @@ WERROR witness_create_notify_response(TALLOC_CTX *mem_ctx,
                                      const char *ipv4_address,
                                      struct witness_notifyResponse **_r);
 bool srv_witness_startup_witness_interfaces_from_ctdb(struct WitnessServerState *s);
-bool srv_witness_startup(struct WitnessServerState *s);
+bool srv_witness_startup(struct WitnessServerState *s,
+                        const char *server_global_name,
+                        uint32_t version);
 
 /**
  * @brief CTDB integration functions.