dns: Reformat DNS with clang-format

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10812

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/ldb-samba/ldb_matching_rules.c b/lib/ldb-samba/ldb_matching_rules.c
index 063a5d3c3a322bcd363815f65136fdf39e3a97ec..5999943dcd2d9588d7e9f5a0df7a5abed8e2ccad 100644 (file)
--- a/lib/ldb-samba/ldb_matching_rules.c
+++ b/lib/ldb-samba/ldb_matching_rules.c
@@ -448,7 +448,7 @@ static int dsdb_match_for_expunge(struct ldb_context *ldb,
 int ldb_register_samba_matching_rules(struct ldb_context *ldb)
 {
        struct ldb_extended_match_rule *transitive_eval = NULL,
-               *match_for_expunge = NULL;
+                                      *match_for_expunge = NULL;
        int ret;
 
        transitive_eval = talloc_zero(ldb, struct ldb_extended_match_rule);

diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index ac785f0d4f3eb761f7602de00a83835a27a97747..0463c6e47a6fff57aca72e3585c7a2d36883a4f9 100644 (file)
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -1488,15 +1488,18 @@ static bool dns_name_equal(const char *name1, const char *name2)
 {
        size_t len1 = strlen(name1);
        size_t len2 = strlen(name2);
-       if (name1[len1-1] == '.') len1--;
-       if (name2[len2-1] == '.') len2--;
+       if (name1[len1 - 1] == '.') {
+               len1--;
+       }
+       if (name2[len2 - 1] == '.') {
+               len2--;
+       }
        if (len1 != len2) {
                return false;
        }
        return strncasecmp_m(name1, name2, len1) == 0;
 }
 
-
 /*
   see if two dns records match
  */
@@ -1648,8 +1651,14 @@ _PUBLIC_ isc_result_t dlz_addrdataset(const char *name, const char *rdatastr, vo
        }
 
        unix_to_nt_time(&t, time(NULL));
-       t /= 10*1000*1000; /* convert to seconds (NT time is in 100ns units) */
-       t /= 3600;         /* convert to hours */
+       /*
+        * convert to seconds (NT time is in 100ns units)
+        */
+       t /= 10 * 1000 * 1000;
+       /*
+        * convert to hours
+        */
+       t /= 3600;
 
        rec->rank        = DNS_RANK_ZONE;
        rec->dwTimeStamp = (uint32_t)t;

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index a48f27bd992f435d670906e6e09ee697b793a9d7..ac3c3e11bae5da6c5be6bcc72ed3965a22edb09c 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -610,7 +610,6 @@ static WERROR handle_one_update(struct dns_server *dns,
                                                struct dnsp_DnssrvRpcRecord);
                        W_ERROR_HAVE_NO_MEMORY(ns_rec);
 
-
                        werror = dns_rr_to_dnsp(ns_rec, update, ns_rec);
                        W_ERROR_NOT_OK_RETURN(werror);
 

diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c
index fa19ba7efc5699e396c27cceff815a9ba2e33dfd..855b82b4fd56dbea22588344369e2fa2291668a1 100644 (file)
--- a/source4/dsdb/kcc/kcc_periodic.c
+++ b/source4/dsdb/kcc/kcc_periodic.c
@@ -601,8 +601,8 @@ WERROR kccsrv_periodic_schedule(struct kccsrv_service *service, uint32_t next_in
 static NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s, TALLOC_CTX *mem_ctx)
 {
        time_t current_time = time(NULL);
-       time_t interval = lpcfg_parm_int(s->task->lp_ctx, NULL, "kccsrv",
-                                        "check_deleted_interval", 86400);
+       time_t interval = lpcfg_parm_int(
+           s->task->lp_ctx, NULL, "kccsrv", "check_deleted_interval", 86400);
        uint32_t tombstoneLifetime;
        int ret;
        unsigned int num_objects_removed = 0;

diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
index b9ed3dd58879ee9975b2a7413631ee263dafe051..c342ccadfc9c7f60b7935eb6ba41f62622c093d0 100644 (file)
--- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
+++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
@@ -1517,7 +1517,8 @@ static WERROR dnsserver_operate_zone(struct dnsserver_state *dsstate,
                }
 
                /* Ignore property resets */
-               if (strcasecmp(r->NameAndParam->pszNodeName, "AllowUpdate") == 0) {
+               if (strcasecmp(r->NameAndParam->pszNodeName, "AllowUpdate") ==
+                   0) {
                        return WERR_OK;
                }
                valid_operation = true;

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index a7b8e74685b571ee13d4e7fbc022ef40c96718f0..6889cc306ceb8ecf924acc9cf5fa8282b368ddd8 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -1119,21 +1119,23 @@ int dns_name_compare(const struct ldb_message **m1, const struct ldb_message **m
        return strcasecmp(ptr1, ptr2);
 }
 
-
 bool dns_name_equal(const char *name1, const char *name2)
 {
        size_t len1 = strlen(name1);
        size_t len2 = strlen(name2);
 
-       if (len1 > 0 && name1[len1-1] == '.') len1--;
-       if (len2 > 0 && name2[len2-1] == '.') len2--;
+       if (len1 > 0 && name1[len1 - 1] == '.') {
+               len1--;
+       }
+       if (len2 > 0 && name2[len2 - 1] == '.') {
+               len2--;
+       }
        if (len1 != len2) {
                return false;
        }
        return strncasecmp(name1, name2, len1) == 0;
 }
 
-
 bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRecord *rec2)
 {
        bool status;

diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c
index 252d39f29c05a2e916dd3e3055e2d62e97df615d..caf30798846efeba7c1e86a8dad7202f8c6b2e94 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsdb.c
+++ b/source4/rpc_server/dnsserver/dnsdb.c
@@ -86,7 +86,7 @@ struct dnsserver_zone *dnsserver_db_enumerate_zones(TALLOC_CTX *mem_ctx,
                                                struct dnsserver_partition *p)
 {
        TALLOC_CTX *tmp_ctx;
-       const char * const attrs[] = {"name", NULL};
+       const char *const attrs[] = {"name", NULL};
        struct ldb_dn *dn;
        struct ldb_result *res;
        struct dnsserver_zone *zones, *z;
@@ -122,8 +122,8 @@ struct dnsserver_zone *dnsserver_db_enumerate_zones(TALLOC_CTX *mem_ctx,
                }
 
                z->partition = p;
-               name = talloc_strdup(z,
-                               ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL));
+               name = talloc_strdup(
+                   z, ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL));
                if (strcmp(name, "..TrustAnchors") == 0) {
                        talloc_free(z);
                        continue;

diff --git a/source4/rpc_server/dnsserver/dnsserver.h b/source4/rpc_server/dnsserver/dnsserver.h
index 0b08f08fa2dcc2b4ac0e835e8b99ba75474ad015..a30d4ee1acc5d224debc6d49eb6e0ad0eb934d49 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsserver.h
+++ b/source4/rpc_server/dnsserver/dnsserver.h
@@ -248,10 +248,10 @@ WERROR dnsserver_db_update_record(TALLOC_CTX *mem_ctx,
                                        struct DNS_RPC_RECORD *add_record,
                                        struct DNS_RPC_RECORD *del_record);
 WERROR dnsserver_db_delete_record(TALLOC_CTX *mem_ctx,
-                                       struct ldb_context *samdb,
-                                       struct dnsserver_zone *z,
-                                       const char *node_name,
-                                       struct DNS_RPC_RECORD *del_record);
+                                 struct ldb_context *samdb,
+                                 struct dnsserver_zone *z,
+                                 const char *node_name,
+                                 struct DNS_RPC_RECORD *del_record);
 WERROR dnsserver_db_create_zone(struct ldb_context *samdb,
                                struct dnsserver_partition *partitions,
                                struct dnsserver_zone *z,

diff --git a/source4/rpc_server/dnsserver/dnsutils.c b/source4/rpc_server/dnsserver/dnsutils.c
index 72b47f72b4fdfb9f6e0e52b8ed3341e32497a992..f0d7e283110c500bace4e3064bbf23437b5d2984 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsutils.c
+++ b/source4/rpc_server/dnsserver/dnsutils.c
@@ -172,15 +172,16 @@ struct dnsserver_serverinfo *dnsserver_init_serverinfo(TALLOC_CTX *mem_ctx,
        serverinfo->dwRpcProtocol = 5;
        serverinfo->dwNameCheckFlag = DNS_ALLOW_MULTIBYTE_NAMES;
        serverinfo->cAddressAnswerLimit = 0;
-       serverinfo->dwRecursionRetry = 3 /* seconds (default) */;
-       serverinfo->dwRecursionTimeout = 8 /* seconds (default) */;
-       serverinfo->dwMaxCacheTtl = 0x00015180; /* 1 day (default) */;
-       serverinfo->dwDsPollingInterval = 0xB4; /* 3 minutes (default) */;
-       serverinfo->dwLocalNetPriorityNetMask = 0x000000FF;;
+       serverinfo->dwRecursionRetry = 3;       /* seconds (default) */
+       serverinfo->dwRecursionTimeout = 8;     /* seconds (default) */
+       serverinfo->dwMaxCacheTtl = 0x00015180; /* 1 day (default) */
+       serverinfo->dwDsPollingInterval = 0xB4; /* 3 minutes (default) */
+       serverinfo->dwLocalNetPriorityNetMask = 0x000000FF;
 
        serverinfo->dwScavengingInterval = 0;
-       serverinfo->dwDefaultRefreshInterval = 0xA8; /* 7 days in hours */;
-       serverinfo->dwDefaultNoRefreshInterval = 0xA8; /* 7 days in hours */;;
+       serverinfo->dwDefaultRefreshInterval = 0xA8;   /* 7 days in hours */
+       serverinfo->dwDefaultNoRefreshInterval = 0xA8; /* 7 days in hours */
+
        serverinfo->dwLastScavengeTime = 0;
 
        serverinfo->fAutoReverseZones = 0;