From 623336e81704238d2b4645e2bff22e83e925e521 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Apr 2003 18:44:11 +0000 Subject: Address gcc warnings. I could not fix the "passing arg 5 of `ldap_search_s'" completely with gcc -Wall. A non-developer compile does not complain though. Volker (This used to be commit cf923d713305620278e3759599247d3cf7aa0e2f) --- source3/passdb/pdb_ldap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/passdb') diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index a0853e2102..2eeb96d9b1 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -529,7 +529,7 @@ static int ldapsam_search(struct ldapsam_privates *ldap_state, continue; rc = ldap_search_s(ldap_state->ldap_struct, base, scope, - filter, attrs, attrsonly, res); + filter, (char **)attrs, attrsonly, res); } if (rc == LDAP_SERVER_DOWN) { @@ -612,6 +612,7 @@ static int ldapsam_delete(struct ldapsam_privates *ldap_state, char *dn) return rc; } +#ifdef LDAP_EXOP_X_MODIFY_PASSWD static int ldapsam_extended_operation(struct ldapsam_privates *ldap_state, LDAP_CONST char *reqoid, struct berval *reqdata, LDAPControl **serverctrls, LDAPControl **clientctrls, char **retoidp, struct berval **retdatap) { int rc = LDAP_SERVER_DOWN; @@ -635,6 +636,7 @@ static int ldapsam_extended_operation(struct ldapsam_privates *ldap_state, LDAP_ return rc; } +#endif /******************************************************************* run the search by name. @@ -1287,6 +1289,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state, * If we are updating the record AND the attribute is CHANGED. * If we are adding the record AND it is SET or CHANGED (ie not default) *********************************************************************/ +#ifdef LDAP_EXOP_X_MODIFY_PASSWD static BOOL need_ldap_mod(BOOL pdb_add, const SAM_ACCOUNT * sampass, enum pdb_elements element) { if (pdb_add) { return (!IS_SAM_DEFAULT(sampass, element)); @@ -1294,6 +1297,7 @@ static BOOL need_ldap_mod(BOOL pdb_add, const SAM_ACCOUNT * sampass, enum pdb_el return IS_SAM_CHANGED(sampass, element); } } +#endif /********************************************************************** Set attribute to newval in LDAP, regardless of what value the -- cgit