sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

auth/credentials: remove const where we always return a talloc string

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-12-29 15:26:00 +01:00
parent 3be1203987
commit 2a2c03c655
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
auth/credentials/credentials.c
View File

@ -193,7 +193,7 @@ _PUBLIC_ const char *cli_credentials_get_bind_dn(struct cli_credentials *cred)
* @retval The username set on this context. * @retval The username set on this context.
* @note Return value will never be NULL except by programmer error. * @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) { if (cred->machine_account_pending) {
cli_credentials_set_machine_account(cred, 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. * @retval The username set on this context.
* @note Return value will never be NULL except by programmer error. * @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; enum credentials_obtained obtained;
return cli_credentials_get_principal_and_obtained(cred, mem_ctx, &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 * @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 *bind_dn = cli_credentials_get_bind_dn(credentials);
const char *domain; const char *domain = NULL;
const char *username; const char *username = NULL;
const char *name; char *name = NULL;
if (bind_dn) { if (bind_dn) {
name = talloc_strdup(mem_ctx, bind_dn); name = talloc_strdup(mem_ctx, bind_dn);

6
auth/credentials/credentials.h
View File

@ -113,7 +113,7 @@ void cli_credentials_set_machine_account_pending(struct cli_credentials *cred,
struct loadparm_context *lp_ctx); struct loadparm_context *lp_ctx);
void cli_credentials_set_conf(struct cli_credentials *cred, void cli_credentials_set_conf(struct cli_credentials *cred,
struct loadparm_context *lp_ctx); 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, int cli_credentials_get_server_gss_creds(struct cli_credentials *cred,
struct loadparm_context *lp_ctx, struct loadparm_context *lp_ctx,
struct gssapi_creds_container **_gcc); 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 *bind_dn);
const char *cli_credentials_get_bind_dn(struct cli_credentials *cred); 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); 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, bool cli_credentials_set_password_callback(struct cli_credentials *cred,
const char *(*password_cb) (struct cli_credentials *)); const char *(*password_cb) (struct cli_credentials *));
enum netr_SchannelType cli_credentials_get_secure_channel_type(struct cli_credentials *cred); 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. * @retval The username set on this context.
* @note Return value will never be NULL except by programmer error. * @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, bool cli_credentials_set_principal(struct cli_credentials *cred,
const char *val, const char *val,
enum credentials_obtained obtained); enum credentials_obtained obtained);