svn commit: samba r13873 - in branches/SAMBA_3_0/source/nmbd: .

[jra at samba.org]

Author: jra
Date: 2006-03-06 17:01:51 +0000 (Mon, 06 Mar 2006)
New Revision: 13873

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13873

Log:
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.

Modified:
   branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c


Changeset:
Modified: branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c
===================================================================
--- branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c	2006-03-06 16:58:07 UTC (rev 13872)
+++ branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c	2006-03-06 17:01:51 UTC (rev 13873)
@@ -1246,26 +1246,25 @@
 
 	if ( namerec != NULL ) {
 		pull_ascii_nstring(name, sizeof(name), namerec->name.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;
+			}
+		}
 	} 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 \
-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;
-		}
-	}
 
 	/*
 	 * If the name exists and it is a unique registration and the registering IP