diff options
author | Gary Lockyer <gary@catalyst.net.nz> | 2018-07-10 13:37:18 +1200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-07-12 04:31:52 +0200 |
commit | b841da04e217646c8bf1eaa3985857ce4207965c (patch) | |
tree | cc551e3799f7035f6125f11ecb29382814ecc4a6 /source4 | |
parent | 19910bea876d2e9797d1e0e3e6594a56662e1e9e (diff) | |
download | samba-b841da04e217646c8bf1eaa3985857ce4207965c.tar.gz |
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>
Diffstat (limited to 'source4')
-rw-r--r-- | source4/dns_server/dlz_bind9.c | 19 | ||||
-rw-r--r-- | source4/dns_server/dns_update.c | 1 | ||||
-rw-r--r-- | source4/dsdb/kcc/kcc_periodic.c | 4 | ||||
-rw-r--r-- | source4/rpc_server/dnsserver/dcerpc_dnsserver.c | 3 | ||||
-rw-r--r-- | source4/rpc_server/dnsserver/dnsdata.c | 10 | ||||
-rw-r--r-- | source4/rpc_server/dnsserver/dnsdb.c | 6 | ||||
-rw-r--r-- | source4/rpc_server/dnsserver/dnsserver.h | 8 | ||||
-rw-r--r-- | source4/rpc_server/dnsserver/dnsutils.c | 15 |
8 files changed, 39 insertions, 27 deletions
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c index ac785f0d4f3..0463c6e47a6 100644 --- 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 a48f27bd992..ac3c3e11bae 100644 --- 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 fa19ba7efc5..855b82b4fd5 100644 --- 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 b9ed3dd5887..c342ccadfc9 100644 --- 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 a7b8e74685b..6889cc306ce 100644 --- 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 252d39f29c0..caf30798846 100644 --- 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 0b08f08fa2d..a30d4ee1acc 100644 --- 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 72b47f72b4f..f0d7e283110 100644 --- 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; |