2008-08-07 Dan Williams <dcbw@redhat.com>

* introspection/nm-ip4-config.xml
	  libnm-glib/libnm-glib-test.c
	  libnm-glib/nm-ip4-config.c
	  libnm-glib/nm-ip4-config.h
	  src/NetworkManagerSystem.h
	  src/backends/NetworkManagerArch.c
	  src/backends/NetworkManagerDebian.c
	  src/backends/NetworkManagerFrugalware.c
	  src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
	  src/backends/NetworkManagerGentoo.c
	  src/backends/NetworkManagerMandriva.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerSuSE.c
	  src/dhcp-manager/nm-dhcp-manager.c
	  src/nm-device.c
	  src/nm-ip4-config.c
	  src/nm-ip4-config.h
		- Remove NIS logic; should be done from dispatcher scripts instead



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3909 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-08-07 19:22:23 +00:00
parent 1fa6715103
commit bcae312905
21 changed files with 24 additions and 524 deletions

View File

@@ -70,101 +70,6 @@ void nm_system_update_dns (void)
nm_spawn_process ("/usr/sbin/nscd -i hosts");
}
/*
* nm_system_activate_nis
*
* set up the nis domain and write a yp.conf
*
*/
void nm_system_activate_nis (NMIP4Config *config)
{
shvarFile *file;
const char *nis_domain;
char *name, *buf;
struct in_addr temp_addr;
int i;
FILE *ypconf = NULL;
char addr_buf[INET_ADDRSTRLEN+1];
memset (&addr_buf, '\0', sizeof (addr_buf));
g_return_if_fail (config != NULL);
nis_domain = nm_ip4_config_get_nis_domain(config);
name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/dhcp");
file = svNewFile (name);
if (!file)
goto out_gfree;
buf = svGetValue (file, "DHCLIENT_SET_DOMAINNAME");
if (!buf)
goto out_close;
if ((!strcmp (buf, "yes")) && nis_domain && (setdomainname (nis_domain, strlen (nis_domain)) < 0))
nm_warning ("Could not set nis domain name.");
free (buf);
buf = svGetValue (file, "DHCLIENT_MODIFY_NIS_CONF");
if (!buf)
goto out_close;
if (!strcmp (buf, "yes")) {
int num_nis_servers;
num_nis_servers = nm_ip4_config_get_num_nis_servers(config);
if (num_nis_servers > 0)
{
struct stat sb;
/* write out yp.conf and restart the daemon */
ypconf = fopen ("/etc/yp.conf", "w");
if (ypconf)
{
fprintf (ypconf, "# generated by NetworkManager, do not edit!\n\n");
for (i = 0; i < num_nis_servers; i++) {
temp_addr.s_addr = nm_ip4_config_get_nis_server (config, i);
if (!inet_ntop (AF_INET, &temp_addr, addr_buf, INET_ADDRSTRLEN))
nm_warning ("%s: error converting IP4 address 0x%X",
__func__, ntohl (temp_addr.s_addr));
else
fprintf (ypconf, "domain %s server %s\n", nis_domain, addr_buf);
}
fprintf (ypconf, "\n");
fclose (ypconf);
} else
nm_warning ("Could not commit NIS changes to /etc/yp.conf.");
if (stat ("/usr/sbin/rcautofs", &sb) != -1)
{
nm_info ("Restarting autofs.");
nm_spawn_process ("/usr/sbin/rcautofs reload");
}
}
}
free (buf);
out_close:
svCloseFile (file);
out_gfree:
g_free (name);
}
/*
* nm_system_shutdown_nis
*
* shutdown ypbind
*
*/
void nm_system_shutdown_nis (void)
{
}
/*
* nm_system_set_hostname
*