X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/1beb5e231e63b447477fd33ae065d464d545545d..273439650b8a0abf7652ebf9fc1b454ee2c90135:/server/qaccess.dc

diff --git a/server/qaccess.dc b/server/qaccess.dc
index 5d13e27a..15632bf0 100644
--- a/server/qaccess.dc
+++ b/server/qaccess.dc
@@ -340,7 +340,7 @@ access_filesys(q, argv, cl)
 /* access_host - successful if owner of host, or subnet containing host
  */
 
-int host_access_level = 0;
+int host_access_level = 0;              /* 1 for network, 2 for host */
 
 access_host(q, argv, cl)
     struct query *q;
@@ -361,10 +361,7 @@ access_host(q, argv, cl)
 	  WHERE s.snet_id=:id;
 	mid =0;
     } else if (q->type == RETRIEVE) {
-	name = argv[0];
-	EXEC SQL SELECT m.owner_type, m.owner_id, s.owner_type, s.owner_id
-	  INTO :mtype, :mid, :stype, :sid FROM machine m, subnet s
-	  WHERE m.name=:name and s.snet_id=m.snet_id;
+	return(MR_SUCCESS);
     } else {
 	id = *(int *)argv[0];
 	EXEC SQL SELECT m.owner_type, m.owner_id, s.owner_type, s.owner_id
@@ -408,6 +405,9 @@ access_ahal(q, argv, cl)
     char *client_type;
     int status, client_id;
 
+    if (q->type == RETRIEVE)
+      return(MR_SUCCESS);
+
     id = *(int *)argv[1];
 
     EXEC SQL SELECT count(name) INTO :cnt from hostalias WHERE mach_id = :id;
@@ -418,7 +418,6 @@ access_ahal(q, argv, cl)
      */
     if (q->type == APPEND && cnt >= 2)
       return(MR_PERM);
-
     EXEC SQL SELECT m.owner_type, m.owner_id, s.owner_type, s.owner_id
       INTO :mtype, :mid, :stype, :sid FROM machine m, subnet s
       WHERE m.mach_id=:id and s.snet_id=m.snet_id;