Change SNET_STATUS_PRIVATE to SNET_STATUS_PRIVATE_10MBPS and

SNET_STATUS_PRIVATE_100MBPS.

diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c
index f3275bb005a1e1819e908ee315e092969ec6e875..dbd75b54226c56e12d07494475ee48a8abd88422 100644 (file)
--- a/clients/moira/cluster.c
+++ b/clients/moira/cluster.c
@@ -295,7 +295,8 @@ static char *PrintMachInfo(char **info)
   stat = do_mr_query("get_subnet", 1, args, StoreInfo, &elem2);
   if (stat)
     com_err(program_name, stat, " looking up subnet info");
-  else if (atoi(((char **)elem2->q_data)[2]) == SNET_STATUS_PRIVATE)
+  else if (atoi(((char **)elem2->q_data)[2]) == SNET_STATUS_PRIVATE_10MBPS ||
+          atoi(((char **)elem2->q_data)[2]) == SNET_STATUS_PRIVATE_100MBPS)
     {
       Put_message("");
       sprintf(buf, "Warning:  This host is on a private subnet.");

diff --git a/clients/stella/stella.c b/clients/stella/stella.c
index dbf43471abe492e6b69b464884bfbae274286c6a..f7aa0ae0987df11582fbb2c6700383881d0f918f 100644 (file)
--- a/clients/stella/stella.c
+++ b/clients/stella/stella.c
@@ -694,7 +694,8 @@ int main(int argc, char **argv)
     status = wrap_mr_query("get_subnet", 1, args, store_host_info, argv);
     if (status)
       com_err(whoami, status, "while getting subnet information");
-    if (atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE)
+    if (atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE_10MBPS ||
+       atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE_100MBPS)
       {
        fprintf(stderr, "\nWarning:  This host is on a private subnet.\n");
        fprintf(stderr, "Billing information shown is superceded by billing information for the subnet.\n");

diff --git a/server/qsetup.pc b/server/qsetup.pc
index 5ef3d54c83e5577a369608b8205900a2cbaca098..573d7c61104639adeea00c4618b73cd2aa450c7f 100644 (file)
--- a/server/qsetup.pc
+++ b/server/qsetup.pc
@@ -253,7 +253,8 @@ int setup_asnt(struct query *q, char *argv[], client *cl)
   /* Don't allow Private subnets to be created without a valid billing
    * number.
    */
-  if (status == SNET_STATUS_PRIVATE)
+  if (status == SNET_STATUS_PRIVATE_10MBPS || 
+      status == SNET_STATUS_PRIVATE_100MBPS)
     {
       EXEC SQL SELECT account_number FROM accountnumbers
        WHERE account_number = :account_number;