upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-24 07:41:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync w/HEAD

Browse source
This commit is contained in:
Mark Andrews 2003-10-21 05:56:41 +00:00
parent 608740d240
commit ee61dfc5ed
13 changed files with 485 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/dig/dig.docbook
View file

@ -1,6 +1,6 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<!--
- Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
- Copyright (C) 2000, 2001 Internet Software Consortium.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@ -16,7 +16,7 @@
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: dig.docbook,v 1.4.2.7.4.3 2003/08/27 01:39:22 marka Exp $ -->
<!-- $Id: dig.docbook,v 1.4.2.7.4.4 2003/10/21 05:56:37 marka Exp $ -->
<refentry>
@ -99,9 +99,9 @@ NS query for "." (the root).
</para>
<para>
It is possible to set per user defaults for <command>dig</command> via
It is possible to set per-user defaults for <command>dig</command> via
<filename>${HOME}/.digrc</filename>. This file is read and any options in it
are applied before the command line arguements.
are applied before the command line arguments.
</para>
</refsect1>
@ -204,9 +204,10 @@ When this option is used, there is no need to provide the
automatically performs a lookup for a name like
<literal>11.12.13.10.in-addr.arpa</literal> and sets the query type and
class to PTR and IN respectively. By default, IPv6 addresses are
looked up using the IP6.ARPA domain and binary labels as defined in
RFC2874. To use the older RFC1886 method using the IP6.INT domain and
"nibble" labels, specify the <option>-n</option> (nibble) option.
looked up using nibble format under the IP6.ARPA domain.
To use the older RFC1886 method using the IP6.INT domain
specify the <option>-i</option> option. Bit string labels (RFC2874)
are now experimental and are not attempted.
</para>
<para>
@ -319,7 +320,7 @@ requests the server to not perform DNSSEC validation of responses.
<varlistentry><term><option>+[no]cl</option></term>
<listitem><para>
Display [do not display] the CLASS when printing the record.
</para></listitem></varlistentry>
</para></listitem></varlistentry>
<varlistentry><term><option>+[no]ttlid</option></term>
<listitem><para>
@ -436,10 +437,10 @@ in a query timeout of 1 second being applied.
Sets the number of times to try UDP queries to server to
<parameter>T</parameter> instead of the default, 3. If
<parameter>T</parameter> is less than or equal to zero, the number of
retries is silently rounded up to 1.
tries is silently rounded up to 1.
</para></listitem></varlistentry>
<varlistentry><term><option>+retries=A</option></term>
<varlistentry><term><option>+retry=T</option></term>
<listitem><para>
Sets the number of times to retry UDP queries to server to
<parameter>T</parameter> instead of the default, 2. Unlike

7
bin/tests/system/dnssec/clean.sh
View file

@ -15,11 +15,12 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.10 2001/01/09 21:42:43 bwelling Exp $
# $Id: clean.sh,v 1.10.12.1 2003/10/21 05:56:38 marka Exp $
rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf
rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf */tmp*
rm -f ns1/root.db ns2/example.db ns3/secure.example.db
rm -f ns3/unsecure.example.db ns3/bogus.example.db
rm -f ns3/unsecure.example.db ns3/bogus.example.db ns3/keyless.example.db
rm -f ns3/dynamic.example.db ns3/dynamic.example.db.signed.jnl
rm -f dig.out.*
rm -f random.data

3
bin/tests/system/xfer/ns2/.cvsignore
View file

@ -1 +1,4 @@
named.run
example.db
tsigzone.db
example.db.jnl

2
bin/win32/BINDInstall/AccountInfo.cpp
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: AccountInfo.cpp,v 1.5 2002/08/06 03:35:30 mayer Exp $ */
/* $Id: AccountInfo.cpp,v 1.5.224.1 2003/10/21 05:56:38 marka Exp $ */
#ifndef UNICODE
#define UNICODE

2
bin/win32/BINDInstall/AccountInfo.h
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: AccountInfo.h,v 1.3 2001/10/05 05:45:50 mayer Exp $ */
/* $Id: AccountInfo.h,v 1.3.226.1 2003/10/21 05:56:39 marka Exp $ */
#define RTN_OK 0

682
bin/win32/BINDInstall/BINDInstallDlg.cpp
View file

File diff suppressed because it is too large Load diff

16
bin/win32/BINDInstall/BINDInstallDlg.h
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: BINDInstallDlg.h,v 1.3 2001/07/31 00:03:14 gson Exp $ */
/* $Id: BINDInstallDlg.h,v 1.3.12.1 2003/10/21 05:56:39 marka Exp $ */
/*
* Copyright (c) 1999-2000 by Nortel Networks Corporation
@ -72,6 +72,7 @@ protected:
void DeleteFiles(BOOL uninstall);
void RegisterService();
void UpdateService();
void UnregisterService(BOOL uninstall);
void RegisterMessages();
@ -80,6 +81,8 @@ protected:
void FailedInstall();
void SetItemStatus(UINT nID, BOOL bSuccess = TRUE);
void GetCurrentServiceAccountName();
BOOL ValidateServiceAccount();
protected:
CString DestDir(int destination);
int MsgBox(int id, ...);
@ -94,9 +97,16 @@ protected:
CString m_etcDir;
CString m_binDir;
CString m_winSysDir;
BOOL m_reboot;
BOOL m_installed;
CString m_currentDir;
BOOL m_accountExists;
BOOL m_accountUsed;
CString m_currentAccount;
CString m_accountName;
CString m_accountPasswordConfirm;
CString m_accountPassword;
BOOL m_serviceExists;
// Generated message map functions
//{{AFX_MSG(CBINDInstallDlg)
virtual BOOL OnInitDialog();

15
bin/win32/BINDInstall/resource.h
View file

@ -50,11 +50,19 @@
#define IDS_NO_VERSION 49
#define IDS_EXISTING_NEWER 50
#define IDS_FILE_BAD 51
#define IDS_ERR_TOOPRIVED 52
#define IDS_ERR_BADACCOUNT 53
#define IDS_ERR_WRONGPRIV 54
#define IDS_CREATEACCOUNT_FAILED 55
#define IDS_ERR_PASSWORD 56
#define IDS_ERR_UPDATE_SERVICE 57
#define IDD_BINDINSTALL_DIALOG 102
#define IDR_MAINFRAME 128
#define IDD_BROWSE 129
#define IDI_CHECK 130
#define IDI_X 132
#define IDC_CURSOR1 142
#define IDD_DIALOG1 143
#define IDC_TARGETDIR 1001
#define IDC_BROWSE 1002
#define IDC_DIRLIST 1004
@ -77,14 +85,17 @@
#define IDC_DRIVES 1021
#define IDC_CURRENT 1021
#define IDC_START 1022
#define IDC_ACCOUNT_NAME 1030
#define IDC_ACCOUNT_PASSWORD 1031
#define IDC_ACCOUNT_PASSWORD_CONFIRM 1032
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 142
#define _APS_NEXT_RESOURCE_VALUE 144
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1027
#define _APS_NEXT_SYMED_VALUE 101
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif

22
lib/dns/adb.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.181.2.11.2.11 2003/10/14 03:47:58 marka Exp $ */
/* $Id: adb.c,v 1.181.2.11.2.12 2003/10/21 05:56:40 marka Exp $ */
/*
* Implementation notes
@ -86,7 +86,7 @@
*/
#define ADB_CACHE_MINIMUM 10 /* seconds */
#define ADB_CACHE_MAXIMUM 86400 /* seconds (86400 = 24 hours) */
#define ADB_ENTRY_WINDOW 1800 /* seconds */
#define ADB_ENTRY_WINDOW 1800 /* seconds */
/*
* Wake up every CLEAN_SECONDS and clean CLEAN_BUCKETS buckets, so that all
@ -242,7 +242,7 @@ struct dns_adbentry {
unsigned int flags;
unsigned int srtt;
isc_sockaddr_t sockaddr;
isc_stdtime_t expires;
/*
* A nonzero 'expires' field indicates that the entry should
@ -292,7 +292,7 @@ static inline void inc_adb_erefcnt(dns_adb_t *);
static inline void inc_entry_refcnt(dns_adb_t *, dns_adbentry_t *,
isc_boolean_t);
static inline isc_boolean_t dec_entry_refcnt(dns_adb_t *, dns_adbentry_t *,
isc_boolean_t);
isc_boolean_t);
static inline void violate_locking_hierarchy(isc_mutex_t *, isc_mutex_t *);
static isc_boolean_t clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *);
static void clean_target(dns_adb_t *, dns_name_t *);
@ -1234,7 +1234,7 @@ dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock) {
free_adbentry(adb, &entry);
if (result)
result =dec_adb_irefcnt(adb);
return (result);
}
@ -3199,7 +3199,7 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) {
*/
if (dev->result != ISC_R_SUCCESS) {
char buf[DNS_NAME_FORMATSIZE];
dns_name_format(&name->name, buf, sizeof(buf));
DP(DEF_LEVEL, "adb: fetch of '%s' %s failed: %s",
buf, address_type == DNS_ADBFIND_INET ? "A" : "AAAA",
@ -3310,7 +3310,7 @@ fetch_name(dns_adbname_t *adbname,
return (result);
}
/*
/*
* XXXMLG Needs to take a find argument and an address info, no zone or adb,
* since these can be extracted from the find itself.
*/
@ -3530,11 +3530,11 @@ dns_adb_flushname(dns_adb_t *adb, dns_name_t *name) {
static void
water(void *arg, int mark) {
dns_adb_t *adb = arg;
isc_boolean_t overmem = ISC_TF(mark == ISC_MEM_HIWATER);
dns_adb_t *adb = arg;
isc_boolean_t overmem = ISC_TF(mark == ISC_MEM_HIWATER);
isc_interval_t interval;
REQUIRE(DNS_ADB_VALID(adb));
REQUIRE(DNS_ADB_VALID(adb));
DP(ISC_LOG_DEBUG(1),
"adb reached %s water mark", overmem ? "high" : "low");

4
lib/dns/masterdump.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.56.2.5.2.4 2003/10/14 03:48:00 marka Exp $ */
/* $Id: masterdump.c,v 1.56.2.5.2.5 2003/10/21 05:56:40 marka Exp $ */
#include <config.h>
@ -1049,7 +1049,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx->do_date = dns_db_iscache(dctx->db);
relative = ((dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) ?
ISC_TRUE : ISC_FALSE,
ISC_TRUE : ISC_FALSE;
result = dns_db_createiterator(dctx->db, relative, &dctx->dbiter);
if (result != ISC_R_SUCCESS)
goto cleanup;

4
lib/dns/rdata/generic/key_25.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: key_25.c,v 1.41.12.2 2003/09/11 00:18:10 marka Exp $ */
/* $Id: key_25.c,v 1.41.12.3 2003/10/21 05:56:41 marka Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@ -28,7 +28,7 @@
#include <dst/dst.h>
#define RRTYPE_KEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
#define RRTYPE_KEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC|DNS_RDATATYPEATTR_ATPARENT)
static inline isc_result_t
fromtext_key(ARGS_FROMTEXT) {

6
lib/isc/include/isc/hash.h
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: hash.h,v 1.2.2.1 2003/07/25 07:30:43 marka Exp $ */
/* $Id: hash.h,v 1.2.2.1.2.1 2003/10/21 05:56:41 marka Exp $ */
#ifndef ISC_HASH_H
#define ISC_HASH_H 1
@ -40,8 +40,8 @@
*
* Altough the API is generic about the hash keys, it mainly expects
* DNS names (and sometimes IPv4/v6 addresses) as inputs. It has an
* upper limit of the input length, and may run slow to calculaate the
* has values for large inputs.
* upper limit of the input length, and may run slow to calculate the
* hash values for large inputs.
*
* This API is designed to be general so that it can provide multiple
* different hash contexts that have different random vectors. However,

4
lib/isc/win32/syslog.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: syslog.c,v 1.3.12.2 2003/10/07 03:28:39 marka Exp $ */
/* $Id: syslog.c,v 1.3.12.3 2003/10/21 05:56:41 marka Exp $ */
#include <config.h>
@ -178,4 +178,4 @@ NTReportError(const char *name, const char *str) {
BIND_ERR_MSG, NULL, 1, 0, buf, NULL);
DeregisterEventSource(hNTAppLog);
}
}