diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-27 08:56:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:06 +1000 |
| commit | f20bba97d8146e830dbaeb761a05dcede1bdfee2 (patch) | |
| tree | 017f55d600159d63c79e3713e0447c215f6569f1 | |
| parent | cae7babb1fcfbb0655bc1f7f6be51212f3d13c69 (diff) | |
| download | samba-f20bba97d8146e830dbaeb761a05dcede1bdfee2.tar.gz samba-f20bba97d8146e830dbaeb761a05dcede1bdfee2.tar.bz2 samba-f20bba97d8146e830dbaeb761a05dcede1bdfee2.zip | |
s3-privs Move source3/ privileges implmentation into common
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
| -rw-r--r-- | libcli/security/privileges.c (renamed from source3/lib/privileges_basic.c) | 1 | ||||
| -rw-r--r-- | libcli/security/privileges.h (renamed from source3/include/privileges.h) | 8 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/source3/lib/privileges_basic.c b/libcli/security/privileges.c index aa723a4199..ca2b4fef8d 100644 --- 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 index 0bc085c166..6c2a6bf219 100644 --- 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 63345edea9..321eb3cf33 100644 --- 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 478c633d62..2e45b7964d 100644 --- 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" |