dns/nbt: Fix spelling of the "authoritative" flag.

diff --git a/librpc/idl/dns.idl b/librpc/idl/dns.idl
index faa623be5d9b37df1515b2aca6bd297be32ad3b7..1ccf822336e561cb327576b26d2423fdc9703912 100644 (file)
--- a/librpc/idl/dns.idl
+++ b/librpc/idl/dns.idl
@@ -25,7 +25,7 @@ interface dns
                DNS_FLAG_RECURSION_AVAIL    = 0x0080,
                DNS_FLAG_RECURSION_DESIRED  = 0x0100,
                DNS_FLAG_TRUNCATION         = 0x0200,
-               DNS_FLAG_AUTHORITIVE        = 0x0400,
+               DNS_FLAG_AUTHORITATIVE      = 0x0400,
                DNS_OPCODE                  = 0x7800,
                DNS_FLAG_REPLY              = 0x8000
        } dns_operation;

diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index 165a55cfa0e5446db0a98087f97ee09e38def728..246dfeb7c4dca38d95f095f6554964a5839b5237 100644 (file)
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -25,7 +25,7 @@ interface nbt
                NBT_FLAG_RECURSION_AVAIL    = 0x0080,
                NBT_FLAG_RECURSION_DESIRED  = 0x0100,
                NBT_FLAG_TRUNCATION         = 0x0200,
-               NBT_FLAG_AUTHORITIVE        = 0x0400,
+               NBT_FLAG_AUTHORITATIVE      = 0x0400,
                NBT_OPCODE                  = 0x7800,
                NBT_FLAG_REPLY              = 0x8000
        } nbt_operation;

diff --git a/source4/nbt_server/nodestatus.c b/source4/nbt_server/nodestatus.c
index 8dc1f450537564d30729e945036757175946713f..f71746ab300f855c3ee8483570a047a09cd8e35e 100644 (file)
--- a/source4/nbt_server/nodestatus.c
+++ b/source4/nbt_server/nodestatus.c
@@ -54,7 +54,7 @@ static void nbtd_node_status_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = NBT_OPCODE_QUERY | NBT_FLAG_REPLY | NBT_FLAG_AUTHORITIVE;
+       packet->operation = NBT_OPCODE_QUERY | NBT_FLAG_REPLY | NBT_FLAG_AUTHORITATIVE;
 
        packet->answers = talloc_array(packet, struct nbt_res_rec, 1);
        if (packet->answers == NULL) goto failed;

diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index af96a0130b5fdeb72ccb9df0a7cbc9b6924649b9..2857f1aa9b49db28561c7af5feae842f625bc3fb 100644 (file)
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -121,10 +121,10 @@ void nbtd_name_query_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = 
-               NBT_FLAG_REPLY | 
-               NBT_OPCODE_QUERY | 
-               NBT_FLAG_AUTHORITIVE |
+       packet->operation =
+               NBT_FLAG_REPLY |
+               NBT_OPCODE_QUERY |
+               NBT_FLAG_AUTHORITATIVE |
                NBT_FLAG_RECURSION_DESIRED |
                NBT_FLAG_RECURSION_AVAIL;
 
@@ -177,10 +177,10 @@ void nbtd_negative_name_query_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = 
-               NBT_FLAG_REPLY | 
-               NBT_OPCODE_QUERY | 
-               NBT_FLAG_AUTHORITIVE |
+       packet->operation =
+               NBT_FLAG_REPLY |
+               NBT_OPCODE_QUERY |
+               NBT_FLAG_AUTHORITATIVE |
                NBT_RCODE_NAM;
 
        packet->answers = talloc_array(packet, struct nbt_res_rec, 1);
@@ -221,10 +221,10 @@ void nbtd_name_registration_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = 
-               NBT_FLAG_REPLY | 
+       packet->operation =
+               NBT_FLAG_REPLY |
                NBT_OPCODE_REGISTER |
-               NBT_FLAG_AUTHORITIVE |
+               NBT_FLAG_AUTHORITATIVE |
                NBT_FLAG_RECURSION_DESIRED |
                NBT_FLAG_RECURSION_AVAIL |
                rcode;
@@ -269,10 +269,10 @@ void nbtd_name_release_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = 
-               NBT_FLAG_REPLY | 
+       packet->operation =
+               NBT_FLAG_REPLY |
                NBT_OPCODE_RELEASE |
-               NBT_FLAG_AUTHORITIVE |
+               NBT_FLAG_AUTHORITATIVE |
                rcode;
        
        packet->answers = talloc_array(packet, struct nbt_res_rec, 1);
@@ -315,10 +315,10 @@ void nbtd_wack_reply(struct nbt_name_socket *nbtsock,
 
        packet->name_trn_id = request_packet->name_trn_id;
        packet->ancount = 1;
-       packet->operation = 
-               NBT_FLAG_REPLY | 
+       packet->operation =
+               NBT_FLAG_REPLY |
                NBT_OPCODE_WACK |
-               NBT_FLAG_AUTHORITIVE;
+               NBT_FLAG_AUTHORITATIVE;
        
        packet->answers = talloc_array(packet, struct nbt_res_rec, 1);
        if (packet->answers == NULL) goto failed;

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index caa2d33ede324a2524a478a2451a010de4591f39..ee4b8744e4a6acd5304b1c2c1cf4d4cc31d8b579 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9554,10 +9554,10 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
                }
 
                /* send a positive reply */
-               rep_packet->operation   = 
-                                       NBT_FLAG_REPLY | 
-                                       NBT_OPCODE_QUERY | 
-                                       NBT_FLAG_AUTHORITIVE |
+               rep_packet->operation   =
+                                       NBT_FLAG_REPLY |
+                                       NBT_OPCODE_QUERY |
+                                       NBT_FLAG_AUTHORITATIVE |
                                        NBT_FLAG_RECURSION_DESIRED |
                                        NBT_FLAG_RECURSION_AVAIL;
 
@@ -9579,9 +9579,9 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
        } else {
                /* send a negative reply */
                rep_packet->operation   =
-                                       NBT_FLAG_REPLY | 
-                                       NBT_OPCODE_QUERY | 
-                                       NBT_FLAG_AUTHORITIVE |
+                                       NBT_FLAG_REPLY |
+                                       NBT_OPCODE_QUERY |
+                                       NBT_FLAG_AUTHORITATIVE |
                                        NBT_RCODE_NAM;
 
                rep_packet->answers[0].rr_type   = NBT_QTYPE_NULL;
@@ -9632,10 +9632,10 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 
        rep_packet->name_trn_id = req_packet->name_trn_id;
        rep_packet->ancount     = 1;
-       rep_packet->operation   = 
-                               NBT_FLAG_REPLY | 
+       rep_packet->operation   =
+                               NBT_FLAG_REPLY |
                                NBT_OPCODE_RELEASE |
-                               NBT_FLAG_AUTHORITIVE;
+                               NBT_FLAG_AUTHORITATIVE;
 
        rep_packet->answers     = talloc_array(rep_packet, struct nbt_res_rec, 1);
        if (rep_packet->answers == NULL) return;