diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 2 | ||||
| -rw-r--r-- | source3/include/msdfs.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index dc5932b9be..ed74b6e556 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -135,7 +135,7 @@ #undef HAVE_SETRESUID #undef WITH_NETATALK #undef WITH_UTMP -#undef MS_DFS +#undef WITH_MSDFS #undef HAVE_INO64_T #undef HAVE_STRUCT_FLOCK64 #undef SIZEOF_INO_T diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h index 5323b8749a..2c0f9a19ba 100644 --- a/source3/include/msdfs.h +++ b/source3/include/msdfs.h @@ -59,7 +59,7 @@ struct dfs_path pstring restofthepath; }; -#ifdef MS_DFS +#ifdef WITH_MSDFS #define RESOLVE_DFSPATH(name, conn, inbuf, outbuf) \ { if(((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES)) && \ diff --git a/source3/include/proto.h b/source3/include/proto.h index 69f8e8790b..a8608c47b5 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -357,7 +357,7 @@ char *myhostname(void); char *lock_path(char *name); char *parent_dirname(const char *path); BOOL ms_has_wild(char *s); -BOOL mask_match(char *string, char *pattern, BOOL case_sensitive); +BOOL mask_match(char *string, char *pattern, BOOL is_case_sensitive); int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); /*The following definitions come from lib/util_array.c */ @@ -873,20 +873,20 @@ BOOL posix_locking_end(void); /*The following definitions come from msdfs/msdfs.c */ -BOOL remove_msdfs_link(struct junction_map* jn); -BOOL create_msdfs_link(struct junction_map* jn, BOOL exists); -BOOL is_msdfs_volume(connection_struct* conn, char* path); +BOOL create_junction(char* pathname, struct junction_map* jn); +BOOL is_msdfs_link(connection_struct* conn, char* path); BOOL get_referred_path(struct junction_map* junction); BOOL dfs_redirect(char* pathname, connection_struct* conn); BOOL dfs_findfirst_redirect(char* pathname, connection_struct* conn); -BOOL create_junction(char* pathname, struct junction_map* jn); int setup_dfs_referral(char* pathname, int max_referral_level, char** ppdata); -int enum_msdfs_junctions(struct junction_map* jn); int dfs_path_error(char* inbuf, char* outbuf); +BOOL create_msdfs_link(struct junction_map* jn, BOOL exists); +BOOL remove_msdfs_link(struct junction_map* jn); +int enum_msdfs_links(struct junction_map* jn); int setup_dfs_referral(char* pathname, int max_referral_level, char** ppdata); -BOOL is_msdfs_volume(connection_struct* conn, char* path); +BOOL is_msdfs_link(connection_struct* conn, char* path); /*The following definitions come from nmbd/asyncdns.c */ |