Commit 3e12c54d authored by Automatic Updater's avatar Automatic Updater
Browse files

update copyright notice

parent 08f860f8
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: globals.h,v 1.84 2009/07/14 22:54:56 each Exp $ */
/* $Id: globals.h,v 1.85 2009/07/14 23:47:53 tbox Exp $ */
#ifndef NAMED_GLOBALS_H
#define NAMED_GLOBALS_H 1
......@@ -120,7 +120,7 @@ EXTERN isc_boolean_t ns_g_foreground INIT(ISC_FALSE);
EXTERN isc_boolean_t ns_g_logstderr INIT(ISC_FALSE);
EXTERN const char * ns_g_defaultsessionkeyfile
INIT(NS_LOCALSTATEDIR "/run/named/"
INIT(NS_LOCALSTATEDIR "/run/named/"
"session.key");
#if NS_RUN_PID_DIR
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.538 2009/07/14 22:54:56 each Exp $ */
/* $Id: server.c,v 1.539 2009/07/14 23:47:53 tbox Exp $ */
/*! \file */
......@@ -3396,12 +3396,12 @@ generate_session_key(const char *filename, const char *keynamestr,
/* Dump the key to the key file. */
result = isc_file_safecreate(filename, &fp);
if (result != ISC_R_SUCCESS) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
"could not create %s", filename);
goto cleanup;
}
if (result != ISC_R_SUCCESS) {
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
"could not create %s", filename);
goto cleanup;
}
fprintf(fp, "key \"%s\" {\n"
"\talgorithm %s;\n"
......@@ -3968,9 +3968,9 @@ load_configuration(const char *filename, ns_server_t *server,
CHECK(isc_timer_reset(server->pps_timer, isc_timertype_ticker, NULL,
&interval, ISC_FALSE));
/*
* Write the PID file.
*/
/*
* Write the PID file.
*/
obj = NULL;
if (ns_config_get(maps, "pid-file", &obj) == ISC_R_SUCCESS)
if (cfg_obj_isvoid(obj))
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: os.c,v 1.97 2009/07/14 22:38:38 each Exp $ */
/* $Id: os.c,v 1.98 2009/07/14 23:47:54 tbox Exp $ */
/*! \file */
......@@ -722,27 +722,27 @@ static void
setperms(uid_t uid, gid_t gid, void (*report)(const char *, ...)) {
char strbuf[ISC_STRERRORSIZE];
#if defined(HAVE_SETEGID)
if (setegid(gid) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective gid: %s", strbuf);
}
if (setegid(gid) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective gid: %s", strbuf);
}
#elif defined(HAVE_SETRESGID)
if (setresgid(-1, gid, -1) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective gid: %s", strbuf);
}
if (setresgid(-1, gid, -1) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective gid: %s", strbuf);
}
#endif
#if defined(HAVE_SETEUID)
if (seteuid(uid) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective uid: %s", strbuf);
}
if (seteuid(uid) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective uid: %s", strbuf);
}
#elif defined(HAVE_SETRESUID)
if (setresuid(-1, uid, -1) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective uid: %s", strbuf);
}
if (setresuid(-1, uid, -1) == -1) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("unable to set effective uid: %s", strbuf);
}
#endif
}
......@@ -791,9 +791,9 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
* Open the file using the uid/gid pair we will eventually
* be running as.
*/
setperms(runas_pw->pw_uid, runas_pw->pw_gid, report);
setperms(runas_pw->pw_uid, runas_pw->pw_gid, report);
fd = safe_open(filename, ISC_FALSE);
setperms(0, 0, report);
setperms(0, 0, report);
if (fd == -1) {
/*
......@@ -802,7 +802,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
fd = safe_open(filename, ISC_FALSE);
if (fd != -1) {
ns_main_earlywarning("Required root "
"permissions to open "
"permissions to open "
"'%s'.", filename);
ns_main_earlywarning("Please check file and "
"directory permissions "
......@@ -812,7 +812,7 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
}
} else
fd = safe_open(filename, ISC_FALSE);
if (fd < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf));
(*report)("couldn't open pid file '%s': %s", filename, strbuf);
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.152 2009/07/14 22:54:56 each Exp $ */
/* $Id: zoneconf.c,v 1.153 2009/07/14 23:47:53 tbox Exp $ */
/*% */
......@@ -177,7 +177,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
const cfg_listelt_t *element, *element2;
dns_ssutable_t *table = NULL;
isc_mem_t *mctx = dns_zone_getmctx(zone);
isc_boolean_t autoddns = ISC_FALSE;
isc_boolean_t autoddns = ISC_FALSE;
isc_result_t result;
(void)cfg_map_get(zconfig, "update-policy", &updatepolicy);
......@@ -187,11 +187,11 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
return (ISC_R_SUCCESS);
}
if (cfg_obj_isstring(updatepolicy) &&
strcmp("local", cfg_obj_asstring(updatepolicy)) == 0) {
autoddns = ISC_TRUE;
updatepolicy = NULL;
}
if (cfg_obj_isstring(updatepolicy) &&
strcmp("local", cfg_obj_asstring(updatepolicy)) == 0) {
autoddns = ISC_TRUE;
updatepolicy = NULL;
}
result = dns_ssutable_create(mctx, &table);
if (result != ISC_R_SUCCESS)
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsupdate.c,v 1.169 2009/07/14 22:54:56 each Exp $ */
/* $Id: nsupdate.c,v 1.170 2009/07/14 23:47:54 tbox Exp $ */
/*! \file */
......@@ -582,7 +582,7 @@ read_sessionkey(isc_mem_t *mctx, isc_log_t *lctx) {
goto cleanup;
result = cfg_parse_file(pctx, keyfile, &cfg_type_sessionkey,
&sessionkey);
&sessionkey);
if (result != ISC_R_SUCCESS)
goto cleanup;
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check.c,v 1.104 2009/07/14 22:54:57 each Exp $ */
/* $Id: check.c,v 1.105 2009/07/14 23:47:54 tbox Exp $ */
/*! \file */
......@@ -972,7 +972,7 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
/* Check for "update-policy local;" */
if (cfg_obj_isstring(policy) &&
strcmp("local", cfg_obj_asstring(policy)) == 0)
return (ISC_R_SUCCESS);
return (ISC_R_SUCCESS);
/* Now check the grant policy */
for (element = cfg_list_first(policy);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment