diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-08 17:19:07 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-08 17:19:07 +0200 |
| commit | 4b539318232ffc077eaa882963b9788d686610cb (patch) | |
| tree | ee200bf041a84ff883270309064e6284d6f421be /nslcd/host.c | |
| parent | 30423d96ecd243663906a3a1c13f1f0e90ac6330 (diff) | |
move filters definitions to the database modules themselves (and already define base and scope but don't use them yet)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@383 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/host.c')
| -rw-r--r-- | nslcd/host.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/nslcd/host.c b/nslcd/host.c index c006577..535b0e6 100644 --- a/nslcd/host.c +++ b/nslcd/host.c @@ -59,7 +59,28 @@ #define MAXALIASES 35 #endif +/* ( nisSchema.2.6 NAME 'ipHost' SUP top AUXILIARY + * DESC 'Abstraction of a host, an IP device. The distinguished + * value of the cn attribute denotes the host's canonical + * name. Device SHOULD be used as a structural class' + * MUST ( cn $ ipHostNumber ) + * MAY ( l $ description $ manager ) ) + */ + +/* the search base for searches */ +const char *host_base = NULL; + +/* the search scope for searches */ +int host_scope = LDAP_SCOPE_DEFAULT; + +/* the basic search filter for searches */ +const char *host_filter = "(objectClass=ipHost)"; + /* the attributes to request with searches */ +const char *attmap_host_cn = "cn"; +const char *attmap_host_ipHostNumber = "ipHostNumber"; + +/* the attribute list to request with searches */ static const char *host_attrs[3]; /* create a search filter for searching a host entry @@ -73,8 +94,8 @@ static int mkfilter_host_byname(const char *name, return -1; /* build filter */ return mysnprintf(buffer,buflen, - "(&(%s=%s)(%s=%s))", - attmap_objectClass,attmap_host_objectClass, + "(&%s(%s=%s))", + host_filter, attmap_host_cn,buf2); } @@ -87,18 +108,11 @@ static int mkfilter_host_byaddr(const char *name, return -1; /* build filter */ return mysnprintf(buffer,buflen, - "(&(%s=%s)(%s=%s))", - attmap_objectClass,attmap_host_objectClass, + "(&%s(%s=%s))", + host_filter, attmap_host_ipHostNumber,buf2); } -static int mkfilter_host_all(char *buffer,size_t buflen) -{ - return mysnprintf(buffer,buflen, - "(%s=%s)", - attmap_objectClass,attmap_host_objectClass); -} - static void host_attrs_init(void) { host_attrs[0]=attmap_host_cn; @@ -388,7 +402,6 @@ int nslcd_host_all(TFILE *fp) { int32_t tmpint32; struct ent_context context; - char filter[1024]; /* these are here for now until we rewrite the LDAP code */ struct hostent result; char buffer[1024]; @@ -402,10 +415,9 @@ int nslcd_host_all(TFILE *fp) /* initialize context */ _nss_ldap_ent_context_init(&context); /* loop over all results */ - mkfilter_host_all(filter,sizeof(filter)); host_attrs_init(); while ((retv=_nss_ldap_getent(&context,&result,buffer,sizeof(buffer),&errnop, - NULL,filter,host_attrs,LM_HOSTS, + NULL,host_filter,host_attrs,LM_HOSTS, #ifdef INET6 (_res.options&RES_USE_INET6)?_nss_ldap_parse_hostv6:_nss_ldap_parse_hostv4 #else |