diff options
author | Stefan Metzmacher <metze@samba.org> | 2016-12-29 15:26:00 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2017-01-10 13:54:17 +0100 |
commit | 2a2c03c655e51ff83483bbde1ded36c2e679faa3 (patch) | |
tree | 4d9703809a205e6d0111db4dc5383ddd76d32b01 /auth/credentials | |
parent | 3be1203987de8cf1ae6f30b6e3a6904e3d46990e (diff) | |
download | samba-2a2c03c655e51ff83483bbde1ded36c2e679faa3.tar.gz |
auth/credentials: remove const where we always return a talloc string
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'auth/credentials')
-rw-r--r-- | auth/credentials/credentials.c | 12 | ||||
-rw-r--r-- | auth/credentials/credentials.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c index 06648c7f998..ff444e35413 100644 --- a/auth/credentials/credentials.c +++ b/auth/credentials/credentials.c @@ -193,7 +193,7 @@ _PUBLIC_ const char *cli_credentials_get_bind_dn(struct cli_credentials *cred) * @retval The username set on this context. * @note Return value will never be NULL except by programmer error. */ -_PUBLIC_ const char *cli_credentials_get_principal_and_obtained(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, enum credentials_obtained *obtained) +_PUBLIC_ char *cli_credentials_get_principal_and_obtained(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, enum credentials_obtained *obtained) { if (cred->machine_account_pending) { cli_credentials_set_machine_account(cred, @@ -256,7 +256,7 @@ _PUBLIC_ const char *cli_credentials_get_principal_and_obtained(struct cli_crede * @retval The username set on this context. * @note Return value will never be NULL except by programmer error. */ -_PUBLIC_ const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx) +_PUBLIC_ char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx) { enum credentials_obtained obtained; return cli_credentials_get_principal_and_obtained(cred, mem_ctx, &obtained); @@ -848,12 +848,12 @@ _PUBLIC_ void cli_credentials_parse_string(struct cli_credentials *credentials, * @param mem_ctx The memory context to place the result on */ -_PUBLIC_ const char *cli_credentials_get_unparsed_name(struct cli_credentials *credentials, TALLOC_CTX *mem_ctx) +_PUBLIC_ char *cli_credentials_get_unparsed_name(struct cli_credentials *credentials, TALLOC_CTX *mem_ctx) { const char *bind_dn = cli_credentials_get_bind_dn(credentials); - const char *domain; - const char *username; - const char *name; + const char *domain = NULL; + const char *username = NULL; + char *name = NULL; if (bind_dn) { name = talloc_strdup(mem_ctx, bind_dn); diff --git a/auth/credentials/credentials.h b/auth/credentials/credentials.h index 6b0d83bb5d4..50f69940138 100644 --- a/auth/credentials/credentials.h +++ b/auth/credentials/credentials.h @@ -113,7 +113,7 @@ void cli_credentials_set_machine_account_pending(struct cli_credentials *cred, struct loadparm_context *lp_ctx); void cli_credentials_set_conf(struct cli_credentials *cred, struct loadparm_context *lp_ctx); -const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx); +char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx); int cli_credentials_get_server_gss_creds(struct cli_credentials *cred, struct loadparm_context *lp_ctx, struct gssapi_creds_container **_gcc); @@ -189,7 +189,7 @@ bool cli_credentials_set_bind_dn(struct cli_credentials *cred, const char *bind_dn); const char *cli_credentials_get_bind_dn(struct cli_credentials *cred); bool cli_credentials_parse_file(struct cli_credentials *cred, const char *file, enum credentials_obtained obtained); -const char *cli_credentials_get_unparsed_name(struct cli_credentials *credentials, TALLOC_CTX *mem_ctx); +char *cli_credentials_get_unparsed_name(struct cli_credentials *credentials, TALLOC_CTX *mem_ctx); bool cli_credentials_set_password_callback(struct cli_credentials *cred, const char *(*password_cb) (struct cli_credentials *)); enum netr_SchannelType cli_credentials_get_secure_channel_type(struct cli_credentials *cred); @@ -257,7 +257,7 @@ bool cli_credentials_set_username_callback(struct cli_credentials *cred, * @retval The username set on this context. * @note Return value will never be NULL except by programmer error. */ -const char *cli_credentials_get_principal_and_obtained(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, enum credentials_obtained *obtained); +char *cli_credentials_get_principal_and_obtained(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, enum credentials_obtained *obtained); bool cli_credentials_set_principal(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained); |