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)

diff --git a/source3/aparser/parser.h b/source3/aparser/parser.h
index 319aeb5d13863f2ab37e9bfed2d8dbd50c03fe0b..24b0cd193054bb07196b2e0265c2d474d2c5b559 100644 (file)
--- a/source3/aparser/parser.h
+++ b/source3/aparser/parser.h
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../include/byteorder.h"
+#include "include/byteorder.h"
 
 #define PARSE_SCALARS (1<<0)
 #define PARSE_BUFFERS (1<<1)

diff --git a/source3/client/client.c b/source3/client/client.c
index 42db009c58a69eba6840832c9c93bd67b11178a1..c2fec17d7ec2ebcfdaaac9104423f586d9e05c9e 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -23,7 +23,7 @@
 #define NO_SYSLOG
 
 #include "includes.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 #ifndef REGISTER
 #define REGISTER 0
 #endif

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 4cadef558d61ccc6c75a93279b1fc03718737155..b4d6273f7bb695c8dd12c6e50aa78ea7202abff1 100644 (file)
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include "clitar.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 
 static int clipfind(char **aret, int ret, char *tok);
 

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3ea4eaa35a94fb4e6a3f0d7db3a8d410ba63ab77..d51e4c53f1a1b0a94d42727ea9ce595ecc675e79 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -793,9 +793,9 @@ extern int errno;
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
-#include "../tdb/tdb.h"
-#include "../tdb/spinlock.h"
-#include "../tdb/tdbutil.h"
+#include "tdb/tdb.h"
+#include "tdb/spinlock.h"
+#include "tdb/tdbutil.h"
 #include "talloc.h"
 #include "nt_status.h"
 #include "ads.h"

diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index 21fe47d4b29e482d95a291751ab36487185f40d3..9111f36eaf730bba8f6d45e97ad9e457038f78ea 100644 (file)
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -6,7 +6,7 @@
 #define SMBC_DIR_MODE  (S_IFDIR | 0555)
 
 
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 
 struct _SMBCSRV {

diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index cb40b4aaa6b5c75c19539a90fe6b5978dae993f4..caf226c5a6a2d3e2573b14deb89a1716074f2f8b 100644 (file)
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -27,7 +27,7 @@
  * Define this to get the real SMBCFILE and SMBCSRV structures 
  */
 #define _SMBC_INTERNAL
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 /*
  * Structure we use if internal caching mechanism is used 

diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c
index cc23835ae3dccc9957a89ac929040057b9234f20..c4be848cc17f90ca7c927ed1f2afe56377164d26 100644 (file)
--- a/source3/libsmb/libsmb_compat.c
+++ b/source3/libsmb/libsmb_compat.c
@@ -25,7 +25,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 struct smbc_compat_fdlist {
        SMBCFILE * file;

diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index e44bdea2d3d3cb9eed50cc3e529f6c3252cf45be..2c813a8481c5b6fe2c293aa0908c5975daa83033 100644 (file)
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 /*
  * Internal flags for extended attributes

diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 751f6f3700f03b2fa46d138a52e64fe04855f5fd..477d2e0f682a5a036d7d21a57129e61cdfb459f9 100644 (file)
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -230,7 +230,7 @@ struct winbindd_idmap_methods {
   void (*status)(void);
 };
 
-#include "../nsswitch/winbindd_proto.h"
+#include "nsswitch/winbindd_proto.h"
 
 #include "rpc_parse.h"
 #include "rpc_client.h"

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 2bf8ac286dd7e9dd2c5f7162c68ef1858a222cd1..9a022b2d38d1c75fa080bf0a104d5ae85f5ce30d 100644 (file)
--- 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 d75a19e498ee19eb603cca8ae634c5f865457ca5..5e65ca0d4cdfbf17956b885c9468fd30f670ee2e 100644 (file)
--- 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 8afc42c456bb0b29b56d37dbdc978b427782b53c..19311cde6547ded8f650b258a2d9a31443269991 100644 (file)
--- 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 f3c6c5ff4d276ae89f8f17f583cecae94d9446d9..9585a8bc7604c3d0181ee9b3ac5d58fb8a68c186 100644 (file)
--- 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 0ad1d519531c3c9267fc3cac9010a73e94200081..3431196b1e678fa3ad49a506bf050fa788aeb2a3 100644 (file)
--- 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 d6ef5e8a6c300d8d59d0a80ea73222ae7486d7f2..859bb949c73179ee6deb3a7cad58971cd68da29c 100644 (file)
--- 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 f5b4bf1b4a74c2906daec168ff7a2d11d12686c7..35892e8b52cec80a85547a9f4d077ab4f8cea994 100644 (file)
--- 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 cef0ea5fbed62f430dc40285430f5626253d1783..7e5f12da4541719632e148b0024c53bc1c67b2f8 100644 (file)
--- 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 39254641abf9383010c0aef381d9f85badbbb130..cae0a7f7da8175f664bfbf4da228573c93d9c7a9 100644 (file)
--- 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 a6e4c61d459da19acba1fe8f98b76156bbfb4549..9b96ad137173716a95c9846cd6ab856e8856d25c 100644 (file)
--- 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 52e295949e06c4ac6d8632e2b17c021ec0fd3d97..cb8a5ee4d4fbad17259ec827c8c1febab0df1982 100644 (file)
--- 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 732af254d0d88fe2b718b747da00cf3ad4c40378..50d0d4e7df9a1fb3ce4d9e7cc5057d6aaba3d636 100644 (file)
--- 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 882f3a02bc28b55e431af899d7fbaf4c3cb48fa6..2e7c053ac3fb97bcf28ac36dd94e18dbfac44966 100644 (file)
--- 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 0543f457cfc0061cba5d80e3afce4a1a4b87d09f..21e6bffb2cfe6b3766a3b46efea2fac098d9a636 100644 (file)
--- 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 45c17838055e9761b60c2ef4f6a21f7dc8b7d585..691adcea00eff2b3a0fad0a477692e9221868ebc 100644 (file)
--- 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 ea7db55e2dd729f15e59bb1a4570fcf9f2c0313f..b2c155dfb2aa51a8017b5cb3b134cebcb3e56d07 100644 (file)
--- 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 a96067fbbb875a36cc65a33097812e55e88c416d..5e49b862a2096fbf16073ab39b434f28dbcd60b2 100644 (file)
--- 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 3489dbca7c8f616ca7846e654bbff37292be12ec..7fae0ede978874c213d0e53b335b737d71b1e992 100644 (file)
--- 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

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 93731d1d3f933d14e28f76d298afad8e6a703550..cf309c364e252aacdc3b9f723bb08e04d88093bd 100644 (file)
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -19,7 +19,7 @@
 
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
 

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 46432c41f852049c274644b7b1fb1500e135a9da..a49078606856d3af0b6a8dcad37da10b647501d1 100644 (file)
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #ifdef WITH_WINBIND
 

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index da974f78a4a0a542bd9a0502179d4683a5e53611..aa285745d6cf7fbab094b8948bec164582b08202 100644 (file)
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 /*
   during a file download we first check to see if there is a language

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 93e8650c2bc0c382d31f37ff0026f19183b2c7c1..9ffda5bb941bdcba9adc69d12b16b32d0107213d 100644 (file)
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 #include "dynconfig.h"
 
 

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 2c645de248e541b9504143e22058c74d6669a7c1..953222c2fc10acea31fc94041f7b1dcff4c4daa0 100644 (file)
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define PIDMAP         struct PidMap
 

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 40f9f0599125b3d97cff476dc8ab66ba7449ed28..48537d1d049979b9ab0927b6c40147257b13bc90 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -29,7 +29,7 @@
  **/
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;