From 9de7c5e52155ee869605884526b9895ad58c0312 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 25 Jul 2001 06:29:26 +0000 Subject: - don't try to print pointers - removed some unused mangling code (This used to be commit 36af1c0dc41f72ec6a5c671fd6b4f6eb2590b8b4) --- source3/smbd/filename.c | 11 ----------- source3/smbd/service.c | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 70f34c52ad..17fa35c0d7 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -125,10 +125,6 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, pstring orig_path; BOOL component_was_mangled = False; BOOL name_has_wildcard = False; -#if 0 - /* Andrew's conservative code... JRA. */ - extern char magic_char; -#endif ZERO_STRUCTP(pst); @@ -240,13 +236,6 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, if(is_mangled(start)) component_was_mangled = True; -#if 0 - /* Keep Andrew's conservative code around, just in case. JRA. */ - /* this is an extremely conservative test for mangled names. */ - if (strchr_m(start,magic_char)) - component_was_mangled = True; -#endif - /* * Now we need to recursively match the name against the real * directory structure. diff --git a/source3/smbd/service.c b/source3/smbd/service.c index b65ac13e74..6f29088a97 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -344,7 +344,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int if (user_in_list(user, list)) conn->read_only = True; } - else DEBUG(0, ("read list substitution failed readlist: 0x%x list: 0x%x\n", lp_readlist(snum), list)); + else DEBUG(0, ("read list substitution failed\n")); if (list) lp_list_free(&list); lp_list_copy(&list, lp_writelist(snum)); @@ -352,7 +352,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int if (user_in_list(user, list)) conn->read_only = False; } - else DEBUG(0, ("write list substitution failed writelist: 0x%x list: 0x%x\n", lp_writelist(snum), list)); + else DEBUG(0, ("write list substitution failed writelist\n")); if (list) lp_list_free(&list); } -- cgit