diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
| commit | a0ab7a47e277a4047d3daad43883dc6077979080 (patch) | |
| tree | 31fc2c981f2de6044f41964d23a46ac51f82e419 /source/libsmb/spnego.c | |
| parent | 7e655eee5164362cb36d247d6251c848176c3a2f (diff) | |
| download | samba-a0ab7a47e277a4047d3daad43883dc6077979080.tar.gz samba-a0ab7a47e277a4047d3daad43883dc6077979080.tar.xz samba-a0ab7a47e277a4047d3daad43883dc6077979080.zip | |
r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1
Diffstat (limited to 'source/libsmb/spnego.c')
| -rw-r--r-- | source/libsmb/spnego.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/libsmb/spnego.c b/source/libsmb/spnego.c index 0387e8f67d8..a0f5565d4f3 100644 --- a/source/libsmb/spnego.c +++ b/source/libsmb/spnego.c @@ -42,14 +42,12 @@ static BOOL read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t *token) asn1_start_tag(asn1, ASN1_CONTEXT(0)); asn1_start_tag(asn1, ASN1_SEQUENCE(0)); - token->mechTypes = SMB_MALLOC_P(const char *); + token->mechTypes = SMB_MALLOC_P(char *); for (i = 0; !asn1->has_error && 0 < asn1_tag_remaining(asn1); i++) { token->mechTypes = - SMB_REALLOC_ARRAY(token->mechTypes, const char *, i + 2); - asn1_read_OID(asn1, - CONST_DISCARD(char **, - (token->mechTypes + i))); + SMB_REALLOC_ARRAY(token->mechTypes, char *, i + 2); + asn1_read_OID(asn1, token->mechTypes + i); } token->mechTypes[i] = NULL; @@ -184,7 +182,7 @@ static BOOL read_negTokenTarg(ASN1_DATA *asn1, negTokenTarg_t *token) break; case ASN1_CONTEXT(1): asn1_start_tag(asn1, ASN1_CONTEXT(1)); - asn1_read_OID(asn1, CONST_DISCARD(char **, &token->supportedMech)); + asn1_read_OID(asn1, &token->supportedMech); asn1_end_tag(asn1); break; case ASN1_CONTEXT(2): @@ -319,8 +317,7 @@ BOOL free_spnego_data(SPNEGO_DATA *spnego) if (spnego->negTokenInit.mechTypes) { int i; for (i = 0; spnego->negTokenInit.mechTypes[i]; i++) { - free(CONST_DISCARD(void *, - spnego->negTokenInit.mechTypes[i])); + free(spnego->negTokenInit.mechTypes[i]); } free(spnego->negTokenInit.mechTypes); } @@ -329,7 +326,7 @@ BOOL free_spnego_data(SPNEGO_DATA *spnego) break; case SPNEGO_NEG_TOKEN_TARG: if (spnego->negTokenTarg.supportedMech) { - free(CONST_DISCARD(void *, spnego->negTokenTarg.supportedMech)); + free(spnego->negTokenTarg.supportedMech); } data_blob_free(&spnego->negTokenTarg.responseToken); data_blob_free(&spnego->negTokenTarg.mechListMIC); |