rpms/freeradius
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix white space formatting that cause patch not to apply

Browse Source
This commit is contained in:
John Dennis 2012-10-03 16:05:00 -04:00
parent a042850900
commit b1012065ab
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
freeradius-exclude-config-file.patch
View File

@ -1,10 +1,10 @@
diff -b -u -r freeradius-server-2.2.0.orig/src/include/libradius.h freeradius-server-2.2.0.configfile/src/include/libradius.h
diff -u -r freeradius-server-2.2.0.orig/src/include/libradius.h freeradius-server-2.2.0.configfile/src/include/libradius.h
--- freeradius-server-2.2.0.orig/src/include/libradius.h 2012-09-10 07:51:34.000000000 -0400
+++ freeradius-server-2.2.0.configfile/src/include/libradius.h 2012-10-03 09:36:55.764852014 -0400
@@ -415,6 +415,17 @@
struct sockaddr_storage *sa, socklen_t *salen);
+++ freeradius-server-2.2.0.configfile/src/include/libradius.h 2012-10-03 15:45:13.002106110 -0400
@@ -416,6 +416,17 @@
int fr_sockaddr2ipaddr(const struct sockaddr_storage *sa, socklen_t salen,
fr_ipaddr_t *ipaddr, int * port);
+int
+str_starts_with(const char *subject, const char *pattern);
+int
@ -17,11 +17,11 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/include/libradius.h freeradius-se
+fr_exclude_config_file(const char *basename);
+
#ifdef ASCEND_BINARY
diff -b -u -r freeradius-server-2.2.0.orig/src/lib/misc.c freeradius-server-2.2.0.configfile/src/lib/misc.c
/* filters.c */
diff -u -r freeradius-server-2.2.0.orig/src/lib/misc.c freeradius-server-2.2.0.configfile/src/lib/misc.c
--- freeradius-server-2.2.0.orig/src/lib/misc.c 2012-09-10 07:51:34.000000000 -0400
+++ freeradius-server-2.2.0.configfile/src/lib/misc.c 2012-10-03 10:29:43.332507533 -0400
+++ freeradius-server-2.2.0.configfile/src/lib/misc.c 2012-10-03 15:50:27.717357782 -0400
@@ -28,6 +28,7 @@
#include <ctype.h>
#include <sys/file.h>
@ -30,11 +30,12 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/lib/misc.c freeradius-server-2.2.
int fr_dns_lookups = 0;
int fr_debug_flag = 0;
@@ -650,3 +651,161 @@
@@ -650,3 +651,162 @@
return 1;
}
+
+
+/*
+ * Return true if subject starts with pattern, false otherwise.
+ * subject and pattern are NULL terminated strings.
@ -192,9 +193,9 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/lib/misc.c freeradius-server-2.2.
+}
+
+#endif
diff -b -u -r freeradius-server-2.2.0.orig/src/main/client.c freeradius-server-2.2.0.configfile/src/main/client.c
diff -u -r freeradius-server-2.2.0.orig/src/main/client.c freeradius-server-2.2.0.configfile/src/main/client.c
--- freeradius-server-2.2.0.orig/src/main/client.c 2012-09-10 07:51:34.000000000 -0400
+++ freeradius-server-2.2.0.configfile/src/main/client.c 2012-10-03 10:53:33.166452136 -0400
+++ freeradius-server-2.2.0.configfile/src/main/client.c 2012-10-03 15:52:35.351241760 -0400
@@ -845,13 +845,24 @@
}
@ -236,9 +237,9 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/main/client.c freeradius-server-2
snprintf(buf2, sizeof(buf2), "%s/%s",
value, dp->d_name);
diff -b -u -r freeradius-server-2.2.0.orig/src/main/conffile.c freeradius-server-2.2.0.configfile/src/main/conffile.c
diff -u -r freeradius-server-2.2.0.orig/src/main/conffile.c freeradius-server-2.2.0.configfile/src/main/conffile.c
--- freeradius-server-2.2.0.orig/src/main/conffile.c 2012-09-10 07:51:34.000000000 -0400
+++ freeradius-server-2.2.0.configfile/src/main/conffile.c 2012-10-03 10:55:05.918611881 -0400
+++ freeradius-server-2.2.0.configfile/src/main/conffile.c 2012-10-03 15:54:17.465348844 -0400
@@ -1512,12 +1512,23 @@
}
@ -278,9 +279,9 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/main/conffile.c freeradius-server
snprintf(buf2, sizeof(buf2), "%s%s",
value, dp->d_name);
diff -b -u -r freeradius-server-2.2.0.orig/src/modules/rlm_policy/parse.c freeradius-server-2.2.0.configfile/src/modules/rlm_policy/parse.c
diff -u -r freeradius-server-2.2.0.orig/src/modules/rlm_policy/parse.c freeradius-server-2.2.0.configfile/src/modules/rlm_policy/parse.c
--- freeradius-server-2.2.0.orig/src/modules/rlm_policy/parse.c 2012-09-10 07:51:34.000000000 -0400
+++ freeradius-server-2.2.0.configfile/src/modules/rlm_policy/parse.c 2012-10-03 10:57:16.985425570 -0400
+++ freeradius-server-2.2.0.configfile/src/modules/rlm_policy/parse.c 2012-10-03 15:55:29.736715648 -0400
@@ -1584,13 +1584,22 @@
}
@ -307,8 +308,3 @@ diff -b -u -r freeradius-server-2.2.0.orig/src/modules/rlm_policy/parse.c freera
strlcpy(p, dp->d_name,
sizeof(buffer) - (p - buffer));
@@ -1704,4 +1713,3 @@
return 1;
}
-