Attachment #111149 for bug #152370

View | Details | Raw Unified | Return to bug 152370
Collapse All | Expand All

Lines 56-62 Link Here

(-)Makefile (-1 / +7 lines)
56	RUBY "With Ruby support (EXPERIMENTAL)" off \	56	RUBY "With Ruby support (EXPERIMENTAL)" off \
57	DHCP "With DHCP support (EXPERIMENTAL)" off \	57	DHCP "With DHCP support (EXPERIMENTAL)" off \
58	EXPERIMENTAL "Build experimental modules" off \	58	EXPERIMENTAL "Build experimental modules" off \
59	UDPFROMTO "Compile in UDPFROMTO support" off	59	UDPFROMTO "Compile in UDPFROMTO support" off \
		60	WSTRUST "Allow computer account logins in rlm_mschap" off
60		61
61	.include <bsd.port.options.mk>	62	.include <bsd.port.options.mk>
62		63
Lines 246-251 Link Here
246	CONFIGURE_ARGS+=--with-udpfromto	247	CONFIGURE_ARGS+=--with-udpfromto
247	.endif	248	.endif
248		249
		250	# Allow computer logins in rlm_mschap
		251	.ifdef(WITH_WSTRUST)
		252	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-modules-rlm_mschap-rlm_mschap.c
		253	.endif
		254
249	.include <bsd.port.pre.mk>	255	.include <bsd.port.pre.mk>
250		256
251	.if ${ARCH} == "sparc64" && ${OSVERSION} < 700000	257	.if ${ARCH} == "sparc64" && ${OSVERSION} < 700000




--- src/modules/rlm_mschap/rlm_mschap.c.orig	2010-09-28 13:03:56.000000000 +0200
+++ src/modules/rlm_mschap/rlm_mschap.c	2010-11-18 12:02:02.211071015 +0100
@@ -1273,8 +1273,9 @@
 		 *	return 'not found'.
 		 */
 		if (((smb_ctrl->vp_integer & ACB_DISABLED) != 0) ||
-		    ((smb_ctrl->vp_integer & ACB_NORMAL) == 0)) {
-			RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal account.");
+		    (((smb_ctrl->vp_integer & ACB_NORMAL) == 0) &&
+		    ((smb_ctrl->vp_integer & ACB_WSTRUST) == 0))) {
+			RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal or workstation trust account.");
 			mschap_add_reply(request, &request->reply->vps,
 					  *response->vp_octets,
 					  "MS-CHAP-Error", "E=691 R=1", 9);

Return to bug 152370

Added Link Here

(-)files/extra-patch-src-modules-rlm_mschap-rlm_mschap.c (+14 lines)
1	--- src/modules/rlm_mschap/rlm_mschap.c.orig 2010-09-28 13:03:56.000000000 +0200
2	+++ src/modules/rlm_mschap/rlm_mschap.c 2010-11-18 12:02:02.211071015 +0100
3	@@ -1273,8 +1273,9 @@
4	* return 'not found'.
5	*/
6	if (((smb_ctrl->vp_integer & ACB_DISABLED) != 0) \|\|
7	- ((smb_ctrl->vp_integer & ACB_NORMAL) == 0)) {
8	- RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal account.");
9	+ (((smb_ctrl->vp_integer & ACB_NORMAL) == 0) &&
10	+ ((smb_ctrl->vp_integer & ACB_WSTRUST) == 0))) {
11	+ RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal or workstation trust account.");
12	mschap_add_reply(request, &request->reply->vps,
13	*response->vp_octets,
14	"MS-CHAP-Error", "E=691 R=1", 9);