s3-passdb: split out passdb/pdb_nds.h.

Guenther

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index b1f5a620e80021d5bb8896a91183c727eee618a0..9d6eb451cd2b6172fd9d07c049abbb497521871a 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -61,6 +61,7 @@
 
 #include "smbldap.h"
 #include "passdb/pdb_ldap.h"
+#include "passdb/pdb_nds.h"
 
 /**********************************************************************
  Simple helper function to make stuff better readable

diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c
index 1bb4778306209894b7cca0f1320fc223cc9aa58e..72d6a3d2a67f5b51ab94d8eff742f08063c640c2 100644 (file)
--- a/source3/passdb/pdb_nds.c
+++ b/source3/passdb/pdb_nds.c
@@ -27,6 +27,7 @@
 
 #include "smbldap.h"
 #include "passdb/pdb_ldap.h"
+#include "passdb/pdb_nds.h"
 
 #define NMASLDAP_GET_LOGIN_CONFIG_REQUEST      "2.16.840.1.113719.1.39.42.100.3"
 #define NMASLDAP_GET_LOGIN_CONFIG_RESPONSE     "2.16.840.1.113719.1.39.42.100.4"

diff --git a/source3/passdb/pdb_nds.h b/source3/passdb/pdb_nds.h
new file mode 100644 (file)
index 0000000..e73a3ba
--- /dev/null
+++ b/source3/passdb/pdb_nds.h
@@ -0,0 +1,39 @@
+/*
+   Unix SMB/CIFS mplementation.
+   NDS LDAP helper functions for SAMBA
+   Copyright (C) Vince Brimhall                        2004-2005
+
+   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 _PASSDB_PDB_NDS_H_
+#define _PASSDB_PDB_NDS_H_
+
+/* The following definitions come from passdb/pdb_nds.c  */
+
+struct smbldap_state;
+
+int pdb_nds_get_password(
+       struct smbldap_state *ldap_state,
+       char *object_dn,
+       size_t *pwd_len,
+       char *pwd );
+int pdb_nds_set_password(
+       struct smbldap_state *ldap_state,
+       char *object_dn,
+       const char *pwd );
+NTSTATUS pdb_nds_init(void);
+
+#endif /* _PASSDB_PDB_NDS_H_ */

diff --git a/source3/passdb/proto.h b/source3/passdb/proto.h
index 2cb84766048b832d5d48d2873309b5a61e8ec3ee..714c1d8b23c3241d8c2db262f4d51ed3575f61f4 100644 (file)
--- a/source3/passdb/proto.h
+++ b/source3/passdb/proto.h
@@ -316,21 +316,6 @@ NTSTATUS pdb_delete_secret(const char *secret_name);
 
 /* The following definitions come from passdb/pdb_nds.c  */
 
-struct smbldap_state;
-
-int pdb_nds_get_password(
-       struct smbldap_state *ldap_state,
-       char *object_dn,
-       size_t *pwd_len,
-       char *pwd );
-int pdb_nds_set_password(
-       struct smbldap_state *ldap_state,
-       char *object_dn,
-       const char *pwd );
-NTSTATUS pdb_nds_init(void);
-
-/* The following definitions come from passdb/pdb_nds.c  */
-
 NTSTATUS pdb_ipa_init(void);
 
 /* The following definitions come from passdb/pdb_util.c  */