fix indentation
This commit is contained in:
parent
edba7f6736
commit
dedba65ce7
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: controlconf.c,v 1.7 2014/03/01 03:24:32 christos Exp $ */
|
||||
/* $NetBSD: controlconf.c,v 1.8 2014/03/01 22:49:49 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2004-2008, 2011-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
@ -381,9 +381,9 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
|
||||
break;
|
||||
isc_mem_put(listener->mctx, secret.rstart, REGION_SIZE(secret));
|
||||
if (result != ISCCC_R_BADAUTH) {
|
||||
log_invalid(&conn->ccmsg, result);
|
||||
goto cleanup;
|
||||
}
|
||||
log_invalid(&conn->ccmsg, result);
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
if (key == NULL) {
|
||||
|
4
external/bsd/bind/dist/bin/named/query.c
vendored
4
external/bsd/bind/dist/bin/named/query.c
vendored
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: query.c,v 1.14 2014/03/01 03:24:32 christos Exp $ */
|
||||
/* $NetBSD: query.c,v 1.15 2014/03/01 22:50:34 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
@ -6608,7 +6608,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
|
||||
* and set the TTL then.
|
||||
*/
|
||||
if (dns_rdataset_isassociated(rdataset))
|
||||
dns_rdataset_disassociate(rdataset);
|
||||
dns_rdataset_disassociate(rdataset);
|
||||
} else {
|
||||
/*
|
||||
* We will add this rdataset.
|
||||
|
10
external/bsd/bind/dist/bin/named/server.c
vendored
10
external/bsd/bind/dist/bin/named/server.c
vendored
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: server.c,v 1.15 2014/03/01 03:24:32 christos Exp $ */
|
||||
/* $NetBSD: server.c,v 1.16 2014/03/01 22:51:24 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
@ -9341,10 +9341,10 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
|
||||
if (strcmp(ptr, "-") != 0) {
|
||||
isc_buffer_t buf;
|
||||
|
||||
isc_buffer_init(&buf, salt, sizeof(salt));
|
||||
CHECK(isc_hex_decodestring(ptr, &buf));
|
||||
saltlen = isc_buffer_usedlength(&buf);
|
||||
}
|
||||
isc_buffer_init(&buf, salt, sizeof(salt));
|
||||
CHECK(isc_hex_decodestring(ptr, &buf));
|
||||
saltlen = isc_buffer_usedlength(&buf);
|
||||
}
|
||||
}
|
||||
} else
|
||||
CHECK(DNS_R_SYNTAX);
|
||||
|
Loading…
Reference in New Issue
Block a user