sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

docs/Support.txt: Removed consultant.

Browse Source 
source/Makefile: Added Volker's comment.
source/nmbd_become_lmb.c:
source/nmbd_browsesync.c:
source/nmbd_incomingdgrams.c: Fixed userdata alignment problems.
source/mem_man/mem_man.c:
source/mem_man/mem_man.h: added smb_ prefix to stop namespace collisions.
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 2e9f4b5daa
commit 4c8af3bc9f
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/textdocs/Support.txt
View File

@ -37,7 +37,7 @@ Region Number of entries
AMERICA - USA 36
ASIA 1
AUSTRALIA & NEW ZEALAND 18
CANADA 9
CANADA 8
EUROPE 36
MIDDLE EAST 1
@ -1098,17 +1098,6 @@ Specializing in Turnkey Windows NT Network environments with emphasis on
Legacy UNIX System integration using Samba.
------------------------------------------------------------------------------
------------------------------------------------------------------------------
ONTARIO - CANADA
Bilyana Aleksic |Email: baleksic@atitech.ca |
| |
ATI Technologies Inc. |Phone: 905-882-2600 x3179 |
75 Tiverton Court |Fax : 905-475-3930 |
Unionville, Ontario | |
Canada, L3R 9S3 | |
------------------------------------------------------------------------------
------------------------------------------------------------------------------
ONTARIO - CANADA

24
source/include/proto.h
View File

@ -437,18 +437,18 @@ void mdfour(unsigned char *out, unsigned char *in, int n);
/*The following definitions come from mem_man/mem_man.c */
void *mem_malloc(size_t size,char *file,int line);
char *mem_strdup(char *s, char *file, int line);
int mem_free(void *ptr,char *file,int line);
void mem_write_info(void *ptr,FILE *outfile);
char *mem_query_file(void *ptr);
int mem_query_line(void *ptr);
int mem_test(void *ptr);
void mem_write_status(FILE *outfile);
void mem_write_verbose(FILE *outfile);
void mem_write_errors(FILE *outfile);
void mem_set_multiplier(int multiplier);
void *mem_resize(void *ptr,size_t newsize);
void *smb_mem_malloc(size_t size,char *file,int line);
char *smb_mem_strdup(char *s, char *file, int line);
int smb_mem_free(void *ptr,char *file,int line);
void smb_mem_write_info(void *ptr,FILE *outfile);
char *smb_mem_query_file(void *ptr);
int smb_mem_query_line(void *ptr);
int smb_mem_test(void *ptr);
void smb_mem_write_status(FILE *outfile);
void smb_mem_write_verbose(FILE *outfile);
void smb_mem_write_errors(FILE *outfile);
void smb_mem_set_multiplier(int multiplier);
void *smb_mem_resize(void *ptr,size_t newsize);
/*The following definitions come from message.c */

23
source/nmbd/nmbd_become_lmb.c
View File

@ -248,7 +248,6 @@ void unbecome_local_master_browser(struct subnet_record *subrec, struct work_rec
struct name_record *namerec;
struct nmb_name nmbname;
struct userdata_struct *userdata;
char ud[sizeof(struct userdata_struct) + sizeof(fstring)+1];
/* Sanity check. */
@ -268,9 +267,11 @@ in workgroup %s on subnet %s\n",
work->mst_state = MST_UNBECOMING_MASTER;
/* Setup the userdata for the MSBROWSE name release. */
/* Setup the userdata_struct - this is copied so we can use
a stack variable for this. */
userdata = (struct userdata_struct *)ud;
if((userdata = (struct userdata_struct *)malloc( sizeof(struct userdata_struct) + sizeof(fstring)+1)) == NULL)
{
DEBUG(0,("unbecome_local_master_browser: malloc fail.\n"));
return;
}
userdata->copy_fn = NULL;
userdata->free_fn = NULL;
@ -286,6 +287,8 @@ in workgroup %s on subnet %s\n",
release_msbrowse_name_fail,
userdata);
}
free((char *)userdata);
}
/****************************************************************************
@ -481,7 +484,6 @@ void become_local_master_browser(struct subnet_record *subrec, struct work_recor
{
struct server_record *servrec;
struct userdata_struct *userdata;
char ud[sizeof(struct userdata_struct) + sizeof(fstring)+1];
/* Sanity check. */
if (!lp_local_master())
@ -516,9 +518,12 @@ in workgroup %s on subnet %s\n",
/* Tell the namelist writer to write out a change. */
subrec->work_changed = True;
/* Setup the userdata_struct - this is copied so we can use
a stack variable for this. */
userdata = (struct userdata_struct *)ud;
/* Setup the userdata_struct. */
if((userdata = (struct userdata_struct *)malloc(sizeof(struct userdata_struct) + sizeof(fstring)+1)) == NULL)
{
DEBUG(0,("become_local_master_browser: malloc fail.\n"));
return;
}
userdata->copy_fn = NULL;
userdata->free_fn = NULL;
@ -530,6 +535,8 @@ in workgroup %s on subnet %s\n",
become_local_master_stage1,
become_local_master_fail1,
userdata);
free((char *)userdata);
}
/***************************************************************

9
source/nmbd/nmbd_browsesync.c
View File

@ -379,7 +379,6 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
struct work_record *work;
struct nmb_name nmbname;
struct userdata_struct *userdata;
char ud[sizeof(struct userdata_struct) + sizeof(fstring)+1];
if (!(work = find_workgroup_on_subnet(subrec, q_name->name))) {
DEBUG(0, ("find_domain_master_name_query_success: failed to find \
@ -412,7 +411,11 @@ workgroup %s\n", q_name->name ));
/* Setup the userdata_struct - this is copied so we can use
a stack variable for this. */
userdata = (struct userdata_struct *)ud;
if((userdata = (struct userdata_struct *)malloc(sizeof(struct userdata_struct) + sizeof(fstring)+1)) == NULL)
{
DEBUG(0, ("find_domain_master_name_query_success: malloc fail.\n"));
return;
}
userdata->copy_fn = NULL;
userdata->free_fn = NULL;
@ -423,6 +426,8 @@ workgroup %s\n", q_name->name ));
domain_master_node_status_success,
domain_master_node_status_fail,
userdata);
free((char *)userdata);
}
/****************************************************************************

4
source/nmbd/nmbd_incomingdgrams.c
View File

@ -547,7 +547,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
{
char outbuf[1024];
char *p, *countptr, *nameptr;
int count = 0;
unsigned int count = 0;
int len;
struct server_record *servrec;
@ -582,7 +582,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
if((sizeof(outbuf) - len) < 16)
break;
if(count >= max_number_requested)
if(count >= (unsigned int)max_number_requested)
break;
if(strnequal(servrec->serv.name, myname,15))