Fixes a problem with update_filesys, and a problem with

set_server_host_internal.

diff --git a/server/qsupport.dc b/server/qsupport.dc
index afd395637a678017ef06c43d1831a918569d918b..95971f6c2de619a7584481f6350b835ebee21c0a 100644 (file)
--- a/server/qsupport.dc
+++ b/server/qsupport.dc
@@ -833,6 +833,7 @@ setup_ufil(q, argv, cl)
     int fid, total, who;
     char *entity, ftype[32], *access;
     int var_phys_id = 0;
+    short int total_null;
     EXEC SQL END DECLARE SECTION;
 
     type = argv[2];
@@ -864,10 +865,10 @@ setup_ufil(q, argv, cl)
        total = 0;
        EXEC SQL REPEATED DELETE FROM quota
          WHERE type = 'ANY' AND filsys_id = :fid;
-       EXEC SQL SELECT SUM (quota) INTO :total FROM quota
+       EXEC SQL SELECT SUM (quota) INTO :total:total_null FROM quota
          WHERE filsys_id = :fid AND phys_id != 0;
        if (ingres_errno) return(mr_errcode);
-       if (total != 0) {
+       if (!total_null && (total != 0)) {
 /*
  *             append quota (quota = total, filsys_id = fid,
  *                          phys_id = 0, entity_id = 0, type = "ANY",
@@ -1049,6 +1050,7 @@ setup_sshi(q, argv, cl)
     EXEC SQL set lockmode session where readlock = system;
 #endsql
 #endif
+    return(MR_SUCCESS);
 }