get rid of old patches
This commit is contained in:
John Dennis
parent
ee7e5da19f
commit
adfb55e781
@ -1,11 +0,0 @@
|
||||
--- freeradius-0.9.0/src/modules/rlm_krb5/rlm_krb5.c.link 2003-03-17 22:38:52.000000000 +0100
|
||||
+++ freeradius-0.9.0/src/modules/rlm_krb5/rlm_krb5.c 2003-09-01 15:54:10.000000000 +0200
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
/* krb5 includes */
|
||||
#include <krb5.h>
|
||||
-#include <com_err.h>
|
||||
+#include <et/com_err.h>
|
||||
|
||||
#ifndef HEIMDAL_KRB5
|
||||
static int verify_krb5_tgt(krb5_context context, const char *user,
|
||||
@ -1,21 +0,0 @@
|
||||
Remove the directory component from all paths. This lets libpam search its
|
||||
default directory for modules, which is needed on multilib systems because
|
||||
a 64-bit binary can't use the 32-bit modules which are stored in /lib/security.
|
||||
|
||||
Use include system-auth to make password-checking mechanisms configurable by authconfig.
|
||||
|
||||
--- freeradius-0.9.0/redhat/radiusd-pam 2003-09-22 10:07:03.000000000 -0400
|
||||
+++ freeradius-0.9.0/redhat/radiusd-pam 2003-09-22 10:07:13.000000000 -0400
|
||||
@@ -1,7 +1,6 @@
|
||||
#%PAM-1.0
|
||||
-auth required /lib/security/pam_unix_auth.so shadow nullok
|
||||
-auth required /lib/security/pam_nologin.so
|
||||
-account required /lib/security/pam_unix_acct.so
|
||||
-password required /lib/security/pam_cracklib.so
|
||||
-password required /lib/security/pam_unix_password.so shadow nullok use_authtok
|
||||
-session required /lib/security/pam_unix_session.so
|
||||
+auth include system-auth
|
||||
+account required pam_nologin.so
|
||||
+account include system-auth
|
||||
+password include system-auth
|
||||
+session include system-auth
|
||||
@ -1,45 +0,0 @@
|
||||
--- freeradius-1.0.0-pre3/src/modules/rlm_eap/eap.c.ltdl_no_la 2004-05-05 19:20:40.000000000 +0300
|
||||
+++ freeradius-1.0.0-pre3/src/modules/rlm_eap/eap.c 2004-06-29 12:33:04.000000000 +0300
|
||||
@@ -82,7 +82,11 @@
|
||||
snprintf(buffer, sizeof(buffer), "rlm_eap_%s", eaptype_name);
|
||||
|
||||
/* Link the loaded EAP-Type */
|
||||
- handle = lt_dlopenext(buffer);
|
||||
+ char *tmp = malloc(strlen(buffer) + 4);
|
||||
+ strcpy(tmp, buffer);
|
||||
+ strcat(tmp, ".so");
|
||||
+ handle = lt_dlopenext(tmp);
|
||||
+ free(tmp);
|
||||
if (handle == NULL) {
|
||||
radlog(L_ERR, "rlm_eap: Failed to link EAP-Type/%s: %s",
|
||||
eaptype_name, lt_dlerror());
|
||||
--- freeradius-1.0.0-pre3/src/main/modules.c.ltdl_no_la 2004-04-23 22:50:29.000000000 +0300
|
||||
+++ freeradius-1.0.0-pre3/src/main/modules.c 2004-06-29 12:30:42.000000000 +0300
|
||||
@@ -204,7 +204,11 @@
|
||||
/*
|
||||
* Keep the handle around so we can dlclose() it.
|
||||
*/
|
||||
- handle = lt_dlopenext(module_name);
|
||||
+ char *tmp = malloc(strlen(module_name) + 4);
|
||||
+ strcpy(tmp, module_name);
|
||||
+ strcat(tmp, ".so");
|
||||
+ handle = lt_dlopenext(tmp);
|
||||
+ free(tmp);
|
||||
if (handle == NULL) {
|
||||
radlog(L_ERR|L_CONS, "%s[%d] Failed to link to module '%s':"
|
||||
" %s\n", cffilename, cflineno, module_name, lt_dlerror());
|
||||
--- freeradius-1.0.0-pre3/src/modules/rlm_sql/rlm_sql.c.ltdl_no_la 2004-05-25 09:56:43.000000000 +0300
|
||||
+++ freeradius-1.0.0-pre3/src/modules/rlm_sql/rlm_sql.c 2004-06-29 12:30:42.000000000 +0300
|
||||
@@ -668,7 +668,11 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
- inst->handle = lt_dlopenext(inst->config->sql_driver);
|
||||
+ char *tmp = malloc(strlen(inst->config->sql_driver) + 4);
|
||||
+ strcpy(tmp, inst->config->sql_driver);
|
||||
+ strcat(tmp, ".so");
|
||||
+ inst->handle = lt_dlopenext(tmp);
|
||||
+ free(tmp);
|
||||
if (inst->handle == NULL) {
|
||||
radlog(L_ERR, "rlm_sql (%s): Could not link driver %s: %s",
|
||||
inst->config->xlat_name, inst->config->sql_driver,
|
||||
@ -1,15 +0,0 @@
|
||||
--- freeradius-1.0.0-pre3/raddb/ldap.attrmap.samba3 2004-07-05 11:57:14.861611615 +0200
|
||||
+++ freeradius-1.0.0-pre3/raddb/ldap.attrmap 2004-07-05 11:57:47.134087708 +0200
|
||||
@@ -24,9 +24,9 @@
|
||||
checkItem Simultaneous-Use radiusSimultaneousUse
|
||||
checkItem Called-Station-Id radiusCalledStationId
|
||||
checkItem Calling-Station-Id radiusCallingStationId
|
||||
-checkItem LM-Password lmPassword
|
||||
-checkItem NT-Password ntPassword
|
||||
-checkItem SMB-Account-CTRL-TEXT acctFlags
|
||||
+checkItem LM-Password sambaLMPassword
|
||||
+checkItem NT-Password sambaNTPassword
|
||||
+checkItem SMB-Account-CTRL-TEXT sambaAcctFlags
|
||||
checkItem Expiration radiusExpiration
|
||||
|
||||
replyItem Service-Type radiusServiceType
|
||||
@ -1,11 +0,0 @@
|
||||
--- freeradius-1.1.2/raddb/radiusd.conf.in.no_sql_inc 2006-08-15 11:38:23.000000000 +0200
|
||||
+++ freeradius-1.1.2/raddb/radiusd.conf.in 2006-08-15 11:38:25.000000000 +0200
|
||||
@@ -1245,7 +1245,7 @@
|
||||
# For MS-SQL, use: ${confdir}/mssql.conf
|
||||
# For Oracle, use: ${confdir}/oraclesql.conf
|
||||
#
|
||||
- $INCLUDE ${confdir}/sql.conf
|
||||
+# $INCLUDE ${confdir}/sql.conf
|
||||
|
||||
|
||||
# For Cisco VoIP specific accounting with Postgresql,
|
||||
@ -1,13 +0,0 @@
|
||||
--- freeradius-1.1.2/src/modules/rules.mak.build 2006-05-25 18:24:40.000000000 +0200
|
||||
+++ freeradius-1.1.2/src/modules/rules.mak 2006-06-01 16:12:49.000000000 +0200
|
||||
@@ -113,8 +113,8 @@
|
||||
$(TARGET).la: $(LT_OBJS)
|
||||
$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
|
||||
-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
|
||||
- -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
|
||||
- $(RLM_LIBS) $(LIBS)
|
||||
+ -rpath $(libdir) $^ \
|
||||
+ $(RLM_LIBS) -L$(libdir) $(LIBS)
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
@ -1,37 +0,0 @@
|
||||
diff -up freeradius-1.1.7/raddb/radiusd.conf.in.db_dir freeradius-1.1.7/raddb/radiusd.conf.in
|
||||
--- freeradius-1.1.7/raddb/radiusd.conf.in.db_dir 2007-08-07 15:41:35.000000000 +0200
|
||||
+++ freeradius-1.1.7/raddb/radiusd.conf.in 2007-08-07 15:44:47.000000000 +0200
|
||||
@@ -33,6 +33,11 @@ radacctdir = @radacctdir@
|
||||
confdir = ${raddbdir}
|
||||
run_dir = ${localstatedir}/run/radiusd
|
||||
|
||||
+# Location of db files
|
||||
+# Please use this directory for all db files (e.g. db.daily, db.ippool and
|
||||
+# db.ipindex).
|
||||
+db_dir = ${localstatedir}/lib/radiusd
|
||||
+
|
||||
#
|
||||
# The logging messages for the server are appended to the
|
||||
# tail of this file.
|
||||
@@ -1398,7 +1403,7 @@ $INCLUDE ${confdir}/eap.conf
|
||||
# 'check-name' attribute.
|
||||
#
|
||||
counter daily {
|
||||
- filename = ${raddbdir}/db.daily
|
||||
+ filename = ${db_dir}/db.daily
|
||||
key = User-Name
|
||||
count-attribute = Acct-Session-Time
|
||||
reset = daily
|
||||
@@ -1713,10 +1718,10 @@ $INCLUDE ${confdir}/eap.conf
|
||||
cache-size = 800
|
||||
|
||||
# session-db: The main db file used to allocate ip's to clients
|
||||
- session-db = ${raddbdir}/db.ippool
|
||||
+ session-db = ${db_dir}/db.ippool
|
||||
|
||||
# ip-index: Helper db index file used in multilink
|
||||
- ip-index = ${raddbdir}/db.ipindex
|
||||
+ ip-index = ${db_dir}/db.ipindex
|
||||
|
||||
# override: Will this ippool override a Framed-IP-Address already set
|
||||
override = no
|
||||
@ -1,72 +0,0 @@
|
||||
diff -up freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c.ldap freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c
|
||||
--- freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c.ldap 2007-06-18 11:00:27.000000000 +0200
|
||||
+++ freeradius-1.1.7/src/modules/rlm_ldap/rlm_ldap.c 2007-08-06 14:40:31.000000000 +0200
|
||||
@@ -1041,7 +1041,7 @@ static int ldap_groupcmp(void *instance,
|
||||
radlog(L_ERR, "rlm_ldap: Add ldap connections are in use");
|
||||
return 1;
|
||||
}
|
||||
- if ((res = perform_search(inst, conn, vp_user_dn->strvalue, LDAP_SCOPE_BASE,
|
||||
+ if ((res = perform_search(inst, conn, (char *)vp_user_dn->strvalue, LDAP_SCOPE_BASE,
|
||||
filter, group_attrs,&result)) != RLM_MODULE_OK){
|
||||
DEBUG("rlm_ldap::ldap_groupcmp: Search returned error");
|
||||
ldap_release_conn(conn_id, inst->conns);
|
||||
@@ -1356,7 +1356,7 @@ ldap_authorize(void *instance, REQUEST *
|
||||
|
||||
strNcpy(filter,inst->base_filter,sizeof(filter));
|
||||
if (user_profile)
|
||||
- profile = user_profile->strvalue;
|
||||
+ profile = (char *)user_profile->strvalue;
|
||||
if (profile && strlen(profile)){
|
||||
if ((res = perform_search(instance, conn,
|
||||
profile, LDAP_SCOPE_BASE,
|
||||
@@ -1460,7 +1460,7 @@ ldap_authorize(void *instance, REQUEST *
|
||||
}
|
||||
added_known_password = 1;
|
||||
passwd_len = strlen(passwd_val);
|
||||
- strncpy(passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
|
||||
+ strncpy((char *)passwd_item->strvalue,passwd_val,MAX_STRING_LEN - 1);
|
||||
passwd_item->length = (passwd_len > (MAX_STRING_LEN - 1)) ? (MAX_STRING_LEN - 1) : passwd_len;
|
||||
pairadd(&request->config_items,passwd_item);
|
||||
DEBUG("rlm_ldap: Added password %s in check items",passwd_item->strvalue);
|
||||
@@ -1804,12 +1804,12 @@ ldap_authenticate(void *instance, REQUES
|
||||
ldap_msgfree(result);
|
||||
}
|
||||
|
||||
- user_dn = vp_user_dn->strvalue;
|
||||
+ user_dn = (char *)vp_user_dn->strvalue;
|
||||
|
||||
DEBUG("rlm_ldap: user DN: %s", user_dn);
|
||||
|
||||
#ifndef NOVELL
|
||||
- ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
|
||||
+ ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
|
||||
1, &res, NULL);
|
||||
#else
|
||||
|
||||
@@ -1954,7 +1954,7 @@ retry:
|
||||
}
|
||||
}
|
||||
|
||||
- ld_user = ldap_connect(instance, user_dn, request->password->strvalue,
|
||||
+ ld_user = ldap_connect(instance, user_dn, (char *)request->password->strvalue,
|
||||
1, &res, &err);
|
||||
|
||||
if(err != NULL){
|
||||
@@ -2208,7 +2208,7 @@ ldap_connect(void *instance, const char
|
||||
|
||||
#ifdef HAVE_LDAP_INT_TLS_CONFIG
|
||||
|
||||
- if ( ldap_int_tls_config( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
|
||||
+ if ( ldap_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT,
|
||||
(inst->tls_require_cert) )
|
||||
!= LDAP_OPT_SUCCESS) {
|
||||
radlog(L_ERR, "rlm_ldap: could not set "
|
||||
@@ -2622,7 +2622,7 @@ ldap_pairget(LDAP * ld, LDAPMessage * en
|
||||
|
||||
if (do_xlat) {
|
||||
newpair->flags.do_xlat = 1;
|
||||
- strNcpy(newpair->strvalue, buf,
|
||||
+ strNcpy((char *)newpair->strvalue, buf,
|
||||
sizeof(newpair->strvalue));
|
||||
newpair->length = 0;
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
|
||||
--- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb 2002-09-14 01:13:58.000000000 +0200
|
||||
+++ freeradius-1.1.7/redhat/rc.radiusd-redhat 2007-09-17 17:20:07.000000000 +0200
|
||||
@@ -20,6 +20,14 @@
|
||||
# Copyright (C) 2001 The FreeRADIUS Project http://www.freeradius.org
|
||||
#
|
||||
|
||||
+### BEGIN INIT INFO
|
||||
+# Provides: RADIUS server daemon
|
||||
+# Required-Start: $local_fs $network
|
||||
+# Required-Stop: $local_fs $network
|
||||
+# Short-Description: start and stop RADIUS server daemon
|
||||
+# Description: radiusd - Authentication, Authorization and Accounting server
|
||||
+### END INIT INFO
|
||||
+
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
@@ -27,13 +35,17 @@ RADIUSD=/usr/sbin/radiusd
|
||||
LOCKF=/var/lock/subsys/radiusd
|
||||
CONFIG=/etc/raddb/radiusd.conf
|
||||
|
||||
-[ -f $RADIUSD ] || exit 0
|
||||
-[ -f $CONFIG ] || exit 0
|
||||
+[ -f $RADIUSD ] || exit 5
|
||||
+[ -f $CONFIG ] || exit 6
|
||||
|
||||
RETVAL=0
|
||||
|
||||
+status radiusd
|
||||
+running=$?
|
||||
+
|
||||
case "$1" in
|
||||
start)
|
||||
+ [ $running -eq 0 ] && exit 0
|
||||
echo -n $"Starting RADIUS server: "
|
||||
daemon $RADIUSD -y
|
||||
RETVAL=$?
|
||||
@@ -42,6 +54,7 @@ case "$1" in
|
||||
ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
|
||||
;;
|
||||
stop)
|
||||
+ [ $running -eq 0 ] || exit 0
|
||||
echo -n $"Stopping RADIUS server: "
|
||||
killproc $RADIUSD
|
||||
RETVAL=$?
|
||||
@@ -53,28 +66,28 @@ case "$1" in
|
||||
RETVAL=$?
|
||||
;;
|
||||
reload)
|
||||
+ [ $running -eq 0 ] || exit 7
|
||||
echo -n $"Reloading RADIUS server: "
|
||||
killproc $RADIUSD -HUP
|
||||
RETVAL=$?
|
||||
echo
|
||||
;;
|
||||
- restart)
|
||||
+ restart|force-reload)
|
||||
$0 stop
|
||||
sleep 3
|
||||
$0 start
|
||||
RETVAL=$?
|
||||
;;
|
||||
- condrestart)
|
||||
- if [ -f $LOCKF ]; then
|
||||
- $0 stop
|
||||
- sleep 3
|
||||
- $0 start
|
||||
- RETVAL=$?
|
||||
- fi
|
||||
+ condrestart|try-restart)
|
||||
+ [ $running -eq 0 ] || exit 0
|
||||
+ $0 stop
|
||||
+ sleep 3
|
||||
+ $0 start
|
||||
+ RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
|
||||
- exit 1
|
||||
+ RETVAL=2
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
Loading…
Reference in New Issue
Block a user