summaryrefslogtreecommitdiffstats
path: root/source/nmbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-03-06 17:01:51 +0000
committerJeremy Allison <jra@samba.org>2006-03-06 17:01:51 +0000
commitb14d58c4cf384de7781c8de63f906b1f8d6bece5 (patch)
tree273222ea85db02a441509819801273a96261160e /source/nmbd
parent4437f045dea44f8409af9d4de89cc9e8be9d90de (diff)
downloadsamba-b14d58c4cf384de7781c8de63f906b1f8d6bece5.tar.gz
samba-b14d58c4cf384de7781c8de63f906b1f8d6bece5.tar.xz
samba-b14d58c4cf384de7781c8de63f906b1f8d6bece5.zip
r13873: I think this is the longstanding wins server crash bug, not
part of the changes I made but something that's been there a while.... Coverity bugid #41. Jeremy.
Diffstat (limited to 'source/nmbd')
-rw-r--r--source/nmbd/nmbd_winsserver.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c
index ddc9edfb060..f6f9d743b59 100644
--- a/source/nmbd/nmbd_winsserver.c
+++ b/source/nmbd/nmbd_winsserver.c
@@ -1246,25 +1246,24 @@ already exists in WINS as a GROUP name.\n", nmb_namestr(question) ));
if ( namerec != NULL ) {
pull_ascii_nstring(name, sizeof(name), namerec->name.name);
- } else {
- name[0] = '\0';
- }
-
- if( is_myname(name) ) {
- if(!ismyip(from_ip)) {
- DEBUG(3,("wins_process_name_registration_request: Attempt to register name %s. Name \
+ if( is_myname(name) ) {
+ if(!ismyip(from_ip)) {
+ DEBUG(3,("wins_process_name_registration_request: Attempt to register name %s. Name \
is one of our (WINS server) names. Denying registration.\n", nmb_namestr(question) ));
- send_wins_name_registration_response(RFS_ERR, 0, p);
- return;
- } else {
- /*
- * It's one of our names and one of our IP's - update the ttl.
- */
- update_name_ttl(namerec, ttl);
- wins_hook("refresh", namerec, ttl);
- send_wins_name_registration_response(0, ttl, p);
- return;
+ send_wins_name_registration_response(RFS_ERR, 0, p);
+ return;
+ } else {
+ /*
+ * It's one of our names and one of our IP's - update the ttl.
+ */
+ update_name_ttl(namerec, ttl);
+ wins_hook("refresh", namerec, ttl);
+ send_wins_name_registration_response(0, ttl, p);
+ return;
+ }
}
+ } else {
+ name[0] = '\0';
}
/*