[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2249-ge3e08c6

Jeremy Allison jra at samba.org
Thu Feb 14 19:30:21 GMT 2008


The branch, v3-2-test has been updated
       via  e3e08c6e7d270e1be7a9d3042b1f36f5a291f90a (commit)
      from  c5b7d538ecfa93377ff20704633ac57dbf8dd530 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit e3e08c6e7d270e1be7a9d3042b1f36f5a291f90a
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 14 11:29:54 2008 -0800

    Allow the mechOID to be written separately.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/clispnego.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clispnego.c b/source/libsmb/clispnego.c
index f95b11e..a75032a 100644
--- a/source/libsmb/clispnego.c
+++ b/source/libsmb/clispnego.c
@@ -498,11 +498,13 @@ DATA_BLOB spnego_gen_auth_response(DATA_BLOB *reply, NTSTATUS nt_status,
 	asn1_write_enumerated(&data, negResult);
 	asn1_pop_tag(&data);
 
-	if (reply->data != NULL) {
+	if (mechOID) {
 		asn1_push_tag(&data,ASN1_CONTEXT(1));
 		asn1_write_OID(&data, mechOID);
 		asn1_pop_tag(&data);
-		
+	}
+
+	if (reply && reply->data != NULL) {
 		asn1_push_tag(&data,ASN1_CONTEXT(2));
 		asn1_write_OctetString(&data, reply->data, reply->length);
 		asn1_pop_tag(&data);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list