diff options
Diffstat (limited to 'ldap/servers/plugins')
| -rw-r--r-- | ldap/servers/plugins/Makefile | 11 | ||||
| -rw-r--r-- | ldap/servers/plugins/chainingdb/cb_search.c | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/ldap/servers/plugins/Makefile b/ldap/servers/plugins/Makefile index 48e3c925..64854009 100644 --- a/ldap/servers/plugins/Makefile +++ b/ldap/servers/plugins/Makefile @@ -51,13 +51,14 @@ NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk +PLUGINS = _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views ifneq ($(ARCH), WINNT) -all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views -# richm 20050303 - do not build pam pass thru for DS 7.1 -#all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views _pam_passthru -else -all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views +ifneq ($(BRAND), redhat) +PLUGINS += _pam_passthru endif +endif + +all: $(PLUGINS) _utils: cd shared; $(MAKE) $(MFLAGS) all diff --git a/ldap/servers/plugins/chainingdb/cb_search.c b/ldap/servers/plugins/chainingdb/cb_search.c index 5facadc2..0d898a39 100644 --- a/ldap/servers/plugins/chainingdb/cb_search.c +++ b/ldap/servers/plugins/chainingdb/cb_search.c @@ -179,7 +179,7 @@ chainingdb_build_candidate_list ( Slapi_PBlock *pb ) slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, NULL ); return 1; } - timeout.tv_sec=(time_t)timelimit-(now-optime); + timeout.tv_sec=timelimit-(now-optime); timeout.tv_usec=0; } @@ -414,10 +414,7 @@ chainingdb_next_search_entry ( Slapi_PBlock *pb ) { char *target; - int sizelimit, timelimit; - int rc, parse_rc, retcode; - int i, attrsonly; - time_t optime; + int sizelimit,timelimit, rc, parse_rc, optime,i,retcode, attrsonly; LDAPMessage *res=NULL; char *matched_msg,*error_msg; cb_searchContext *ctx=NULL; |