s3-privs Move source3/ privileges implmentation into common

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source3/lib/privileges_basic.c b/libcli/security/privileges.c
similarity index 99%
rename from source3/lib/privileges_basic.c
rename to libcli/security/privileges.c
index aa723a4199ee2162ffdbedab6d86f30819c23573..ca2b4fef8dc04a68294701ed90ab2a8534e56404 100644 (file)
--- a/source3/lib/privileges_basic.c
+++ b/libcli/security/privileges.c
@@ -455,4 +455,3 @@ bool privilege_set_to_se_priv( uint64_t *privilege_mask, struct lsa_PrivilegeSet
 
        return True;
 }
-

diff --git a/source3/include/privileges.h b/libcli/security/privileges.h
similarity index 99%
rename from source3/include/privileges.h
rename to libcli/security/privileges.h
index 0bc085c16620cb62b3e0b45655e51cd625119d88..6c2a6bf2193e705596121abeba0d0f6beae5b325 100644 (file)
--- a/source3/include/privileges.h
+++ b/libcli/security/privileges.h
@@ -1,5 +1,5 @@
 
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB parameters and setup
    Copyright (C) Andrew Tridgell 1992-1997
@@ -8,17 +8,17 @@
    Copyright (C) Simo Sorce 2003
    Copyright (C) Gerald (Jerry) Carter 2005
    Copyright (C) Andrew Bartlett 2010
-   
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 63345edea942b97e4266b514b4590ee19b1dcfb7..321eb3cf33d50909dd286efaf5ffca0eac0dc978 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -728,7 +728,7 @@ RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
 
 LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
 
-PRIVILEGES_BASIC_OBJ = lib/privileges_basic.o
+PRIVILEGES_BASIC_OBJ = ../libcli/security/privileges.o
 
 PRIVILEGES_OBJ = lib/privileges.o
 

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 478c633d6216c1e39bf114044fa6237a217cf14c..2e45b7964d8a2c189bfbec7936b4736c12d2c684 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -634,7 +634,7 @@ extern void *cmdline_lp_ctx;
 #include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
 #include "debugparse.h"
-#include "privileges.h"
+#include "../libcli/security/privileges.h"
 #include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"