A few typo fixes Andrew eventually let off to me.

Rafal
(This used to be commit 16a66cf17a544a214b7c5b483c81c7568a18a779)

diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h
index 9cd873c18a21484fb60738f35d8405db48f5f6c7..ab7fa5d398e0dc4d800f28b3f0b0f3a7124110a7 100644 (file)
--- a/source3/include/asn_1.h
+++ b/source3/include/asn_1.h
@@ -55,8 +55,8 @@ typedef struct {
 #define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2"
 #define OID_KERBEROS5 "1 2 840 113554 1 2 2"
 
-#define SPNGEO_NEG_RESULT_ACCEPT 0
-#define SPNGEO_NEG_RESULT_INCOMPLETE 1
-#define SPNGEO_NEG_RESULT_REJECT 2
+#define SPNEGO_NEG_RESULT_ACCEPT 0
+#define SPNEGO_NEG_RESULT_INCOMPLETE 1
+#define SPNEGO_NEG_RESULT_REJECT 2
 
 #endif /* _ASN_1_H */

diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 277bf4765f068641927cfc2acf6c638edd6fe93d..eabddd1765f18e57dcd90f46df3ac1bc888a8fd0 100644 (file)
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -447,11 +447,11 @@ DATA_BLOB spnego_gen_auth_response(DATA_BLOB *ntlmssp_reply, NTSTATUS nt_status)
        uint8 negResult;
 
        if (NT_STATUS_IS_OK(nt_status)) {
-               negResult = SPNGEO_NEG_RESULT_ACCEPT;
+               negResult = SPNEGO_NEG_RESULT_ACCEPT;
        } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               negResult = SPNGEO_NEG_RESULT_INCOMPLETE; 
+               negResult = SPNEGO_NEG_RESULT_INCOMPLETE; 
        } else {
-               negResult = SPNGEO_NEG_RESULT_REJECT; 
+               negResult = SPNEGO_NEG_RESULT_REJECT; 
        }
 
        ZERO_STRUCT(data);
@@ -461,7 +461,7 @@ DATA_BLOB spnego_gen_auth_response(DATA_BLOB *ntlmssp_reply, NTSTATUS nt_status)
        asn1_push_tag(&data, ASN1_CONTEXT(0));
        asn1_write_enumerated(&data, negResult);
        asn1_pop_tag(&data);
-       if (negResult == SPNGEO_NEG_RESULT_INCOMPLETE) {
+       if (negResult == SPNEGO_NEG_RESULT_INCOMPLETE) {
                asn1_push_tag(&data,ASN1_CONTEXT(1));
                asn1_write_OID(&data, OID_NTLMSSP);
                asn1_pop_tag(&data);

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 886f87276415595ed683a2c6376b795c77808b6d..969508a360af2461022e09c1c75b481457eb8505 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 
 /**
- * Default challange generation code.
+ * Default challenge generation code.
  *
  */