sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

Ensure we don't truncate strcmps to nstring anymore...

Browse Source 
Jeremy.
(This used to be commit d7cf64b1e4e501bcd01ddc8279babc65d894a4b3)
This commit is contained in:
Jeremy Allison 2004-03-13 02:47:21 +00:00
parent 6b9dbbcd24
commit a0034d3586
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/charcnv.c
View File

@ -833,6 +833,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
size_t i, buffer_len, dest_len; size_t i, buffer_len, dest_len;
smb_ucs2_t *buffer; smb_ucs2_t *buffer;
conv_silent = True;
buffer_len = push_ucs2_allocate(&buffer, src); buffer_len = push_ucs2_allocate(&buffer, src);
if (buffer_len == (size_t)-1) { if (buffer_len == (size_t)-1) {
smb_panic("failed to create UCS2 buffer"); smb_panic("failed to create UCS2 buffer");
@ -854,6 +855,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
((char *)dest)[dest_len] = '\0'; ((char *)dest)[dest_len] = '\0';
SAFE_FREE(buffer); SAFE_FREE(buffer);
conv_silent = False;
return dest_len; return dest_len;
} }

5
source3/libsmb/nmblib.c
View File

@ -855,8 +855,11 @@ static int build_dgram(char *buf,struct packet_struct *p)
void make_nmb_name( struct nmb_name *n, const char *name, int type) void make_nmb_name( struct nmb_name *n, const char *name, int type)
{ {
fstring unix_name;
memset( (char *)n, '\0', sizeof(struct nmb_name) ); memset( (char *)n, '\0', sizeof(struct nmb_name) );
push_ascii(n->name, name, sizeof(n->name), STR_TERMINATE|STR_UPPER); fstrcpy(unix_name, name);
strupper_m(unix_name);
push_ascii(n->name, unix_name, sizeof(n->name), STR_TERMINATE);
n->name_type = (unsigned int)type & 0xFF; n->name_type = (unsigned int)type & 0xFF;
push_ascii(n->scope, global_scope(), 64, STR_TERMINATE); push_ascii(n->scope, global_scope(), 64, STR_TERMINATE);
} }

4
source3/nmbd/nmbd_browsesync.c
View File

@ -639,14 +639,14 @@ void sync_all_dmbs(time_t t)
/* count how many syncs we might need to do */ /* count how many syncs we might need to do */
for (work=unicast_subnet->workgrouplist; work; work = work->next) { for (work=unicast_subnet->workgrouplist; work; work = work->next) {
if (strncmp(lp_workgroup(), work->work_group, sizeof(nstring))) { if (strcmp(lp_workgroup(), work->work_group)) {
count++; count++;
} }
} }
/* sync with a probability of 1/count */ /* sync with a probability of 1/count */
for (work=unicast_subnet->workgrouplist; work; work = work->next) { for (work=unicast_subnet->workgrouplist; work; work = work->next) {
if (strncmp(lp_workgroup(), work->work_group, sizeof(nstring))) { if (strcmp(lp_workgroup(), work->work_group)) {
fstring dmb_name; fstring dmb_name;
if (((unsigned)sys_random()) % count != 0) if (((unsigned)sys_random()) % count != 0)

8
source3/nmbd/nmbd_elections.c
View File

@ -97,7 +97,7 @@ static void check_for_master_browser_fail( struct subnet_record *subrec,
return; return;
} }
if (strnequal(work->work_group, lp_workgroup(), sizeof(nstring)-1)) { if (strequal(work->work_group, lp_workgroup())) {
if (lp_local_master()) { if (lp_local_master()) {
/* We have discovered that there is no local master /* We have discovered that there is no local master
@ -145,7 +145,7 @@ void check_master_browser_exists(time_t t)
struct work_record *work; struct work_record *work;
for (work = subrec->workgrouplist; work; work = work->next) { for (work = subrec->workgrouplist; work; work = work->next) {
if (strnequal(work->work_group, workgroup_name, sizeof(nstring)-1) && !AM_LOCAL_MASTER_BROWSER(work)) { if (strequal(work->work_group, workgroup_name) && !AM_LOCAL_MASTER_BROWSER(work)) {
/* Do a name query for the local master browser on this net. */ /* Do a name query for the local master browser on this net. */
query_name( subrec, work->work_group, 0x1d, query_name( subrec, work->work_group, 0x1d,
check_for_master_browser_success, check_for_master_browser_success,
@ -284,7 +284,7 @@ void process_election(struct subnet_record *subrec, struct packet_struct *p, cha
goto done; goto done;
} }
if (!strnequal(work->work_group, lp_workgroup(), sizeof(nstring)-1)) { if (!strequal(work->work_group, lp_workgroup())) {
DEBUG(3,("process_election: ignoring election request for workgroup %s on subnet %s as this \ DEBUG(3,("process_election: ignoring election request for workgroup %s on subnet %s as this \
is not my workgroup.\n", work->work_group, subrec->subnet_name )); is not my workgroup.\n", work->work_group, subrec->subnet_name ));
goto done; goto done;
@ -381,7 +381,7 @@ void nmbd_message_election(int msg_type, pid_t src, void *buf, size_t len)
for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) { for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
struct work_record *work; struct work_record *work;
for (work = subrec->workgrouplist; work; work = work->next) { for (work = subrec->workgrouplist; work; work = work->next) {
if (strnequal(work->work_group, lp_workgroup(), sizeof(nstring)-1)) { if (strequal(work->work_group, lp_workgroup())) {
work->needelection = True; work->needelection = True;
work->ElectionCount=0; work->ElectionCount=0;
work->mst_state = lp_local_master() ? MST_POTENTIAL : MST_NONE; work->mst_state = lp_local_master() ? MST_POTENTIAL : MST_NONE;

2
source3/nmbd/nmbd_serverlistdb.c
View File

@ -251,7 +251,7 @@ static uint32 write_this_workgroup_name( struct subnet_record *subrec,
{ {
struct subnet_record *ssub; struct subnet_record *ssub;
if(strnequal(lp_workgroup(), work->work_group, sizeof(nstring)-1)) if(strequal(lp_workgroup(), work->work_group))
return 0; return 0;
/* This is a workgroup we have seen on a broadcast subnet. All /* This is a workgroup we have seen on a broadcast subnet. All

6
source3/nmbd/nmbd_workgroupdb.c
View File

@ -88,7 +88,7 @@ static struct work_record *create_workgroup(const char *name, int ttl)
for (subrec = FIRST_SUBNET; subrec && (t == -1); subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) { for (subrec = FIRST_SUBNET; subrec && (t == -1); subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
struct work_record *w; struct work_record *w;
for (w = subrec->workgrouplist; w && t == -1; w = w->next) { for (w = subrec->workgrouplist; w && t == -1; w = w->next) {
if (strnequal(w->work_group, work->work_group, sizeof(nstring)-1)) if (strequal(w->work_group, work->work_group))
t = w->token; t = w->token;
} }
} }
@ -162,7 +162,7 @@ struct work_record *find_workgroup_on_subnet(struct subnet_record *subrec,
name, subrec->subnet_name)); name, subrec->subnet_name));
for (ret = subrec->workgrouplist; ret; ret = ret->next) { for (ret = subrec->workgrouplist; ret; ret = ret->next) {
if (strnequal(ret->work_group,name,sizeof(nstring)-1)) { if (strequal(ret->work_group,name)) {
DEBUGADD(4, ("found.\n")); DEBUGADD(4, ("found.\n"));
return(ret); return(ret);
} }
@ -223,7 +223,7 @@ void initiate_myworkgroup_startup(struct subnet_record *subrec, struct work_reco
{ {
int i; int i;
if(!strnequal(lp_workgroup(), work->work_group,sizeof(nstring)-1)) if(!strequal(lp_workgroup(), work->work_group))
return; return;
/* If this is a broadcast subnet then start elections on it if we are so configured. */ /* If this is a broadcast subnet then start elections on it if we are so configured. */