From b299a6e9d35f93412db0219951b691d6cc1c40cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 10 Nov 2009 16:42:03 +0000
Subject: [PATCH] * Moved resolv.conf to /boot/common/settings/network/.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33989 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/posix/resolv.h                     | 20 +-------------------
 src/kits/network/libbind/resolv/res_init.c | 14 ++++++++------
 src/servers/net/DHCPClient.cpp             | 12 ++++++++++--
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/headers/posix/resolv.h b/headers/posix/resolv.h
index 7004ade9c6..6cc9bf7608 100644
--- a/headers/posix/resolv.h
+++ b/headers/posix/resolv.h
@@ -53,20 +53,11 @@
  * SUCH DAMAGE.
  */
 
-/*%
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $
- */
-
 #ifndef _RESOLV_H_
 #define	_RESOLV_H_
 
 #include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/socket.h>
 #include <stdio.h>
@@ -107,15 +98,6 @@ __BEGIN_DECLS
 void __h_errno_set(struct __res_state *res, int err);
 __END_DECLS
 
-/*%
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * initial name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF        "/etc/resolv.conf"
-#endif
 
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
diff --git a/src/kits/network/libbind/resolv/res_init.c b/src/kits/network/libbind/resolv/res_init.c
index 9b6b94f289..7ebb645f8a 100644
--- a/src/kits/network/libbind/resolv/res_init.c
+++ b/src/kits/network/libbind/resolv/res_init.c
@@ -68,11 +68,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #include <sys/types.h>
@@ -107,6 +102,8 @@ static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Ex
 /* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */
 #include <resolv.h>
 
+#include <FindDirectory.h>
+
 #include "res_private.h"
 
 /*% Options.  Should all be left alone. */
@@ -167,6 +164,7 @@ __res_vinit(res_state statp, int preinit) {
 	register FILE *fp;
 	register char *cp, **pp;
 	register int n;
+	char path[PATH_MAX];
 	char buf[BUFSIZ];
 	int nserv = 0;    /*%< number of nameserver records read from file */
 	int haveenv = 0;
@@ -313,8 +311,12 @@ __res_vinit(res_state statp, int preinit) {
 	(line[sizeof(name) - 1] == ' ' || \
 	 line[sizeof(name) - 1] == '\t'))
 
+	if (find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, path,
+			sizeof(path)) == B_OK)
+		strlcat(path, "/network/resolv.conf", sizeof(path));
+
 	nserv = 0;
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
+	if ((fp = fopen(path, "r")) != NULL) {
 	    /* read the config file */
 	    while (fgets(buf, sizeof(buf), fp) != NULL) {
 		/* skip comments */
diff --git a/src/servers/net/DHCPClient.cpp b/src/servers/net/DHCPClient.cpp
index 276fe855eb..56002dfc54 100644
--- a/src/servers/net/DHCPClient.cpp
+++ b/src/servers/net/DHCPClient.cpp
@@ -10,8 +10,10 @@
 #include "DHCPClient.h"
 #include "NetServer.h"
 
+#include <FindDirectory.h>
 #include <Message.h>
 #include <MessageRunner.h>
+#include <Path.h>
 
 #include <arpa/inet.h>
 #include <errno.h>
@@ -628,8 +630,14 @@ DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address)
 				break;
 			case OPTION_DOMAIN_NAME_SERVER:
 			{
-				// TODO: for now, we write it just out to /etc/resolv.conf
-				FILE* file = fopen("/etc/resolv.conf", "w");
+				// TODO: for now, we write it just out to resolv.conf
+				BPath path;
+				if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK)
+					break;
+				
+				path.Append("network/resolv.conf");
+
+				FILE* file = fopen(path.Path(), "w");
 				for (uint32 i = 0; i < size / 4; i++) {
 					syslog(LOG_INFO, "DNS: %s\n",
 						_ToString(&data[i * 4]).String());