summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-14 15:03:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:16 -0500
commite3f2414cf9e582a4e4deecc662b64a7bb2679a34 (patch)
treed7f9afc1db09bce58ff895418c97c36e6bb33908 /source4/dsdb
parenteefe30b7d8e17ed744318417954669bacf2b3ac0 (diff)
downloadsamba-e3f2414cf9e582a4e4deecc662b64a7bb2679a34.tar.gz
samba-e3f2414cf9e582a4e4deecc662b64a7bb2679a34.tar.bz2
samba-e3f2414cf9e582a4e4deecc662b64a7bb2679a34.zip
r14380: Reduce the size of structs.h
(This used to be commit 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/config.mk2
-rw-r--r--source4/dsdb/samdb/cracknames.c2
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c3
-rw-r--r--source4/dsdb/samdb/samdb.h32
4 files changed, 35 insertions, 4 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index b1a00cc387..ba8da697e8 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -5,7 +5,7 @@ include samdb/ldb_modules/config.mk
################################################
# Start SUBSYSTEM SAMDB
[SUBSYSTEM::SAMDB]
-PRIVATE_PROTO_HEADER = samdb/samdb.h
+PRIVATE_PROTO_HEADER = samdb/samdb_proto.h
REQUIRED_SUBSYSTEMS = DB_WRAP LIBCLI_LDAP
OBJ_FILES = \
samdb/samdb.o \
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 66cd3fcbe0..889995ecb5 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -28,11 +28,11 @@
#include "lib/ldb/include/ldb_errors.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
-#include "dsdb/samdb/samdb.h"
#include "libcli/ldap/ldap.h"
#include "libcli/security/proto.h"
#include "auth/auth.h"
#include "db_wrap.h"
+#include "dsdb/samdb/samdb.h"
static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
struct smb_krb5_context *smb_krb5_context,
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 6943a5f356..32d226b2b7 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -36,8 +36,7 @@
#include "ldb/include/ldb_private.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_samr.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
#include "system/time.h"
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
new file mode 100644
index 0000000000..886dc6afd0
--- /dev/null
+++ b/source4/dsdb/samdb/samdb.h
@@ -0,0 +1,32 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ interface functions for the sam database
+
+ Copyright (C) Andrew Tridgell 2004
+
+ 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.
+
+ 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __SAMDB_H__
+#define __SAMDB_H__
+
+struct auth_session_info;
+struct drsuapi_DsNameInfo1;
+
+#include "ldb.h"
+#include "dsdb/samdb/samdb_proto.h"
+
+#endif /* __SAMDB_H__ */