From 0549bc408dc6a780b390c39b666108af1736d30b Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun, 26 Aug 2007 14:05:11 +0000
Subject: move enum ldap_map_selector and struct ldap_service_search_descriptor
from ldap-nss.h to cfg.h
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@364 ef36b2f9-881f-0410-afb5-c4e39611909c
---
nslcd/cfg.h | 30 +++++++++++++++++++++++++++++-
nslcd/ldap-nss.h | 30 +-----------------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index 0709ebf..abf2bae 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -26,7 +26,6 @@
#ifndef _CFG_H
#define _CFG_H
-#include "ldap-nss.h"
#include "common/dict.h"
#include "compat/attrs.h"
@@ -60,6 +59,35 @@ enum ldap_shadow_selector
LS_AD_SHADOW
};
+/* selectors for different maps */
+enum ldap_map_selector
+{
+ LM_PASSWD,
+ LM_SHADOW,
+ LM_GROUP,
+ LM_HOSTS,
+ LM_SERVICES,
+ LM_NETWORKS,
+ LM_PROTOCOLS,
+ LM_RPC,
+ LM_ETHERS,
+ LM_ALIASES,
+ LM_NETGROUP,
+ LM_NONE
+};
+
+struct ldap_service_search_descriptor
+{
+ /* search base, qualified */
+ char *lsd_base;
+ /* scope */
+ int lsd_scope;
+ /* filter */
+ char *lsd_filter;
+ /* next */
+ struct ldap_service_search_descriptor *lsd_next;
+};
+
struct ldap_config
{
/* NULL terminated list of URIs */
diff --git a/nslcd/ldap-nss.h b/nslcd/ldap-nss.h
index 064057d..d318062 100644
--- a/nslcd/ldap-nss.h
+++ b/nslcd/ldap-nss.h
@@ -42,6 +42,7 @@
#include <ldap.h>
#include "common/tio.h"
+#include "cfg.h"
#ifndef LDAP_FILT_MAXSIZ
#define LDAP_FILT_MAXSIZ 1024
@@ -67,35 +68,6 @@
#define bytesleft(ptr, blen, TYPE) \
( (blen < alignof(TYPE)) ? 0 : (blen - alignof(TYPE) + 1))
-/* selectors for different maps */
-enum ldap_map_selector
-{
- LM_PASSWD,
- LM_SHADOW,
- LM_GROUP,
- LM_HOSTS,
- LM_SERVICES,
- LM_NETWORKS,
- LM_PROTOCOLS,
- LM_RPC,
- LM_ETHERS,
- LM_ALIASES,
- LM_NETGROUP,
- LM_NONE
-};
-
-struct ldap_service_search_descriptor
-{
- /* search base, qualified */
- char *lsd_base;
- /* scope */
- int lsd_scope;
- /* filter */
- char *lsd_filter;
- /* next */
- struct ldap_service_search_descriptor *lsd_next;
-};
-
enum ldap_args_types
{
LA_TYPE_STRING,
--
cgit v1.2.3