diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-05 16:19:49 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-06 01:44:07 +0200 |
| commit | 7d6ebe0de7d99c20854cafb8af50fe8f30ed778a (patch) | |
| tree | 718a3cfdae0a8c6db47245d028bd043c4df0c09e /source3/passdb/pdb_ldap.c | |
| parent | 76f5a39c7f165c656cdc9db29bfa0df59514fceb (diff) | |
| download | samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.gz samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.bz2 samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.zip | |
More const fixes. Remove CONST_DISCARD.
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 7ce5edcefa..aef1d31eb6 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -4564,7 +4564,7 @@ static bool ldapuser2displayentry(struct ldap_search_state *state, return False; } if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, &result->account_name), + discard_const_p(char *, &result->account_name), vals[0], &converted_size)) { DEBUG(0,("ldapuser2displayentry: pull_utf8_talloc failed: %s", @@ -4577,7 +4577,7 @@ static bool ldapuser2displayentry(struct ldap_search_state *state, if ((vals == NULL) || (vals[0] == NULL)) DEBUG(8, ("\"displayName\" not found\n")); else if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, &result->fullname), + discard_const_p(char *, &result->fullname), vals[0], &converted_size)) { DEBUG(0,("ldapuser2displayentry: pull_utf8_talloc failed: %s", @@ -4590,7 +4590,7 @@ static bool ldapuser2displayentry(struct ldap_search_state *state, if ((vals == NULL) || (vals[0] == NULL)) DEBUG(8, ("\"description\" not found\n")); else if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, &result->description), + discard_const_p(char *, &result->description), vals[0], &converted_size)) { DEBUG(0,("ldapuser2displayentry: pull_utf8_talloc failed: %s", @@ -4724,7 +4724,7 @@ static bool ldapgroup2displayentry(struct ldap_search_state *state, return False; } if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, + discard_const_p(char *, &result->account_name), vals[0], &converted_size)) { @@ -4733,7 +4733,7 @@ static bool ldapgroup2displayentry(struct ldap_search_state *state, } } else if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, + discard_const_p(char *, &result->account_name), vals[0], &converted_size)) { @@ -4747,7 +4747,7 @@ static bool ldapgroup2displayentry(struct ldap_search_state *state, if ((vals == NULL) || (vals[0] == NULL)) DEBUG(8, ("\"description\" not found\n")); else if (!pull_utf8_talloc(mem_ctx, - CONST_DISCARD(char **, &result->description), + discard_const_p(char *, &result->description), vals[0], &converted_size)) { DEBUG(0,("ldapgroup2displayentry: pull_utf8_talloc failed: %s", |