From b4cf9e95059071df49b34ff8574e48cb96f42da1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 7 Oct 2004 04:01:18 +0000
Subject: r2835: Since we always have -I. and -I$(srcdir) in CFLAGS, we can get
 rid of '..' from all #include preprocessor commands.   This fixes bugzilla
 #1880 where OpenVMS gets confused about the '.' characters. (This used to be
 commit 7f161702fa4916979602cc0295919b541912acd6)

---
 source3/utils/net.c                   | 2 +-
 source3/utils/net.h                   | 2 +-
 source3/utils/net_ads.c               | 2 +-
 source3/utils/net_ads_cldap.c         | 2 +-
 source3/utils/net_groupmap.c          | 2 +-
 source3/utils/net_help.c              | 2 +-
 source3/utils/net_idmap.c             | 2 +-
 source3/utils/net_lookup.c            | 2 +-
 source3/utils/net_rap.c               | 2 +-
 source3/utils/net_rpc.c               | 2 +-
 source3/utils/net_rpc_join.c          | 2 +-
 source3/utils/net_rpc_printer.c       | 2 +-
 source3/utils/net_rpc_samsync.c       | 2 +-
 source3/utils/net_status.c            | 2 +-
 source3/utils/net_time.c              | 2 +-
 source3/utils/ntlm_auth.c             | 2 +-
 source3/utils/ntlm_auth.h             | 2 +-
 source3/utils/ntlm_auth_diagnostics.c | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 2bf8ac286d..9a022b2d38 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -38,7 +38,7 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /***********************************************************************/
 /* Beginning of internationalization section.  Translatable constants  */
diff --git a/source3/utils/net.h b/source3/utils/net.h
index d75a19e498..5e65ca0d4c 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/net_proto.h"
+#include "utils/net_proto.h"
  
 #define NET_FLAGS_MASTER 1
 #define NET_FLAGS_DMB 2
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8afc42c456..19311cde65 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index f3c6c5ff4d..9585a8bc76 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 0ad1d51953..3431196b1e 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -22,7 +22,7 @@
 
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*********************************************************
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index d6ef5e8a6c..859bb949c7 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_common_methods_usage(int argc, const char**argv)
 {
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index f5b4bf1b4a..35892e8b52 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /***********************************************************
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index cef0ea5fbe..7e5f12da45 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_lookup_usage(int argc, const char **argv)
 {
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 39254641ab..cae0a7f7da 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -24,7 +24,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* The following messages were for error checking that is not properly 
    reported at the moment.  Which should be reinstated? */
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index a6e4c61d45..9b96ad1371 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /**
  * @file net_rpc.c
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 52e295949e..cb8a5ee4d4 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 732af254d0..50d0d4e7df 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 struct table_node {
 	const char *long_archi;
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 882f3a02bc..2e7c053ac3 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 extern DOM_SID global_sid_Builtin; 
 
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 0543f457cf..21e6bffb2c 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
 			void *state)
diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index 45c1783805..691adcea00 100644
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ea7db55e2d..b2c155dfb2 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/utils/ntlm_auth.h b/source3/utils/ntlm_auth.h
index a96067fbbb..5e49b862a2 100644
--- a/source3/utils/ntlm_auth.h
+++ b/source3/utils/ntlm_auth.h
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/ntlm_auth_proto.h"
+#include "utils/ntlm_auth_proto.h"
  
 /* Some of the popt variables are needed in the diagnostics code */
 extern const char *opt_username;
diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index 3489dbca7c..7fae0ede97 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
-- 
cgit