summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-12 03:08:51 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-12 03:08:51 +0000
commit39d7983a470cc3470dd7126de35697d965817cb6 (patch)
tree3ea0a07654ef722724da73d90f21297a373a97e9 /source3/include
parente041c15c533f4f181875e334463c825b46a79a7c (diff)
downloadsamba-39d7983a470cc3470dd7126de35697d965817cb6.tar.gz
samba-39d7983a470cc3470dd7126de35697d965817cb6.tar.bz2
samba-39d7983a470cc3470dd7126de35697d965817cb6.zip
- enable MSDFS by default, there seems no reason not to have it enabled
by default in Samba 3.x - got rid of some unused parameters in Makefile.in - declare DEBUGLEVEL in debug.h rather than in each file (This used to be commit b8651acb9c0d7248a6a2e82c33b1e43633fd83fd)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/debug.h1
-rw-r--r--source3/include/msdfs.h10
2 files changed, 1 insertions, 10 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h
index cad802d8ca..b726859a0b 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -41,6 +41,7 @@ int Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
extern XFILE *dbf;
+extern int DEBUGLEVEL;
/* If we have these macros, we can add additional info to the header. */
#ifdef HAVE_FILE_MACRO
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index 0748577b0b..df2ea5a6e4 100644
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -59,8 +59,6 @@ struct dfs_path
pstring restofthepath;
};
-#ifdef WITH_MSDFS
-
#define RESOLVE_DFSPATH(name, conn, inbuf, outbuf) \
{ if(((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES)) && \
dfs_redirect(name,conn)) \
@@ -77,12 +75,4 @@ struct dfs_path
SSVAL(outbuf, smb_vwv2, SMB_SHARE_IN_DFS | SMB_SUPPORT_SEARCH_BITS); \
}
-#else
-/* Stub macros */
-#define RESOLVE_DFSPATH(name, conn, inbuf, outbuf) ;
-#define RESOLVE_FINDFIRST_DFSPATH(name, conn, inbuf, outbuf) ;
-#define init_dfsroot(conn, inbuf, outbuf) ;
-
-#endif
-
#endif /* _MSDFS_H */