Restore win32 dir from Branch-5.2 and update it

[bacula/bacula] / bacula / src / findlib / enable_priv.c

diff --git a/bacula/src/findlib/enable_priv.c b/bacula/src/findlib/enable_priv.c
old mode 100755 (executable)
new mode 100644 (file)
index 5a35d84..a324cf8
--- a/bacula/src/findlib/enable_priv.c
+++ b/bacula/src/findlib/enable_priv.c
@@ -1,29 +1,26 @@
 /*
- *  Enable backup privileges for Win32 systems.
- *
- *    Kern Sibbald, May MMIII
- *
- *   Version $Id$
- *
- */
-/*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Bacula(R) - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   Copyright (C) 2000-2015 Kern Sibbald
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
+/*
+ *  Enable backup privileges for Win32 systems.
+ *
+ *    Kern Sibbald, May MMIII
+ *
  */
 
 #include "bacula.h"
@@ -32,13 +29,13 @@
 
 
 /*=============================================================*/
-/*                                                            */
-/*                * * *  U n i x * * * *                      */
-/*                                                            */
+/*                                                             */
+/*                 * * *  U n i x * * * *                      */
+/*                                                             */
 /*=============================================================*/
 
-#if !defined(HAVE_CYGWIN) && !defined(HAVE_WIN32)
-    
+#if !defined(HAVE_WIN32)
+
 int enable_backup_privileges(JCR *jcr, int ignore_errors)
  { return 0; }
 
@@ -48,46 +45,45 @@ int enable_backup_privileges(JCR *jcr, int ignore_errors)
 
 
 /*=============================================================*/
-/*                                                            */
-/*                * * *  W i n 3 2 * * * *                    */
-/*                                                            */
+/*                                                             */
+/*                 * * *  W i n 3 2 * * * *                    */
+/*                                                             */
 /*=============================================================*/
 
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+#if defined(HAVE_WIN32)
 
-void win_error(JCR *jcr, char *prefix, DWORD lerror);
+void win_error(JCR *jcr, const char *prefix, DWORD lerror);
 
 static int
-enable_priv(JCR *jcr, HANDLE hToken, char *name, int ignore_errors)
+enable_priv(JCR *jcr, HANDLE hToken, const char *name, int ignore_errors)
 {
     TOKEN_PRIVILEGES tkp;
     DWORD lerror;
 
     if (!(p_LookupPrivilegeValue && p_AdjustTokenPrivileges)) {
-       return 0;                     /* not avail on this OS */
+       return 0;                      /* not avail on this OS */
     }
 
-    // Get the LUID for the security privilege. 
+    // Get the LUID for the security privilege.
     if (!p_LookupPrivilegeValue(NULL, name,  &tkp.Privileges[0].Luid)) {
-       if (!ignore_errors) {  
-          win_error(jcr, "LookupPrivilegeValue", GetLastError());
-       }
+       win_error(jcr, "LookupPrivilegeValue", GetLastError());
+       return 0;
     }
 
     /* Set the security privilege for this process. */
     tkp.PrivilegeCount = 1;
     tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-    p_AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, NULL, NULL);
+    p_AdjustTokenPrivileges(hToken, FALSE, &tkp, sizeof(TOKEN_PRIVILEGES), NULL, NULL);
     lerror = GetLastError();
     if (lerror != ERROR_SUCCESS) {
        if (!ignore_errors) {
-         char buf[200];
-          strcpy(buf, "AdjustTokenPrivileges set ");
-         bstrncat(buf, name, sizeof(buf));
-         win_error(jcr, buf, lerror);
+          char buf[200];
+          strcpy(buf, _("AdjustTokenPrivileges set "));
+          bstrncat(buf, name, sizeof(buf));
+          win_error(jcr, buf, lerror);
        }
        return 0;
-    } 
+    }
     return 1;
 }
 
@@ -102,30 +98,30 @@ int enable_backup_privileges(JCR *jcr, int ignore_errors)
     int stat = 0;
 
     if (!p_OpenProcessToken) {
-       return 0;                     /* No avail on this OS */
+       return 0;                      /* No avail on this OS */
     }
 
     hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId());
 
-    // Get a token for this process. 
+    // Get a token for this process.
     if (!p_OpenProcessToken(hProcess,
-           TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) {
-       if (!ignore_errors) {  
+            TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) {
+       if (!ignore_errors) {
           win_error(jcr, "OpenProcessToken", GetLastError());
        }
        /* Forge on anyway */
-    } 
+    }
 
     /* Return a bit map of permissions set. */
-    if (enable_priv(jcr, hToken, SE_SECURITY_NAME, ignore_errors)) {
-       stat |= 1<<0;
-    }
     if (enable_priv(jcr, hToken, SE_BACKUP_NAME, ignore_errors)) {
        stat |= 1<<1;
     }
     if (enable_priv(jcr, hToken, SE_RESTORE_NAME, ignore_errors)) {
        stat |= 1<<2;
     }
+    if (enable_priv(jcr, hToken, SE_SECURITY_NAME, ignore_errors)) {
+       stat |= 1<<0;
+    }
     if (enable_priv(jcr, hToken, SE_TAKE_OWNERSHIP_NAME, ignore_errors)) {
        stat |= 1<<3;
     }
@@ -144,6 +140,10 @@ int enable_backup_privileges(JCR *jcr, int ignore_errors)
     if (enable_priv(jcr, hToken, SE_TCB_NAME, ignore_errors)) {
        stat |= 1<<8;
     }
+    if (enable_priv(jcr, hToken, SE_CREATE_PERMANENT_NAME, ignore_errors)) {
+       stat |= 1<<10;
+    }
+
     if (stat) {
        stat |= 1<<9;
     }
@@ -153,4 +153,4 @@ int enable_backup_privileges(JCR *jcr, int ignore_errors)
     return stat;
 }
 
-#endif /* HAVE_CYGWIN */
+#endif  /* HAVE_WIN32 */