Attachment #116466 for bug #158413

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




#

PORTNAME=	freeradius
DISTVERSION=	2.1.11
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \


.include <bsd.port.options.mk>

LICENSE=	GPLv2

# Default requirements for rc script
_REQUIRE=	NETWORKING SERVERS


USE_PERL5=	yes
CONFIGURE_ARGS+=--with-rlm_perl
PLIST_SUB+=	RLMPERL=""
# temporary workaround for libtool issue until FR 2.2.x is released
CFLAGS+=	-DHAVE_LT_DLADVISE_INIT
.else
CONFIGURE_ARGS+=--without-perl --without-rlm_perl
PLIST_SUB+=	RLMPERL="@comment "

CONFIGURE_ARGS+=--with-rlm_python \
		--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
		--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
# temporary workaround for libtool issue until FR 2.2.x is released
CFLAGS+=	-DHAVE_LT_DLADVISE_INIT
PLIST_SUB+=	RLMPYTHON=""
.else
CONFIGURE_ARGS+=--without-rlm_python

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (freeradius-server-2.1.10.tar.bz2) = 8c56356cec5fd33522d86118a1065e004cce6735f0889146526f9839261fee9e	1	SHA256 (freeradius-server-2.1.11.tar.bz2) = c93ce0c419c5540cb044d5319c3beb995d2a91134bdc2ed5896c72413f95b9e7
2	SIZE (freeradius-server-2.1.10.tar.bz2) = 2545578	2	SIZE (freeradius-server-2.1.11.tar.bz2) = 2632549

Lines 4-8 Link Here

(-)pkg-descr (-1 lines)
4	community, including eduroam. The server is fast, feature-rich, modular, and	4	community, including eduroam. The server is fast, feature-rich, modular, and
5	scalable.	5	scalable.
6		6
7
8	WWW: http://www.freeradius.org/	7	WWW: http://www.freeradius.org/

Lines 74-81 Link Here

(-)pkg-plist (+30 lines)
74	%%EXAMPLESDIR%%/raddb/modules/preprocess	74	%%EXAMPLESDIR%%/raddb/modules/preprocess
75	%%EXAMPLESDIR%%/raddb/modules/radutmp	75	%%EXAMPLESDIR%%/raddb/modules/radutmp
76	%%EXAMPLESDIR%%/raddb/modules/realm	76	%%EXAMPLESDIR%%/raddb/modules/realm
		77	%%EXAMPLESDIR%%/raddb/modules/redis
		78	%%EXAMPLESDIR%%/raddb/modules/rediswho
		79	%%EXAMPLESDIR%%/raddb/modules/replicate
77	%%EXAMPLESDIR%%/raddb/modules/smbpasswd	80	%%EXAMPLESDIR%%/raddb/modules/smbpasswd
78	%%EXAMPLESDIR%%/raddb/modules/smsotp	81	%%EXAMPLESDIR%%/raddb/modules/smsotp
		82	%%EXAMPLESDIR%%/raddb/modules/soh
79	%%EXAMPLESDIR%%/raddb/modules/sql_log	83	%%EXAMPLESDIR%%/raddb/modules/sql_log
80	%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login	84	%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
81	%%EXAMPLESDIR%%/raddb/modules/sradutmp	85	%%EXAMPLESDIR%%/raddb/modules/sradutmp
Lines 101-106 Link Here
101	%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel	105	%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
102	%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting	106	%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
103	%%EXAMPLESDIR%%/raddb/sites-available/status	107	%%EXAMPLESDIR%%/raddb/sites-available/status
		108	%%EXAMPLESDIR%%/raddb/sites-available/soh
104	%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com	109	%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
105	%%EXAMPLESDIR%%/raddb/sites-available/vmps	110	%%EXAMPLESDIR%%/raddb/sites-available/vmps
106	%%EXAMPLESDIR%%/raddb/sites-enabled/control-socket	111	%%EXAMPLESDIR%%/raddb/sites-enabled/control-socket
Lines 402-407 Link Here
402	%%LIBDIR%%/rlm_realm.a	407	%%LIBDIR%%/rlm_realm.a
403	%%LIBDIR%%/rlm_realm.la	408	%%LIBDIR%%/rlm_realm.la
404	%%LIBDIR%%/rlm_realm.so	409	%%LIBDIR%%/rlm_realm.so
		410	%%LIBDIR%%/rlm_soh.so
		411	%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.so
		412	%%LIBDIR%%/rlm_soh.la
		413	%%LIBDIR%%/rlm_soh.a
		414	%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.la
		415	%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.so
		416	%%LIBDIR%%/rlm_replicate.so
		417	%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.la
		418	%%LIBDIR%%/rlm_replicate.la
		419	%%LIBDIR%%/rlm_replicate.a
405	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.la	420	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.la
406	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.so	421	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.so
407	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby.a	422	%%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby.a
Lines 594-599 Link Here
594	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5607.txt	609	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5607.txt
595	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5904.txt	610	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5904.txt
596	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5997.txt	611	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5997.txt
		612	%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc6158.txt
597	%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm	613	%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
598	%%PORTDOCS%%%%DOCSDIR%%/rlm_eap	614	%%PORTDOCS%%%%DOCSDIR%%/rlm_eap
599	%%PORTDOCS%%%%DOCSDIR%%/rlm_expiration	615	%%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
Lines 609-614 Link Here
609	%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter	625	%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
610	%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool	626	%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
611	%%PORTDOCS%%%%DOCSDIR%%/snmp	627	%%PORTDOCS%%%%DOCSDIR%%/snmp
		628	%%PORTDOCS%%%%DOCSDIR%%/SoH.txt
612	%%PORTDOCS%%%%DOCSDIR%%/tuning_guide	629	%%PORTDOCS%%%%DOCSDIR%%/tuning_guide
613	%%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst	630	%%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst
614	%%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst	631	%%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst
Lines 649-654 Link Here
649	%%DATADIR%%/dictionary.aptis	666	%%DATADIR%%/dictionary.aptis
650	%%DATADIR%%/dictionary.aruba	667	%%DATADIR%%/dictionary.aruba
651	%%DATADIR%%/dictionary.ascend	668	%%DATADIR%%/dictionary.ascend
		669	%%DATADIR%%/dictionary.ascend.illegal
652	%%DATADIR%%/dictionary.asn	670	%%DATADIR%%/dictionary.asn
653	%%DATADIR%%/dictionary.avaya	671	%%DATADIR%%/dictionary.avaya
654	%%DATADIR%%/dictionary.azaire	672	%%DATADIR%%/dictionary.azaire
Lines 671-676 Link Here
671	%%DATADIR%%/dictionary.dhcp	689	%%DATADIR%%/dictionary.dhcp
672	%%DATADIR%%/dictionary.digium	690	%%DATADIR%%/dictionary.digium
673	%%DATADIR%%/dictionary.epygi	691	%%DATADIR%%/dictionary.epygi
		692	%%DATADIR%%/dictionary.eltex
674	%%DATADIR%%/dictionary.ericsson	693	%%DATADIR%%/dictionary.ericsson
675	%%DATADIR%%/dictionary.erx	694	%%DATADIR%%/dictionary.erx
676	%%DATADIR%%/dictionary.extreme	695	%%DATADIR%%/dictionary.extreme
Lines 702-707 Link Here
702	%%DATADIR%%/dictionary.microsoft	721	%%DATADIR%%/dictionary.microsoft
703	%%DATADIR%%/dictionary.mikrotik	722	%%DATADIR%%/dictionary.mikrotik
704	%%DATADIR%%/dictionary.motorola	723	%%DATADIR%%/dictionary.motorola
		724	%%DATADIR%%/dictionary.motorola.illegal
705	%%DATADIR%%/dictionary.motorola.wimax	725	%%DATADIR%%/dictionary.motorola.wimax
706	%%DATADIR%%/dictionary.navini	726	%%DATADIR%%/dictionary.navini
707	%%DATADIR%%/dictionary.netscreen	727	%%DATADIR%%/dictionary.netscreen
Lines 755-762 Link Here
755	%%DATADIR%%/dictionary.telkom	775	%%DATADIR%%/dictionary.telkom
756	%%DATADIR%%/dictionary.trapeze	776	%%DATADIR%%/dictionary.trapeze
757	%%DATADIR%%/dictionary.tropos	777	%%DATADIR%%/dictionary.tropos
		778	%%DATADIR%%/dictionary.ukerna
758	%%DATADIR%%/dictionary.unix	779	%%DATADIR%%/dictionary.unix
759	%%DATADIR%%/dictionary.usr	780	%%DATADIR%%/dictionary.usr
		781	%%DATADIR%%/dictionary.usr.illegal
760	%%DATADIR%%/dictionary.utstarcom	782	%%DATADIR%%/dictionary.utstarcom
761	%%DATADIR%%/dictionary.valemount	783	%%DATADIR%%/dictionary.valemount
762	%%DATADIR%%/dictionary.versanet	784	%%DATADIR%%/dictionary.versanet
Lines 771-776 Link Here
771	%%DATADIR%%/dictionary.xylan	793	%%DATADIR%%/dictionary.xylan
772	%%DATADIR%%/dictionary.zyxel	794	%%DATADIR%%/dictionary.zyxel
773	@dirrm %%DATADIR%%	795	@dirrm %%DATADIR%%
		796	@dirrmtry share/freeradius
		797	@dirrmtry share/examples/freeradius/raddb/sites-available
		798	@dirrmtry share/examples/freeradius/raddb/modules
		799	@dirrmtry share/examples/freeradius/raddb
		800	@dirrmtry share/examples/freeradius
		801	@dirrmtry share/doc/freeradius/rfc
		802	@dirrmtry share/doc/freeradius
		803	@dirrmtry %%LIBDIR%%
774	@exec if [ ! -d /var/log/radacct ]; then mkdir -p /var/log/radacct; chmod -R go= /var/log/radacct; fi	804	@exec if [ ! -d /var/log/radacct ]; then mkdir -p /var/log/radacct; chmod -R go= /var/log/radacct; fi
775	@exec for i in /var/log/radius.log /var/log/radutmp /var/log/radwtmp; do if [ ! -f ${i} ]; then touch ${i}; chmod go= ${i}; fi; done	805	@exec for i in /var/log/radius.log /var/log/radutmp /var/log/radwtmp; do if [ ! -f ${i} ]; then touch ${i}; chmod go= ${i}; fi; done
776	@exec mkdir -p /var/run/radiusd	806	@exec mkdir -p /var/run/radiusd




diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
--- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2011-06-20 10:57:14.000000000 -0400
+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2011-06-21 15:18:44.000000000 -0400
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.10 .

 			{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 		fi
diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in ./configure.in
--- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2011-06-20 10:57:14.000000000 -0400
+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2011-06-21 15:18:44.000000000 -0400
@@ -1,5 +1,5 @@
 AC_INIT(sql_oracle.c)
-AC_REVISION($Revision: 1.10 $)

 AC_DEFUN(modname,[rlm_sql_oracle])
 
 fail=
@@ -18,125 +18,145 @@
 	dnl # defined anyways.
 	dnl #
 

-		if test "x$oracle_lib_dir" != "x" ; then
-			ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "
-		fi
-		for oracle_version in 10 11 9 ""; do
-			LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
-			AC_TRY_LINK([#include <oci.h>
-		
-					static OCIEnv           *p_env;
-					static OCIError         *p_err;
-					static OCISvcCtx        *p_svc;
-					static OCIStmt          *p_sql;
-					static OCIDefine        *p_dfn    = (OCIDefine *) 0;
-					static OCIBind          *p_bnd    = (OCIBind *) 0;
-				],
-				[
-					  int             p_bvi;
-					  char            p_sli[20];
-					  int             rc;
-					  char            errbuf[100];
-					  int             errcode;
-					
-					  rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
-							  (dvoid * (*)(dvoid *, size_t)) 0,
-							  (dvoid * (*)(dvoid *, dvoid *, size_t))0,
-							  (void (*)(dvoid *, dvoid *)) 0 );
-
-				],
-				ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}",
-				ORACLE_LIBS=
+		FR_LOCATE_DIR(oracle_include_dir,oci.h)
+
-		LIBS="$old_LIBS"
+		for try in /usr/local/include/oracle /usr/local/oracle/include $oracle_include_dir; do
+			CFLAGS="$old_CFLAGS -I$try"
+			AC_TRY_COMPILE([#include <oci.h>],
+				[ int a = 1; ],
+				ORACLE_INCLUDE="-I$try",
+				ORACLE_INCLUDE=
 			)
-			if test "x$ORACLE_LIBS" != "x"; then
-				break
+			if test "x$ORACLE_INCLUDE" != "x"; then
+				break;
 			fi
 		done
-
-		LIBS="$old_LIBS"
 		CFLAGS="$old_CFLAGS"
 	fi
 

+
 		if test "x$ORACLE_LIBS" = "x"; then
 			AC_MSG_WARN([oracle libraries not found.  Use --with-oracle-lib-dir=<path>.])
-			fail="$fail libclntsh libnnz${oracle_version}"
+			fail="$fail liboracleclient"
 		else
-			sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"




--- 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 158413

Lines 8-15 Link Here

(-)Makefile (-6 / +3 lines)
8	#	8	#
9		9
10	PORTNAME= freeradius	10	PORTNAME= freeradius
11	DISTVERSION= 2.1.10	11	DISTVERSION= 2.1.11
12	PORTREVISION= 2
13	CATEGORIES= net	12	CATEGORIES= net
14	MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \	13	MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
15	ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \	14	ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
Lines 61-66 Link Here
61		60
62	.include <bsd.port.options.mk>	61	.include <bsd.port.options.mk>
63		62
		63	LICENSE= GPLv2
		64
64	# Default requirements for rc script	65	# Default requirements for rc script
65	_REQUIRE= NETWORKING SERVERS	66	_REQUIRE= NETWORKING SERVERS
66		67
Lines 156-163 Link Here
156	USE_PERL5= yes	157	USE_PERL5= yes
157	CONFIGURE_ARGS+=--with-rlm_perl	158	CONFIGURE_ARGS+=--with-rlm_perl
158	PLIST_SUB+= RLMPERL=""	159	PLIST_SUB+= RLMPERL=""
159	# temporary workaround for libtool issue until FR 2.2.x is released
160	CFLAGS+= -DHAVE_LT_DLADVISE_INIT
161	.else	160	.else
162	CONFIGURE_ARGS+=--without-perl --without-rlm_perl	161	CONFIGURE_ARGS+=--without-perl --without-rlm_perl
163	PLIST_SUB+= RLMPERL="@comment "	162	PLIST_SUB+= RLMPERL="@comment "
Lines 168-175 Link Here
168	CONFIGURE_ARGS+=--with-rlm_python \	167	CONFIGURE_ARGS+=--with-rlm_python \
169	--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \	168	--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
170	--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}	169	--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
171	# temporary workaround for libtool issue until FR 2.2.x is released
172	CFLAGS+= -DHAVE_LT_DLADVISE_INIT
173	PLIST_SUB+= RLMPYTHON=""	170	PLIST_SUB+= RLMPYTHON=""
174	.else	171	.else
175	CONFIGURE_ARGS+=--without-rlm_python	172	CONFIGURE_ARGS+=--without-rlm_python

Lines 1-6 Link Here

(-)files/patch-rlm_sql_oracle (-39 / +42 lines)
1	diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	1	diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
2	--- ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure 2010-09-28 07:03:56.000000000 -0400	2	--- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure 2011-06-20 10:57:14.000000000 -0400
3	+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure 2010-05-24 01:40:58.000000000 -0400	3	+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure 2011-06-21 15:18:44.000000000 -0400
4	@@ -1,5 +1,5 @@	4	@@ -1,5 +1,5 @@
5	#! /bin/sh	5	#! /bin/sh
6	-# From configure.in Revision: 1.10 .	6	-# From configure.in Revision: 1.10 .
Lines 560-568 Link Here
560	{ echo "$as_me:$LINENO: result: yes" >&5	560	{ echo "$as_me:$LINENO: result: yes" >&5
561	echo "${ECHO_T}yes" >&6; }	561	echo "${ECHO_T}yes" >&6; }
562	fi	562	fi
563	diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	563	diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in ./configure.in
564	--- ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in 2010-09-28 07:03:56.000000000 -0400	564	--- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in 2011-06-20 10:57:14.000000000 -0400
565	+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in 2010-05-24 01:40:58.000000000 -0400	565	+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in 2011-06-21 15:18:44.000000000 -0400
566	@@ -1,5 +1,5 @@	566	@@ -1,5 +1,5 @@
567	AC_INIT(sql_oracle.c)	567	AC_INIT(sql_oracle.c)
568	-AC_REVISION($Revision: 1.10 $)	568	-AC_REVISION($Revision: 1.10 $)
Lines 570-576 Link Here
570	AC_DEFUN(modname,[rlm_sql_oracle])	570	AC_DEFUN(modname,[rlm_sql_oracle])
571		571
572	fail=	572	fail=
573	@@ -18,120 +18,145 @@	573	@@ -18,125 +18,145 @@
574	dnl # defined anyways.	574	dnl # defined anyways.
575	dnl #	575	dnl #
576		576
Lines 697-742 Link Here
697	- if test "x$oracle_lib_dir" != "x" ; then	697	- if test "x$oracle_lib_dir" != "x" ; then
698	- ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "	698	- ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "
699	- fi	699	- fi
700	- LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10"	700	- for oracle_version in 10 11 9 ""; do
701	- AC_TRY_LINK([#include <oci.h>	701	- LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
702	-	702	- AC_TRY_LINK([#include <oci.h>
703	- static OCIEnv *p_env;	703	-
704	- static OCIError *p_err;	704	- static OCIEnv *p_env;
705	- static OCISvcCtx *p_svc;	705	- static OCIError *p_err;
706	- static OCIStmt *p_sql;	706	- static OCISvcCtx *p_svc;
707	- static OCIDefine p_dfn = (OCIDefine ) 0;	707	- static OCIStmt *p_sql;
708	- static OCIBind p_bnd = (OCIBind ) 0;	708	- static OCIDefine p_dfn = (OCIDefine ) 0;
709	- ],	709	- static OCIBind p_bnd = (OCIBind ) 0;
710	- [	710	- ],
711	- int p_bvi;	711	- [
712	- char p_sli[20];	712	- int p_bvi;
713	- int rc;	713	- char p_sli[20];
714	- char errbuf[100];	714	- int rc;
715	- int errcode;	715	- char errbuf[100];
716	-	716	- int errcode;
717	- rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid )0, / Initialize OCI */	717	-
718	- (dvoid * ()(dvoid , size_t)) 0,	718	- rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid )0, / Initialize OCI */
719	- (dvoid * ()(dvoid , dvoid *, size_t))0,	719	- (dvoid * ()(dvoid , size_t)) 0,
720	- (void ()(dvoid , dvoid *)) 0 );	720	- (dvoid * ()(dvoid , dvoid *, size_t))0,
721	-	721	- (void ()(dvoid , dvoid *)) 0 );
722	- ],	722	-
723	- ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10",	723	- ],
724	- ORACLE_LIBS=	724	- ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}",
725	- )	725	- ORACLE_LIBS=
726	+ FR_LOCATE_DIR(oracle_include_dir,oci.h)	726	+ FR_LOCATE_DIR(oracle_include_dir,oci.h)
727		727	+
728	- LIBS="$old_LIBS"
729	+ for try in /usr/local/include/oracle /usr/local/oracle/include $oracle_include_dir; do	728	+ for try in /usr/local/include/oracle /usr/local/oracle/include $oracle_include_dir; do
730	+ CFLAGS="$old_CFLAGS -I$try"	729	+ CFLAGS="$old_CFLAGS -I$try"
731	+ AC_TRY_COMPILE([#include <oci.h>],	730	+ AC_TRY_COMPILE([#include <oci.h>],
732	+ [ int a = 1; ],	731	+ [ int a = 1; ],
733	+ ORACLE_INCLUDE="-I$try",	732	+ ORACLE_INCLUDE="-I$try",
734	+ ORACLE_INCLUDE=	733	+ ORACLE_INCLUDE=
735	+ )	734	)
		735	- if test "x$ORACLE_LIBS" != "x"; then
		736	- break
736	+ if test "x$ORACLE_INCLUDE" != "x"; then	737	+ if test "x$ORACLE_INCLUDE" != "x"; then
737	+ break;	738	+ break;
738	+ fi	739	fi
739	+ done	740	done
		741	-
		742	- LIBS="$old_LIBS"
740	CFLAGS="$old_CFLAGS"	743	CFLAGS="$old_CFLAGS"
741	fi	744	fi
742		745
Lines 795-801 Link Here
795	+	798	+
796	if test "x$ORACLE_LIBS" = "x"; then	799	if test "x$ORACLE_LIBS" = "x"; then
797	AC_MSG_WARN([oracle libraries not found. Use --with-oracle-lib-dir=<path>.])	800	AC_MSG_WARN([oracle libraries not found. Use --with-oracle-lib-dir=<path>.])
798	- fail="$fail libclntsh libnnz10"	801	- fail="$fail libclntsh libnnz${oracle_version}"
799	+ fail="$fail liboracleclient"	802	+ fail="$fail liboracleclient"
800	else	803	else
801	- sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"	804	- sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"

Removed Link Here

(-)files/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);