NetworkManager r3783 - in trunk: . src/backends

[tambeti svn gnome org]

Author: tambeti
Date: Mon Jun 30 14:49:52 2008
New Revision: 3783
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3783&view=rev

Log:
2008-06-30  Tambet Ingo  <tambet gmail com>

	* src/backends/NetworkManagerSuSE.c (nm_system_activate_nis): Fix a
	bunch of typoes introduced by "Patch from David Cantrell
	<dcantrell redhat com> and me".


Modified:
   trunk/ChangeLog
   trunk/src/backends/NetworkManagerSuSE.c

Modified: trunk/src/backends/NetworkManagerSuSE.c
==============================================================================
--- trunk/src/backends/NetworkManagerSuSE.c	(original)
+++ trunk/src/backends/NetworkManagerSuSE.c	Mon Jun 30 14:49:52 2008
@@ -103,12 +103,12 @@
 	shvarFile *file;
 	const char *nis_domain;
 	char *name, *buf;
-	struct in_addr	temp_addr;
+	struct in_addr temp_addr;
 	int i;
 	FILE *ypconf = NULL;
-	char buf[INET_ADDRSTRLEN+1];
+	char addr_buf[INET_ADDRSTRLEN+1];
 
-	memset (&buf, '\0', sizeof (buf));
+	memset (&addr_buf, '\0', sizeof (addr_buf));
 
 	g_return_if_fail (config != NULL);
 
@@ -149,11 +149,11 @@
 				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, buf, INET_ADDRSTRLEN))
+					if (!inet_ntop (AF_INET, &temp_addr, addr_buf, INET_ADDRSTRLEN))
 						nm_warning ("%s: error converting IP4 address 0x%X",
-						            __func__, ntohl (tempaddr.s_addr));
+						            __func__, ntohl (temp_addr.s_addr));
 					else
-						fprintf (ypconf, "domain %s server %s\n", nis_domain, buf);
+						fprintf (ypconf, "domain %s server %s\n", nis_domain, addr_buf);
 				}
 				fprintf (ypconf, "\n");
 				fclose (ypconf);