summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-11-28 02:42:55 +0000
committerJeremy Allison <jra@samba.org>2001-11-28 02:42:55 +0000
commita6b73b9767524fa6997bd31398d558a7cf1e4ac8 (patch)
treecd1d75eb93b5c11786580f8cced9a1538f7b91ad
parente158c4123d6d47cc43472365f5e6215a0851e001 (diff)
downloadsamba-a6b73b9767524fa6997bd31398d558a7cf1e4ac8.tar.gz
samba-a6b73b9767524fa6997bd31398d558a7cf1e4ac8.tar.bz2
samba-a6b73b9767524fa6997bd31398d558a7cf1e4ac8.zip
Cross merge to make 2.2 and HEAD closer.
Jeremy. (This used to be commit 39f076b56cf457cc780dd30a4d3150d8bfc60d13)
-rw-r--r--source3/libsmb/namequery.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index e9b1116d07..a181e3183f 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -336,8 +336,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type,
retries--;
- while (1)
- {
+ while (1) {
struct timeval tval2;
struct in_addr *tmp_ip_list;
@@ -365,8 +364,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type,
if( DEBUGLVL( 3 ) ) {
/* Only executed if DEBUGLEVEL >= 3 */
- dbgtext( "Negative name query response, rcode 0x%02x: ",
- nmb2->header.rcode );
+ dbgtext( "Negative name query response, rcode 0x%02x: ", nmb2->header.rcode );
switch( nmb2->header.rcode ) {
case 0x01:
dbgtext( "Request was invalidly formatted.\n" );
@@ -399,7 +397,8 @@ struct in_addr *name_query(int fd,const char *name,int name_type,
/*
* XXXX what do we do with this? Could be a
* redirect, but we'll discard it for the
- * moment. */
+ * moment.
+ */
free_packet(p2);
continue;
}
@@ -415,8 +414,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type,
ip_list = tmp_ip_list;
if (ip_list) {
- DEBUG(2,("Got a positive name query response from %s ( ",
- inet_ntoa(p2->ip)));
+ DEBUG(2,("Got a positive name query response from %s ( ", inet_ntoa(p2->ip)));
for (i=0;i<nmb2->answers->rdlength/6;i++) {
putip((char *)&ip_list[(*count)],&nmb2->answers->rdata[2+i*6]);
DEBUGADD(2,("%s ",inet_ntoa(ip_list[(*count)])));
@@ -439,8 +437,7 @@ struct in_addr *name_query(int fd,const char *name,int name_type,
}
/* Reach here if we've timed out waiting for replies.. */
- if( !bcast && !found )
- {
+ if( !bcast && !found ) {
/* Timed out wating for WINS server to respond. Mark it dead. */
wins_srv_died( to_ip );
}