From 999e265b23ac41adc7847cdf94af5840297e7080 Mon Sep 17 00:00:00 2001 From: "Andrew V. Samoilov" Date: Mon, 14 Feb 2005 13:14:01 +0000 Subject: [PATCH] * samba/lib/util_str.c: Comment out strhasupper(), strhaslower(), toktocliplist(), strncpyn(), strhex_to_str(), all_string_sub() and split_at_last_component(). * samba/lib/time.c: Comment out http_timestring(). * samba/lib/util.c: Comment out Protocol, trans_num, case_sensitive, case_preserve, use_mangled_map, short_case_preserve, case_mangle, my_netbios_names. Make sam_logon_in_ssb and case_default const. (samlogon_user): Make char* instead of pstring. * samba/libsmb/clientgen.c: Comment out cli_api_pipe(), cli_NetWkstaUserLogon(), cli_tdis(), cli_nt_create(), cli_ulogoff(), cli_lock(), cli_unlock(), cli_message_start(), cli_message_text() and cli_message_end(). * samba/libsmb/namequery.c (global_in_nmbd): Make const. (find_master_ip): Comment out. * samba/libsmb/nmblib.c: Comment out matching_bits(), sort_ip, name_query_comp() and sort_query_replies(). --- vfs/ChangeLog | 20 ++++++++++++++++++++ vfs/samba/lib/time.c | 4 ++-- vfs/samba/lib/util.c | 19 ++++++++++++------- vfs/samba/lib/util_str.c | 13 +++++++++---- vfs/samba/libsmb/clientgen.c | 27 ++++++++++++++++----------- vfs/samba/libsmb/namequery.c | 5 +++-- vfs/samba/libsmb/nmblib.c | 4 ++-- 7 files changed, 64 insertions(+), 28 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 90002785d..782339601 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,23 @@ +2005-02-14 Andrew V. Samoilov + + * samba/lib/util_str.c: Comment out strhasupper(), strhaslower(), + toktocliplist(), strncpyn(), strhex_to_str(), all_string_sub() + and split_at_last_component(). + * samba/lib/time.c: Comment out http_timestring(). + * samba/lib/util.c: Comment out Protocol, trans_num, case_sensitive, + case_preserve, use_mangled_map, short_case_preserve, case_mangle, + my_netbios_names. + Make sam_logon_in_ssb and case_default const. + (samlogon_user): Make char* instead of pstring. + * samba/libsmb/clientgen.c: Comment out cli_api_pipe(), + cli_NetWkstaUserLogon(), cli_tdis(), cli_nt_create(), cli_ulogoff(), + cli_lock(), cli_unlock(), cli_message_start(), cli_message_text() + and cli_message_end(). + * samba/libsmb/namequery.c (global_in_nmbd): Make const. + (find_master_ip): Comment out. + * samba/libsmb/nmblib.c: Comment out matching_bits(), sort_ip, + name_query_comp() and sort_query_replies(). + 2005-02-12 Jindrich Novy * vfs.c (vfs_translate_url): Add support for smb://, sh://, diff --git a/vfs/samba/lib/time.c b/vfs/samba/lib/time.c index 420f31e52..df5f6f830 100644 --- a/vfs/samba/lib/time.c +++ b/vfs/samba/lib/time.c @@ -481,7 +481,7 @@ time_t make_unix_date3(void *date_ptr) return(t); } - +#if 0 /*************************************************************************** return a HTTP/1.0 time string ***************************************************************************/ @@ -500,7 +500,7 @@ char *http_timestring(time_t t) #endif /* !HAVE_STRFTIME */ return buf; } - +#endif /*0 */ /**************************************************************************** diff --git a/vfs/samba/lib/util.c b/vfs/samba/lib/util.c index 786332db3..03e67c713 100644 --- a/vfs/samba/lib/util.c +++ b/vfs/samba/lib/util.c @@ -59,8 +59,9 @@ extern int sslFd; #endif /* WITH_SSL */ extern int DEBUGLEVEL; - +#if 0 int Protocol = PROTOCOL_COREPLUS; +#endif /*0 */ /* a default finfo structure to ensure all fields are sensible */ file_info const def_finfo = {-1,0,0,0,0,0,0,""}; @@ -69,15 +70,17 @@ file_info const def_finfo = {-1,0,0,0,0,0,0,""}; extern int Client; /* this is used by the chaining code */ -int chain_size = 0; - +const int chain_size = 0; +#if 0 int trans_num = 0; +#endif /*0 */ /* case handling on filenames */ -int case_default = CASE_LOWER; +const int case_default = CASE_LOWER; +#if 0 /* the following control case operations - they are put here so the client can link easily */ BOOL case_sensitive; @@ -85,6 +88,7 @@ BOOL case_preserve; BOOL use_mangled_map = False; BOOL short_case_preserve; BOOL case_mangle; +#endif /*0 */ static const char *remote_machine = ""; static const char *local_machine = ""; @@ -97,13 +101,14 @@ pstring myhostname=""; pstring user_socket_options=""; pstring sesssetup_user=""; -pstring samlogon_user=""; +static char * const samlogon_user = ""; -BOOL sam_logon_in_ssb = False; +const BOOL sam_logon_in_ssb = False; pstring global_myname = ""; +#if 0 char **my_netbios_names; - +#endif /*0 */ /**************************************************************************** diff --git a/vfs/samba/lib/util_str.c b/vfs/samba/lib/util_str.c index 4a3ae017b..ec81de0ac 100644 --- a/vfs/samba/lib/util_str.c +++ b/vfs/samba/lib/util_str.c @@ -74,6 +74,7 @@ BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize) return(True); } +#if 0 /**************************************************************************** Convert list of tokens to array; dependent on above routine. Uses last_ptr from above - bit of a hack. @@ -110,7 +111,7 @@ char **toktocliplist(int *ctok, char *sep) return ret; } - +#endif /*0 */ /******************************************************************* case insensitive string compararison @@ -580,7 +581,7 @@ BOOL trim_string(char *s,const char *front,const char *back) return(ret); } - +#if 0 /**************************************************************************** does a string have any uppercase chars in it? ****************************************************************************/ @@ -628,6 +629,7 @@ BOOL strhasupper(const char *s) return(False); } + /**************************************************************************** does a string have any lowercase chars in it? ****************************************************************************/ @@ -682,6 +684,7 @@ BOOL strhaslower(const char *s) } return(False); } +#endif /*0 */ /**************************************************************************** find the number of chars in a string @@ -832,7 +835,7 @@ char *StrnCpy(char *dest,const char *src,size_t n) return(dest); } - +#if 0 /**************************************************************************** like strncpy but copies up to the character marker. always null terminates. returns a pointer to the character marker in the source string (src). @@ -1032,7 +1035,7 @@ void string_sub(char *s,const char *pattern,const char *insert) } } - +#if 0 /**************************************************************************** similar to string_sub() but allows for any character to be substituted. Use with caution! @@ -1058,6 +1061,7 @@ void all_string_sub(char *s,const char *pattern,const char *insert) } } + /**************************************************************************** splits out the front and back at a separator. ****************************************************************************/ @@ -1089,3 +1093,4 @@ void split_at_last_component(char *path, char *front, char sep, char *back) } } } +#endif /*0 */ diff --git a/vfs/samba/libsmb/clientgen.c b/vfs/samba/libsmb/clientgen.c index 237e6d003..06ce3ed73 100644 --- a/vfs/samba/libsmb/clientgen.c +++ b/vfs/samba/libsmb/clientgen.c @@ -422,6 +422,7 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans, return(True); } +#if 0 /**************************************************************************** Call a remote api on an arbitrary pipe. takes param, data and setup buffers. ****************************************************************************/ @@ -446,6 +447,7 @@ BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, rparam, (int *)rparam_count, rdata, (int *)rdata_count)); } +#endif /*0 */ /**************************************************************************** call a remote api @@ -469,7 +471,7 @@ BOOL cli_api(struct cli_state *cli, rdata, rdrcnt)); } - +#if 0 /**************************************************************************** perform a NetWkstaUserLogon ****************************************************************************/ @@ -531,6 +533,7 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation) free(rdata); return (cli->rap_error == 0); } +#endif /*0 */ /**************************************************************************** call a NetShareEnum - try and browse available connections on a host @@ -822,7 +825,7 @@ BOOL cli_session_setup(struct cli_state *cli, /**************************************************************************** Send a uloggoff. *****************************************************************************/ - +#if 0 BOOL cli_ulogoff(struct cli_state *cli) { memset(cli->outbuf,'\0',smb_size); @@ -838,6 +841,7 @@ BOOL cli_ulogoff(struct cli_state *cli) return CVAL(cli->inbuf,smb_rcls) == 0; } +#endif /*0 */ /**************************************************************************** send a tconX @@ -916,7 +920,7 @@ BOOL cli_send_tconX(struct cli_state *cli, return True; } - +#if 0 /**************************************************************************** send a tree disconnect ****************************************************************************/ @@ -934,6 +938,7 @@ BOOL cli_tdis(struct cli_state *cli) return CVAL(cli->inbuf,smb_rcls) == 0; } +#endif /*0 */ /**************************************************************************** rename a file @@ -1070,8 +1075,7 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname) return True; } - - +#if 0 /**************************************************************************** open a file ****************************************************************************/ @@ -1114,7 +1118,7 @@ int cli_nt_create(struct cli_state *cli, char *fname) return SVAL(cli->inbuf,smb_vwv2 + 1); } - +#endif /*0 */ /**************************************************************************** open a file @@ -1218,7 +1222,7 @@ BOOL cli_close(struct cli_state *cli, int fnum) return True; } - +#if 0 /**************************************************************************** lock a file ****************************************************************************/ @@ -1304,7 +1308,7 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int return True; } - +#endif /*0 */ /**************************************************************************** @@ -1494,7 +1498,7 @@ ssize_t cli_write(struct cli_state *cli, return bwritten; } - +#if 0 /**************************************************************************** write to a file using a SMBwrite and not bypassing 0 byte writes ****************************************************************************/ @@ -1533,7 +1537,7 @@ ssize_t cli_smbwrite(struct cli_state *cli, return SVAL(cli->inbuf,smb_vwv0); } - +#endif /*0 */ /**************************************************************************** do a SMBgetattrE call @@ -2725,7 +2729,7 @@ BOOL cli_chkpath(struct cli_state *cli, char *path) return True; } - +#if 0 /**************************************************************************** start a message sequence ****************************************************************************/ @@ -2819,6 +2823,7 @@ BOOL cli_message_end(struct cli_state *cli, int grp) return True; } +#endif /*0 */ #if 0 /* May be useful one day */ /**************************************************************************** diff --git a/vfs/samba/libsmb/namequery.c b/vfs/samba/libsmb/namequery.c index 6a291d8e0..ab86ca1e3 100644 --- a/vfs/samba/libsmb/namequery.c +++ b/vfs/samba/libsmb/namequery.c @@ -26,7 +26,7 @@ extern pstring scope; extern int DEBUGLEVEL; /* nmbd.c sets this to True. */ -BOOL global_in_nmbd = False; +const BOOL global_in_nmbd = False; #if 0 /**************************************************************************** interpret a node status response @@ -539,7 +539,7 @@ BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type) } - +#if 0 /******************************************************** find the IP address of the master browser or DMB for a workgroup *********************************************************/ @@ -549,3 +549,4 @@ BOOL find_master_ip(char *group, struct in_addr *master_ip) return resolve_name(group, master_ip, 0x1B); } +#endif /* 0 */ diff --git a/vfs/samba/libsmb/nmblib.c b/vfs/samba/libsmb/nmblib.c index 2686eaa5e..60b5ac68e 100644 --- a/vfs/samba/libsmb/nmblib.c +++ b/vfs/samba/libsmb/nmblib.c @@ -919,7 +919,7 @@ struct packet_struct *receive_packet(int fd,enum packet_type type,int t) return(NULL); } - +#if 0 /**************************************************************************** return the number of bits that match between two 4 character buffers ***************************************************************************/ @@ -941,7 +941,6 @@ static int matching_bits(uchar *p1, uchar *p2) return ret; } - static uchar sort_ip[4]; /**************************************************************************** @@ -964,3 +963,4 @@ void sort_query_replies(char *data, int n, struct in_addr ip) qsort(data, n, 6, QSORT_CAST name_query_comp); } +#endif /*0 */