From 50179711596fe0fa4faa217fbdc111320804e5c0 Mon Sep 17 00:00:00 2001
From: Bryan Berns <berns@uwalumni.com>
Date: Sat, 28 Jan 2017 15:21:10 -0500
Subject: [PATCH] Renamed /SaveSecurity To /BackupSecurity

---
 ...tionSaveSecurity.cpp => OperationBackupSecurity.cpp | 10 +++++-----
 OperationSaveSecurity.h => OperationBackupSecurity.h   |  8 ++++----
 OperationHelp.cpp                                      |  4 ++--
 repacls.vcxproj                                        |  4 ++--
 repacls.vcxproj.filters                                |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename OperationSaveSecurity.cpp => OperationBackupSecurity.cpp (80%)
 rename OperationSaveSecurity.h => OperationBackupSecurity.h (59%)

diff --git a/OperationSaveSecurity.cpp b/OperationBackupSecurity.cpp
similarity index 80%
rename from OperationSaveSecurity.cpp
rename to OperationBackupSecurity.cpp
index c26711d..d2d5304 100644
--- a/OperationSaveSecurity.cpp
+++ b/OperationBackupSecurity.cpp
@@ -1,11 +1,11 @@
-#include "OperationSaveSecurity.h"
+#include "OperationBackupSecurity.h"
 #include "InputOutput.h"
 #include "Functions.h"
 
-ClassFactory<OperationSaveSecurity> * OperationSaveSecurity::RegisteredFactory =
-new ClassFactory<OperationSaveSecurity>(GetCommand());
+ClassFactory<OperationBackupSecurity> * OperationBackupSecurity::RegisteredFactory =
+new ClassFactory<OperationBackupSecurity>(GetCommand());
 
-OperationSaveSecurity::OperationSaveSecurity(std::queue<std::wstring> & oArgList) : Operation(oArgList)
+OperationBackupSecurity::OperationBackupSecurity(std::queue<std::wstring> & oArgList) : Operation(oArgList)
 {
 	// exit if there are not enough arguments to part
 	std::vector<std::wstring> sSubArgs = ProcessAndCheckArgs(1, oArgList, L"\\0");
@@ -39,7 +39,7 @@ OperationSaveSecurity::OperationSaveSecurity(std::queue<std::wstring> & oArgList
 	AppliesToGroup = true;
 }
 
-bool OperationSaveSecurity::ProcessSdAction(std::wstring & sFileName, ObjectEntry & tObjectEntry, PSECURITY_DESCRIPTOR & tDescriptor, bool & bDescReplacement)
+bool OperationBackupSecurity::ProcessSdAction(std::wstring & sFileName, ObjectEntry & tObjectEntry, PSECURITY_DESCRIPTOR & tDescriptor, bool & bDescReplacement)
 {
 	// convert the current security descriptor to a string
 	WCHAR * sInfo = NULL;
diff --git a/OperationSaveSecurity.h b/OperationBackupSecurity.h
similarity index 59%
rename from OperationSaveSecurity.h
rename to OperationBackupSecurity.h
index 83c1c31..8653dfb 100644
--- a/OperationSaveSecurity.h
+++ b/OperationBackupSecurity.h
@@ -2,13 +2,13 @@
 
 #include "Operation.h"
 
-class OperationSaveSecurity : public Operation
+class OperationBackupSecurity : public Operation
 {
 private:
 
 	// statics used by command registration utility
-	static std::wstring GetCommand() { return L"SaveSecurity"; }
-	static ClassFactory<OperationSaveSecurity> * RegisteredFactory;
+	static std::wstring GetCommand() { return L"BackupSecurity"; }
+	static ClassFactory<OperationBackupSecurity> * RegisteredFactory;
 
 	HANDLE hFile = INVALID_HANDLE_VALUE;
 	std::wstring sFile = L"";
@@ -19,6 +19,6 @@ class OperationSaveSecurity : public Operation
 	bool ProcessSdAction(std::wstring & sFileName, ObjectEntry & tObjectEntry, PSECURITY_DESCRIPTOR & tDescriptor, bool & bDescReplacement) override;
 
 	// constructors
-	OperationSaveSecurity(std::queue<std::wstring> & oArgList);
+	OperationBackupSecurity(std::queue<std::wstring> & oArgList);
 };
 
diff --git a/OperationHelp.cpp b/OperationHelp.cpp
index ae47796..e5fd5e7 100644
--- a/OperationHelp.cpp
+++ b/OperationHelp.cpp
@@ -108,7 +108,7 @@ Commands That Do Not Alter Security
    it is recommended to inspect the ACL with icacls.exe or Windows Explorer
    to ensure the ACL is not corrupted in a more significant way.
 
-/SaveSecurity <FileName>
+/BackupSecurity <FileName>
    Export the security descriptor to the file specified.  The file is 
    outputted in the format of file|descriptor on each line.  The security 
    descriptor is formatted as specified in the documentation for
@@ -116,7 +116,7 @@ Commands That Do Not Alter Security
    not print informational messages other than errors.
 
 /RestoreSecurity <FileName>
-   The reverse operation of /SaveSecurity.  Takes the file name and security
+   The reverse operation of /BackupSecurity.  Takes the file name and security
    descriptors specified in the file specified and applies them to the file
    system.  This command does not print informational messages other than 
    errors.
diff --git a/repacls.vcxproj b/repacls.vcxproj
index 267e87d..41f18dd 100644
--- a/repacls.vcxproj
+++ b/repacls.vcxproj
@@ -188,7 +188,7 @@
     <ClCompile Include="OperationCompact.cpp" />
     <ClCompile Include="OperationCopyDomain.cpp" />
     <ClCompile Include="OperationDomainPaths.cpp" />
-    <ClCompile Include="OperationSaveSecurity.cpp" />
+    <ClCompile Include="OperationBackupSecurity.cpp" />
     <ClCompile Include="OperationFindAccount.cpp" />
     <ClCompile Include="OperationFindDomain.cpp" />
     <ClCompile Include="OperationFindNullAcl.cpp" />
@@ -224,7 +224,7 @@
     <ClInclude Include="OperationAddAccountIfMissing.h" />
     <ClInclude Include="OperationCheckCanonical.h" />
     <ClInclude Include="OperationCompact.h" />
-    <ClInclude Include="OperationSaveSecurity.h" />
+    <ClInclude Include="OperationBackupSecurity.h" />
     <ClInclude Include="OperationFactory.h" />
     <ClInclude Include="OperationFindAccount.h" />
     <ClInclude Include="Operation.h" />
diff --git a/repacls.vcxproj.filters b/repacls.vcxproj.filters
index e6796e8..ab286bd 100644
--- a/repacls.vcxproj.filters
+++ b/repacls.vcxproj.filters
@@ -88,10 +88,10 @@
     <ClCompile Include="OperationMoveDomain.cpp">
       <Filter>Source\Operations</Filter>
     </ClCompile>
-    <ClCompile Include="OperationSaveSecurity.cpp">
+    <ClCompile Include="OperationRestoreSecurity.cpp">
       <Filter>Source\Operations</Filter>
     </ClCompile>
-    <ClCompile Include="OperationRestoreSecurity.cpp">
+    <ClCompile Include="OperationBackupSecurity.cpp">
       <Filter>Source\Operations</Filter>
     </ClCompile>
   </ItemGroup>
@@ -198,10 +198,10 @@
     <ClInclude Include="OperationMoveDomain.h">
       <Filter>Includes\Operations</Filter>
     </ClInclude>
-    <ClInclude Include="OperationSaveSecurity.h">
+    <ClInclude Include="OperationRestoreSecurity.h">
       <Filter>Includes\Operations</Filter>
     </ClInclude>
-    <ClInclude Include="OperationRestoreSecurity.h">
+    <ClInclude Include="OperationBackupSecurity.h">
       <Filter>Includes\Operations</Filter>
     </ClInclude>
   </ItemGroup>