Merge pull request #12940 from shamser/issue22754

HPCC-22754 Move 'restricted' flag to under Attr

Reviewed-by: Jake Smith
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

dali/base/dadfs.cpp

@@ -3003,14 +3003,14 @@ public:
                 IERRLOG("setProtect - cannot protect %s (no connection in file)",owner?owner:"");
         }
     }
-    virtual bool isRestrictedAccess() const override
+    virtual bool isRestrictedAccess() override
     {
-        return root->getPropBool("@restricted", false);
+        return queryAttributes().getPropBool("restricted");
     }
     virtual void setRestrictedAccess(bool restricted) override
     {
         DistributedFilePropertyLock lock(this);
-        root->setPropBool("@restricted", restricted);
+        queryAttributes().setPropBool("restricted", restricted);
     }
     virtual IDistributedSuperFileIterator *getOwningSuperFiles(IDistributedFileTransaction *_transaction)
     {

dali/base/dadfs.hpp

@@ -396,7 +396,7 @@ interface IDistributedFile: extends IInterface
                                                                                             // sets or clears deletion protection
                                                                                             // returns true if locked (by anyone) after action
                                                                                             // if callerid NULL and protect=false, clears all
-    virtual bool isRestrictedAccess() const = 0;
+    virtual bool isRestrictedAccess() = 0;
     virtual void setRestrictedAccess(bool restricted) = 0;
     virtual unsigned setDefaultTimeout(unsigned timems) = 0;                                // sets default timeout for SDS connections and locking
                                                                                             // returns previous value