]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
update copyright notice
authorTinderbox User <tbox@isc.org>
Fri, 29 Aug 2014 23:45:51 +0000 (23:45 +0000)
committerTinderbox User <tbox@isc.org>
Fri, 29 Aug 2014 23:45:51 +0000 (23:45 +0000)
bin/tests/system/geoip/ns2/named10.conf
lib/bind9/check.c

index 29d9d434590affd82e74c0959348e0963c28bba0..3594f615ab98d7f0c0647a1f76c0e021ce6f606f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
index 1c5192cf0f63c6cee6a54958d5b8056caaea52ba..d7d20af9b97a22aaefef77e40b83b3fd3a5e94cb 100644 (file)
@@ -1168,16 +1168,16 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                result = tresult;
 
 #ifdef ISC_PLATFORM_USESIT
-        obj = NULL;
-        (void) cfg_map_get(options, "sit-secret", &obj);
-        if (obj != NULL) {
-                isc_buffer_t b;
+       obj = NULL;
+       (void) cfg_map_get(options, "sit-secret", &obj);
+       if (obj != NULL) {
+               isc_buffer_t b;
                unsigned char secret[32];
 
-                memset(secret, 0, sizeof(secret));
-                isc_buffer_init(&b, secret, sizeof(secret));
-                tresult = isc_hex_decodestring(cfg_obj_asstring(obj), &b);
-               if (tresult == ISC_R_NOSPACE) { 
+               memset(secret, 0, sizeof(secret));
+               isc_buffer_init(&b, secret, sizeof(secret));
+               tresult = isc_hex_decodestring(cfg_obj_asstring(obj), &b);
+               if (tresult == ISC_R_NOSPACE) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
                                    "sit-secret: too long");
                } else if (tresult != ISC_R_SUCCESS) {
@@ -1187,15 +1187,15 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                if (tresult != ISC_R_SUCCESS)
                        result = tresult;
 #ifdef AES_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_AES128_KEYLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                    "AES sit-secret must be on 128 bits");
+                                   "AES sit-secret must be on 128 bits");
                        result = ISC_R_RANGE;
                }
 #endif
 #ifdef HMAC_SHA1_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_SHA1_DIGESTLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
                                    "SHA1 sit-secret must be on 160 bits");
@@ -1203,14 +1203,14 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                }
 #endif
 #ifdef HMAC_SHA256_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_SHA256_DIGESTLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                    "SHA256 sit-secret must be on 256 bits");
+                                   "SHA256 sit-secret must be on 256 bits");
                        result = ISC_R_RANGE;
                }
 #endif
-        }
+       }
 #endif
 
        return (result);