summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2003-04-19 18:44:11 +0000
committerVolker Lendecke <vlendec@samba.org>2003-04-19 18:44:11 +0000
commit623336e81704238d2b4645e2bff22e83e925e521 (patch)
tree5e3fe0990d6ae4dbb04513ef13def503e3cd92d0
parent4a317cb748bdc45bcea755bfd8c278328db8856a (diff)
downloadsamba-623336e81704238d2b4645e2bff22e83e925e521.tar.gz
samba-623336e81704238d2b4645e2bff22e83e925e521.tar.bz2
samba-623336e81704238d2b4645e2bff22e83e925e521.zip
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)
-rw-r--r--source3/passdb/pdb_ldap.c6
1 files changed, 5 insertions, 1 deletions
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