Attachment 3534 Details for Bug 5739 – KERBEROS cosmetic patch

[patch] KERBEROS cosmetic patch

krbCosmetic.patch (text/plain), 5.81 KB, created by Matthias Dieter Wallnöfer on 2008-09-07 15:35:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Dieter Wallnöfer

Created: 2008-09-07 15:35:56 UTC

Size: 5.81 KB

patch

obsolete

>diff --git a/source/auth/gensec/cyrus_sasl.c b/source/auth/gensec/cyrus_sasl.c
>index 06a7b8a..6f82de8 100644
>--- a/source/auth/gensec/cyrus_sasl.c
>+++ b/source/auth/gensec/cyrus_sasl.c
>@@ -110,7 +110,7 @@ static int gensec_sasl_get_password(sasl_conn_t *conn, void *context, int id,
> static int gensec_sasl_dispose(struct gensec_sasl_state *gensec_sasl_state)
> {
> 	sasl_dispose(&gensec_sasl_state->conn);
>-	return 0;
>+	return SASL_OK;
> }
> 
> static NTSTATUS gensec_sasl_client_start(struct gensec_security *gensec_security)
>diff --git a/source/auth/kerberos/kerberos.c b/source/auth/kerberos/kerberos.c
>index 2579ab2..d54664f 100644
>--- a/source/auth/kerberos/kerberos.c
>+++ b/source/auth/kerberos/kerberos.c
>@@ -33,7 +33,7 @@
>   This version is built to use a keyblock, rather than needing the
>   original password.
> */
>- int kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, 
>+ krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, 
> 				krb5_principal principal, krb5_keyblock *keyblock,
> 				time_t *expire_time, time_t *kdc_time)
> {
>@@ -77,7 +77,7 @@
>   simulate a kinit, putting the tgt in the given credentials cache. 
>   Orignally by remus@snapserver.com
> */
>- int kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, 
>+ krb5_error_code kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, 
> 				krb5_principal principal, const char *password, 
> 				time_t *expire_time, time_t *kdc_time)
> {
>diff --git a/source/auth/kerberos/kerberos_util.c b/source/auth/kerberos/kerberos_util.c
>index 9002715..0567565 100644
>--- a/source/auth/kerberos/kerberos_util.c
>+++ b/source/auth/kerberos/kerberos_util.c
>@@ -32,7 +32,7 @@ struct principal_container {
> 	krb5_principal principal;
> };
> 
>-static int free_principal(struct principal_container *pc)
>+static krb5_error_code free_principal(struct principal_container *pc)
> {
> 	/* current heimdal - 0.6.3, which we need anyway, fixes segfaults here */
> 	krb5_free_principal(pc->smb_krb5_context->krb5_context, pc->principal);
>@@ -241,19 +241,17 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx,
> 	return 0;
> }
> 
>-static int free_keytab(struct keytab_container *ktc)
>+static krb5_error_code free_keytab(struct keytab_container *ktc)
> {
>-	krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
>-
>-	return 0;
>+	return krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
> }
> 
>-int smb_krb5_open_keytab(TALLOC_CTX *mem_ctx,
>+krb5_error_code smb_krb5_open_keytab(TALLOC_CTX *mem_ctx,
> 			 struct smb_krb5_context *smb_krb5_context, 
> 			 const char *keytab_name, struct keytab_container **ktc) 
> {
> 	krb5_keytab keytab;
>-	int ret;
>+	krb5_error_code ret;
> 	ret = krb5_kt_resolve(smb_krb5_context->krb5_context, keytab_name, &keytab);
> 	if (ret) {
> 		DEBUG(1,("failed to open krb5 keytab: %s\n", 
>@@ -339,7 +337,7 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
> 	return 0;
> }
> 
>-static int create_keytab(TALLOC_CTX *parent_ctx,
>+static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx,
> 			 struct cli_credentials *machine_account,
> 			 struct smb_krb5_context *smb_krb5_context,
> 			 const char **enctype_strings,
>@@ -603,7 +601,7 @@ static krb5_error_code remove_old_entries(TALLOC_CTX *parent_ctx,
> 	return ret;
> }
> 
>-int smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
>+krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
> 			   struct cli_credentials *machine_account,
> 			   struct smb_krb5_context *smb_krb5_context,
> 			   const char **enctype_strings,
>@@ -635,7 +633,7 @@ int smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
> 	return ret;
> }
> 
>-int smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
>+krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
> 					   struct cli_credentials *machine_account,
> 					   struct smb_krb5_context *smb_krb5_context,
> 					   const char **enctype_strings,
>diff --git a/source/auth/kerberos/krb5_init_context.c b/source/auth/kerberos/krb5_init_context.c
>index 82e42a4..90b542c 100644
>--- a/source/auth/kerberos/krb5_init_context.c
>+++ b/source/auth/kerberos/krb5_init_context.c
>@@ -49,13 +49,13 @@ struct smb_krb5_socket {
> 	krb5_krbhst_info *hi;
> };
> 
>-static int smb_krb5_context_destroy_1(struct smb_krb5_context *ctx)
>+static krb5_error_code smb_krb5_context_destroy_1(struct smb_krb5_context *ctx)
> {
> 	krb5_free_context(ctx->krb5_context); 
> 	return 0;
> }
> 
>-static int smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
>+static krb5_error_code smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
> {
> 	/* Otherwise krb5_free_context will try and close what we have already free()ed */
> 	krb5_set_warn_dest(ctx->krb5_context, NULL);
>diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
>index ef3a0bc..30fd284 100644
>--- a/source/kdc/hdb-ldb.c
>+++ b/source/kdc/hdb-ldb.c
>@@ -186,7 +186,7 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
> 	return flags;
> }
> 
>-static int hdb_ldb_destrutor(struct hdb_ldb_private *private)
>+static int hdb_ldb_destructor(struct hdb_ldb_private *private)
> {
>     hdb_entry_ex *entry_ex = private->entry_ex;
>     free_hdb_entry(&entry_ex->entry);
>@@ -542,7 +542,7 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
> 	private->iconv_convenience = lp_iconv_convenience(lp_ctx);
> 	private->netbios_name = lp_netbios_name(lp_ctx);
> 
>-	talloc_set_destructor(private, hdb_ldb_destrutor);
>+	talloc_set_destructor(private, hdb_ldb_destructor);
> 
> 	entry_ex->ctx = private;
> 	entry_ex->free_entry = hdb_ldb_free_entry;
>@@ -728,7 +728,7 @@ static krb5_error_code LDB_trust_message2entry(krb5_context context, HDB *db,
> 	private->iconv_convenience = lp_iconv_convenience(lp_ctx);
> 	private->netbios_name = lp_netbios_name(lp_ctx);
> 
>-	talloc_set_destructor(private, hdb_ldb_destrutor);
>+	talloc_set_destructor(private, hdb_ldb_destructor);
> 
> 	entry_ex->ctx = private;
> 	entry_ex->free_entry = hdb_ldb_free_entry;

Actions: View

Attachments on bug 5739: 3534 | 3535 | 3536 | 3537 | 3538 | 3539 | 3540 | 3541 | 3628