summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-01-24 04:44:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:24 -0500
commita4faa575a4eef0b29a9129779efe5a930f464e15 (patch)
tree8cd6ca591438911348c418e3ee2041caba0d47dc /source3/include
parent1ce7cc19185646fcea3db670ca0b22145760da79 (diff)
downloadsamba-a4faa575a4eef0b29a9129779efe5a930f464e15.tar.gz
samba-a4faa575a4eef0b29a9129779efe5a930f464e15.tar.bz2
samba-a4faa575a4eef0b29a9129779efe5a930f464e15.zip
r20992: another attempt at fixing the build breakage
(This used to be commit 7011a1b5abc7d56da5beba904e3328014f315f0d)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/nss_info.h28
2 files changed, 26 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 84bd90cc27..148bfc4414 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -777,6 +777,8 @@ enum flush_reason_enum {
#ifdef HAVE_LDAP
#include "ads_protos.h"
+#else
+typedef LDAPMessage void;
#endif
/* We need this after proto.h to reference GetTimeOfDay(). */
diff --git a/source3/include/nss_info.h b/source3/include/nss_info.h
index 6f93c2ce81..2d7a5682e2 100644
--- a/source3/include/nss_info.h
+++ b/source3/include/nss_info.h
@@ -20,6 +20,8 @@
Boston, MA 02111-1307, USA.
*/
+#ifdef WITH_ADS
+
#ifndef _IDMAP_NSS_H
#define _IDMAP_NSS_H
@@ -60,13 +62,31 @@ struct nss_info_methods {
NTSTATUS (*get_nss_info)( struct nss_domain_entry *e,
const DOM_SID *sid,
TALLOC_CTX *ctx,
-#ifdef WITH_ADS
ADS_STRUCT *ads, LDAPMessage *msg,
-#else
- void *ads, void *msg,
-#endif
char **homedir, char **shell, char **gecos, gid_t *p_gid);
NTSTATUS (*close_fn)( void );
};
+
+/* The following definitions come from nsswitch/nss_info.c */
+
+NTSTATUS smb_register_idmap_nss(int version,
+ const char *name,
+ struct nss_info_methods *methods);
+
+NTSTATUS nss_init( const char **nss_list );
+
+NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
+ TALLOC_CTX *ctx,
+ ADS_STRUCT *ads, LDAPMessage *msg,
+ char **homedir, char **shell, char **gecos,
+ gid_t *p_gid);
+
+NTSTATUS nss_close( const char *parameters );
+
+NTSTATUS idmap_nss_init_domain( const char *domain );
+
+
#endif /* _IDMAP_NSS_H_ */
+
+#endif /* WITH_ADS */