[1824] in Moira Commits
/svn/moira r3971 - trunk/moira/server
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Mon Feb 1 12:19:26 2010
Date: Mon, 1 Feb 2010 12:19:19 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201002011719.o11HJJH1021170@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-02-01 12:19:19 -0500 (Mon, 01 Feb 2010)
New Revision: 3971
Modified:
trunk/moira/server/qsetup.pc
Log:
We've already turned the IP into a string, don't do it again wrong.
hostinfo_check() needs to actually return a value in all cases.
Modified: trunk/moira/server/qsetup.pc
===================================================================
--- trunk/moira/server/qsetup.pc 2010-01-31 05:52:04 UTC (rev 3970)
+++ trunk/moira/server/qsetup.pc 2010-02-01 17:19:19 UTC (rev 3971)
@@ -1225,11 +1225,7 @@
else
value = htonl(id);
}
- /*
- * we have an address in value. Convert it to a string and store it.
- */
- addr.s_addr = htonl(value);
- strcpy(argv[9 + row + idx], inet_ntoa(addr));
+ strcpy(argv[9 + row + idx], name);
}
else
strcpy(argv[9 + row + idx], "unassigned");
@@ -1577,6 +1573,8 @@
}
if (!isalnum(*(p - 1)))
return 1;
+
+ return 1;
}
int setup_aali(struct query *q, char *argv[], client *cl)
