fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 14:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2004-01-05 Colin Walters <walters@redhat.com>

Browse source 
* named/named.conf: Add PID_FILE.

	* named/nm-named-manager.c: Always generate a pid
	file, since older BIND versions don't support
	"pid-file none".


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@359 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Colin Walters 2005-01-05 20:40:38 +00:00 • committed by Colin Walters
parent 0661aa0a9e
commit 2014fed4e2
4 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-01-05 Colin Walters <walters@redhat.com>
* named/named.conf: Add PID_FILE.
* named/nm-named-manager.c: Always generate a pid
file, since older BIND versions don't support
"pid-file none".
2005-01-01 Satoru SATOH <ss@gnome.gr.jp> 2005-01-01 Satoru SATOH <ss@gnome.gr.jp>
* configure.in (ALL_LINGUAS): Added ja (Japanese). * configure.in (ALL_LINGUAS): Added ja (Japanese).

2
named/named.conf
View file

@ -6,7 +6,7 @@ options {
forward only; forward only;
forwarders { @@FORWARDERS@@ }; forwarders { @@FORWARDERS@@ };
listen-on { 127.0.0.1; }; listen-on { 127.0.0.1; };
pid-file none; pid-file "@@PID_FILE@@";
}; };
// Disable rndc // Disable rndc

16
named/nm-named-manager.c
View file

@ -63,6 +63,7 @@ struct NMNamedManagerPrivate
GHashTable *domain_ipv4_nameservers; /* char * -> GHashTable(guint -> char *) */ GHashTable *domain_ipv4_nameservers; /* char * -> GHashTable(guint -> char *) */
char *named_conf; char *named_conf;
char *named_pid_file;
gboolean disposed; gboolean disposed;
}; };
@ -102,6 +103,8 @@ nm_named_manager_dispose (GObject *object)
if (mgr->priv->named_conf) if (mgr->priv->named_conf)
unlink (mgr->priv->named_conf); unlink (mgr->priv->named_conf);
if (mgr->priv->named_pid_file)
unlink (mgr->priv->named_pid_file);
if (mgr->priv->named_realpath_binary) if (mgr->priv->named_realpath_binary)
safer_kill (mgr->priv->named_realpath_binary, mgr->priv->named_pid, SIGTERM); safer_kill (mgr->priv->named_realpath_binary, mgr->priv->named_pid, SIGTERM);
if (mgr->priv->child_watch_id) if (mgr->priv->child_watch_id)
@ -120,6 +123,7 @@ nm_named_manager_finalize (GObject *object)
g_hash_table_destroy (mgr->priv->global_ipv4_nameservers); g_hash_table_destroy (mgr->priv->global_ipv4_nameservers);
g_hash_table_destroy (mgr->priv->domain_ipv4_nameservers); g_hash_table_destroy (mgr->priv->domain_ipv4_nameservers);
g_free (mgr->priv->named_pid_file);
g_free (mgr->priv->named_conf); g_free (mgr->priv->named_conf);
g_free (mgr->priv); g_free (mgr->priv);
@ -234,6 +238,16 @@ generate_named_conf (NMNamedManager *mgr, GError **error)
close (out_fd); close (out_fd);
} }
if (!mgr->priv->named_pid_file)
{
out_fd = g_file_open_tmp ("NetworkManager-named-pid-XXXXXX",
&mgr->priv->named_pid_file,
error);
if (out_fd < 0)
return FALSE;
close (out_fd);
}
if (!g_file_get_contents (config_name, if (!g_file_get_contents (config_name,
&config_contents_str, &config_contents_str,
NULL, NULL,
@ -272,6 +286,8 @@ generate_named_conf (NMNamedManager *mgr, GError **error)
variable_end_pos - (variable_pos + 2)); variable_end_pos - (variable_pos + 2));
if (strcmp ("LOCALSTATEDIR", variable) == 0) if (strcmp ("LOCALSTATEDIR", variable) == 0)
replacement = g_strdup (NM_LOCALSTATEDIR); replacement = g_strdup (NM_LOCALSTATEDIR);
else if (strcmp ("PID_FILE", variable) == 0)
replacement = g_strdup (mgr->priv->named_pid_file);
else if (strcmp ("FORWARDERS", variable) == 0) else if (strcmp ("FORWARDERS", variable) == 0)
replacement = compute_global_forwarders (mgr); replacement = compute_global_forwarders (mgr);
else if (strcmp ("DOMAIN_ZONES", variable) == 0) else if (strcmp ("DOMAIN_ZONES", variable) == 0)

19
src/NetworkManager.conf
View file

@ -2,11 +2,20 @@
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig> <busconfig>
<policy context="default"> <policy user="root">
<allow own="org.freedesktop.NetworkManager"/> <allow own="org.freedesktop.NetworkManager"/>
<allow send_destination="org.freedesktop.NetworkManager"/> <allow send_destination="org.freedesktop.NetworkManager"/>
<allow send_interface="org.freedesktop.NetworkManager"/> <allow send_interface="org.freedesktop.NetworkManager"/>
</policy> </policy>
<policy at_console="true">
<allow send_destination="org.freedesktop.NetworkManager"/>
<allow send_interface="org.freedesktop.NetworkManager"/>
</policy>
<policy context="default">
<deny own="org.freedesktop.NetworkManager"/>
<deny send_destination="org.freedesktop.NetworkManager"/>
<deny send_interface="org.freedesktop.NetworkManager"/>
</policy>
</busconfig> </busconfig>