summaryrefslogtreecommitdiff
path: root/source3/lib/popt_common.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-02-26 20:16:26 +0100
committerJeremy Allison <jra@samba.org>2014-11-15 01:46:13 +0100
commit07d03e277757510b6c1b142ca9cee0b1b755b7b6 (patch)
tree08084fe94f2529642554e949e1c0b3a5bfd8b0a1 /source3/lib/popt_common.c
parent3dcc321daf569cf64715d47577105af7a48d10ba (diff)
downloadsamba-07d03e277757510b6c1b142ca9cee0b1b755b7b6.tar.gz
s3:lib: fix const warnings in popt_common.c
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Nov 15 01:46:13 CET 2014 on sn-devel-104
Diffstat (limited to 'source3/lib/popt_common.c')
-rw-r--r--source3/lib/popt_common.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index df0465d9b45..6f27bacc886 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -353,8 +353,11 @@ static void popt_common_credentials_callback(poptContext con,
const struct poptOption *opt,
const char *arg, const void *data)
{
- struct user_auth_info *auth_info = talloc_get_type_abort(
- *((const char **)data), struct user_auth_info);
+ const void **pp = discard_const(data);
+ void *p = discard_const(*pp);
+ struct user_auth_info *auth_info =
+ talloc_get_type_abort(p,
+ struct user_auth_info);
if (reason == POPT_CALLBACK_REASON_PRE) {
set_cmdline_auth_info_username(auth_info, "GUEST");
@@ -501,7 +504,7 @@ void popt_burn_cmdline_password(int argc, char *argv[])
struct poptOption popt_common_credentials[] = {
{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE,
(void *)popt_common_credentials_callback, 0,
- (const char *)&global_auth_info },
+ (const void *)&global_auth_info },
{ "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "USERNAME" },
{ "no-pass", 'N', POPT_ARG_NONE, NULL, 'N', "Don't ask for a password" },
{ "kerberos", 'k', POPT_ARG_NONE, NULL, 'k', "Use kerberos (active directory) authentication" },