Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge latest version, fix conflicts.

Browse Source
This commit is contained in:
mellon 2000-06-24 06:57:05 +00:00
parent f3b06ab74b
commit 770dd9d3d3
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/dhcp/common/options.c
View File

@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: options.c,v 1.4 2000/06/24 06:50:02 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
"$Id: options.c,v 1.5 2000/06/24 06:57:05 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#define DHCP_OPTION_DATA
@ -672,29 +672,21 @@ const char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
case 't':
if (emit_quotes)
*op++ = '"';
<<<<<<< options.c
if (len != 0) {
strcpy (op, (const char *)dp);
op += strlen ((const char *)dp);
}
=======
for (k = 0; dp [k]; k++) {
if (!isascii (dp [k]) ||
!isprint (dp [k])) {
sprintf (op, "\\%03o",
dp [k]);
for (; dp < data + len; dp++) {
if (!isascii (*dp) ||
!isprint (*dp)) {
sprintf (op, "\\\\%03o", *dp);
op += 4;
} else if (dp [k] == '"' ||
dp [k] == '\'' ||
dp [k] == '$' ||
dp [k] == '`' ||
dp [k] == '\\') {
} else if (*dp == '"' ||
*dp == '\'' ||
*dp == '$' ||
*dp == '`' ||
*dp == '\\') {
*op++ = '\\';
*op++ = dp [k];
*op++ = *dp;
} else
*op++ = dp [k];
*op++ = *dp;
}
>>>>>>> 1.1.1.12
if (emit_quotes)
*op++ = '"';
*op = 0;

22
usr.sbin/dhcp/server/confpars.c
View File

@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: confpars.c,v 1.3 2000/06/24 06:50:03 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
"$Id: confpars.c,v 1.4 2000/06/24 06:57:05 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -313,13 +313,9 @@ int parse_statement (cfile, group, type, host_decl, declaration)
log_fatal ("Can't allocate shared subnet: %s",
isc_result_totext (status));
if (!clone_group (&share -> group, group, MDL))
<<<<<<< confpars.c
log_fatal ("Can't allocate group for shared net");
shared_network_reference (&share -> group -> shared_network,
share, MDL);
=======
log_fatal ("Can't allocate group for shared net");
>>>>>>> 1.1.1.11
parse_subnet_declaration (cfile, share);
@ -1077,13 +1073,8 @@ void parse_pool_statement (cfile, group, type)
log_fatal ("no memory for pool: %s",
isc_result_totext (status));
<<<<<<< confpars.c
if (!clone_group (&pool -> group, group, MDL))
log_fatal ("can't clone pool group.");
=======
if (!clone_group (&pool -> group, group, MDL))
log_fatal ("can't clone pool group");
>>>>>>> 1.1.1.11
if (type == SUBNET_DECL)
shared_network_reference (&pool -> shared_network,
@ -1380,14 +1371,8 @@ void parse_host_declaration (cfile, group)
log_fatal ("can't allocate host decl struct %s: %s",
name, isc_result_totext (status));
host -> name = name;
<<<<<<< confpars.c
if (!clone_group (&host -> group, group, MDL)) {
log_fatal ("can't clone group for host %s: %s",
name, isc_result_totext (status));
=======
if (!clone_group (&host -> group, group, MDL)) {
log_fatal ("can't clone group for host %s", name);
>>>>>>> 1.1.1.11
boom:
host_dereference (&host, MDL);
return;
@ -1724,14 +1709,9 @@ int parse_class_declaration (cp, cfile, group, type)
return cp ? (status == ISC_R_SUCCESS) : 1;
}
/* Give the subclass its own group. */
<<<<<<< confpars.c
if (!clone_group (&class -> group, class -> group, MDL))
log_fatal ("can't clone class group.");
=======
if (!clone_group (&class -> group, class -> group, MDL))
log_fatal ("can't clone class group.");
>>>>>>> 1.1.1.11
}
if (!parse_lbrace (cfile)) {