summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba3sam.c1
-rw-r--r--source4/lib/policy/gp_ldap.c3
-rw-r--r--source4/libcli/security/security.h45
3 files changed, 1 insertions, 48 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index 42245ce491..7faa9359db 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -14,7 +14,6 @@
#include "librpc/gen_ndr/ndr_samr.h"
#include "librpc/ndr/libndr.h"
#include "libcli/security/security.h"
-#include "libcli/security/proto.h"
#include "lib/samba3/samba3.h"
/*
diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c
index d612cf8769..bbb2eec4e9 100644
--- a/source4/lib/policy/gp_ldap.c
+++ b/source4/lib/policy/gp_ldap.c
@@ -26,8 +26,7 @@
#include "libcli/libcli.h"
#include "libnet/libnet.h"
#include "../librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/dom_sid.h"
-#include "libcli/security/security.h"
+#include "../libcli/security/security.h"
#include "libcli/ldap/ldap_ndr.h"
#include "../lib/talloc/talloc.h"
#include "lib/policy/policy.h"
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
deleted file mode 100644
index 009ad64959..0000000000
--- a/source4/libcli/security/security.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Copyright (C) Stefan Metzmacher 2006
-
- 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/>.
-*/
-
-#ifndef _LIBCLI_SECURITY_SECURITY_H_
-#define _LIBCLI_SECURITY_SECURITY_H_
-
-#include "librpc/gen_ndr/security.h"
-
-#define PRIMARY_USER_SID_INDEX 0
-#define PRIMARY_GROUP_SID_INDEX 1
-
-struct object_tree {
- uint32_t remaining_access;
- struct GUID guid;
- int num_of_children;
- struct object_tree *children;
-};
-
-/* Moved the dom_sid functions to the top level dir with manual proto header */
-#include "libcli/security/dom_sid.h"
-#include "libcli/security/secace.h"
-#include "libcli/security/secacl.h"
-#include "libcli/security/proto.h"
-#include "libcli/security/security_descriptor.h"
-#include "libcli/security/security_token.h"
-#include "libcli/security/sddl.h"
-#include "libcli/security/privileges.h"
-
-#endif