smb2: force dce-style for krb5

oiweiwei · oiweiwei · commit 340ee63f0729 · 2024-12-20T13:56:32.000+01:00
diff --git a/smb2/initiator.go b/smb2/initiator.go
@@ -17,6 +17,9 @@ func SecurtiyContextInitiator(opts ...gssapi.ContextOption) *Initiator {
 		}
 	}
 
+	// allways include DCEStyle.
+	i.opts = append(i.opts, gssapi.WithRequest(gssapi.DCEStyle))
+
 	return &i
 }
 
diff --git a/ssp/krb5/gssapi.go b/ssp/krb5/gssapi.go
@@ -107,7 +107,7 @@ func (Mechanism) New(ctx context.Context) (gssapi.Mechanism, error) {
 	}
 
 	if cc.Capabilities.IsSet(gssapi.DCEStyle) || c.DCEStyle {
-		c.Flags = append(c.Flags, int(gssapi.DCEStyle))
+		c.Flags, c.DCEStyle = append(c.Flags, int(gssapi.DCEStyle)), true
 	}
 
 	// XXX: this option controls whether the key from TGT must be

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ func SecurtiyContextInitiator(opts ...gssapi.ContextOption) *Initiator {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ // allways include DCEStyle.`
	`21`	`+ i.opts = append(i.opts, gssapi.WithRequest(gssapi.DCEStyle))`
	`22`	`+`
`20`	`23`	`return &i`
`21`	`24`	`}`
`22`	`25`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (Mechanism) New(ctx context.Context) (gssapi.Mechanism, error) {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if cc.Capabilities.IsSet(gssapi.DCEStyle) \|\| c.DCEStyle {`
`110`		`- c.Flags = append(c.Flags, int(gssapi.DCEStyle))`
	`110`	`+ c.Flags, c.DCEStyle = append(c.Flags, int(gssapi.DCEStyle)), true`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// XXX: this option controls whether the key from TGT must be`