From 05b4e700145395f1d432ef5e338f8f93a5642ec2 Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@redhat.com>
Date: Wed, 27 Apr 2022 00:22:02 +0200
Subject: [PATCH] cutil: enable PtrGuard by default

Signed-off-by: Sven Anderson <sven@redhat.com>
---
 .devcontainer/devcontainer.json      | 4 ++--
 .github/workflows/main.yml           | 4 ++--
 Makefile                             | 6 +++---
 entrypoint.sh                        | 4 ++--
 internal/cutil/sync_buffer.go        | 4 ++--
 internal/cutil/sync_buffer_memcpy.go | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index be928aa..4a40209 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,8 +22,8 @@
             "GODEBUG": "cgocheck=2",
             "CEPH_CONF": "/ceph_a/ceph.conf",
         },
-        "go.buildTags": "ptrguard",
-        "go.testTags": "ptrguard",
+        "go.buildTags": "",
+        "go.testTags": "",
         "go.testFlags": [
             "-v",
             "-count=1"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 706c998..afe5cd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,8 +42,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run tests
       run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
-    - name: Run tests with ptrguard
-      run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "USE_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
+    - name: Run tests without ptrguard
+      run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "NO_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
     - name: Clean up test containers
       run: make test-containers-clean "CEPH_VERSION=${{ matrix.ceph_version }}"
     - name: Archive coverage results
diff --git a/Makefile b/Makefile
index 5688100..15800d9 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,9 @@ TEST_CTR_NET=.run.test_ceph_net
 # the name of the image plus ceph version as tag
 CI_IMAGE_TAG=$(CI_IMAGE_NAME):$(CEPH_VERSION)
 
-ifneq ($(USE_PTRGUARD),)
-	CONTAINER_OPTS += -e USE_PTRGUARD=true
-	BUILD_TAGS := $(BUILD_TAGS),ptrguard
+ifneq ($(NO_PTRGUARD),)
+	CONTAINER_OPTS += -e NO_PTRGUARD=true
+	BUILD_TAGS := $(BUILD_TAGS),no_ptrguard
 endif
 
 ifneq ($(NO_PREVIEW),)
diff --git a/entrypoint.sh b/entrypoint.sh
index 6661344..d94940b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -308,8 +308,8 @@ if [ -n "${CEPH_VERSION}" ]; then
     add_build_tag "${CEPH_VERSION}"
 fi
 
-if [ -n "${USE_PTRGUARD}" ]; then
-    add_build_tag "ptrguard"
+if [ -n "${NO_PTRGUARD}" ]; then
+    add_build_tag "no_ptrguard"
 fi
 
 if [ -z "${NO_PREVIEW}" ]; then
diff --git a/internal/cutil/sync_buffer.go b/internal/cutil/sync_buffer.go
index b7cbf9b..d74cd2b 100644
--- a/internal/cutil/sync_buffer.go
+++ b/internal/cutil/sync_buffer.go
@@ -1,5 +1,5 @@
-//go:build ptrguard
-// +build ptrguard
+//go:build !no_ptrguard
+// +build !no_ptrguard
 
 package cutil
 
diff --git a/internal/cutil/sync_buffer_memcpy.go b/internal/cutil/sync_buffer_memcpy.go
index 96fb32d..cde47c9 100644
--- a/internal/cutil/sync_buffer_memcpy.go
+++ b/internal/cutil/sync_buffer_memcpy.go
@@ -1,5 +1,5 @@
-//go:build !ptrguard
-// +build !ptrguard
+//go:build no_ptrguard
+// +build no_ptrguard
 
 package cutil