summaryrefslogtreecommitdiffstats
path: root/src/etc
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #3031 from NOYB/GitSync_Diff_Only_OptionChris Buechler2016-06-301-62/+133
|\ \ \ \ \ \
| * | | | | | GitSync Diff Only OptionNOYB2016-06-291-62/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff Option --diff SSD Friendlier Same as default but only copies files that are different, instead of every thing even though identical. Verbose Option --verbose Display constructed command. In combination with the --diff option, display the array of different and missing files. Dry Run Option --dry-run Run without syncing files. Fixes Files to copy variable state is used to determine whether or not to run the command. Tar options being passed in the files to copy variable causes the command to always run. Even if there are no files to be copied. Separate out tar options from files to copy variable so command only runs if there are files to be copied. Accommodate providing tar options such as '-C ./src' with the --minimal option. Resolve function redefinition that prevents running gitsync again in same dev shell session (command recall) (function_exists).
* | | | | | | Merge pull request #2994 from stilez/patch-31Chris Buechler2016-06-301-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Get modulus keysizestilez2016-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Useful utility function when it's necessary to verify that existing keys meets current practices
* | | | | | | | Merge pull request #3018 from phil-davis/usersettingsChris Buechler2016-06-304-8/+318
|\ \ \ \ \ \ \ \
| * | | | | | | | Feature #6388 custom GUI preference settings per userPhil Davis2016-06-234-8/+318
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #3029 from phil-davis/IPv6colonsChris Buechler2016-06-301-6/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Handle more invalid IPv6 formatsPhil Davis2016-06-301-6/+12
| | | | | | | |
* | | | | | | | Add playback files for disabling and enabling CARP maintenance mode. Ticket ↵Chris Buechler2016-06-292-0/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | #6560
* | | | | | | Merge pull request #2934 from k-paulius/patch-14Chris Buechler2016-06-291-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Flush link-local IPs so we do not get stale data and do not waste time ↵k-paulius2016-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleting IP if it is already set to fe80::1:1
* | | | | | | | Merge pull request #2944 from stilez/patch-23Chris Buechler2016-06-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing recommended digeststilez2016-05-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #3000 from stilez/patch-32Chris Buechler2016-06-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename item #12 in console menustilez2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console menu item #12 (_"pfSense/$product developer shell"_) has a pointless title that doesn't help users much. It also actively obscures from router admins the useful tools it contains which is a negative side-effect. * Describing it as a "developer" shell is redundant; it appears to try and obscure the fact it is useful to non-devs too. pfSsh.php isn't any more or less a "developer shell" than any other shell provided. Both shells can be used by developers or by end-user router admins, but its title of "dev tool" suggests it contains nothing of relevance to an end-user admin, which is very incorrect - it contains very useful packaged tools and versatility, to get the router recovered from a bad borking or if the web UI can't be used for any reason. * It also isn't just a "pfSense/$product" shell. It's a full-fledged PHP shell, and obscuring this also hides its usefulness. It's unlikely that non-dev users will "mess things up more with it" or "need protecting from themselves" - any user prone to do so would already have used option #8 and full shell access for that purpose. Renaming the menu item should help end-user admins, as the discoverability and usefulness that pfSsh.php provides will be more readily visible to users who might benefit from it.
* | | | | | | | | | Merge pull request #3024 from phil-davis/include_onceChris Buechler2016-06-284-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update include() to include_once()Phil Davis2016-06-284-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For safety, use include_once() when including various "side" files. There are a couple of instances of include("guiconfig,inc") that I changes to use require_once() to be consistent with everywhere else. The remaining cases of include() are just (hundreds of) head.inc and footer.inc - those are only at the start/end of the ordinary top-level interactive PHP files. There is no nested interaction of those to think about, so that should be fine.
* | | | | | | | | | | Shorten gwifip if whole socket path exceeds 100 charsDaniel Hoffend2016-06-291-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dpinger stopps with an error when the socketname exceeds over (around) 100 characters. The dpinger will not start and not deliver monitoring results to the WebUI. These long socket names can get created when using link-local addresses and long gateway names / interface scopes. See Ticket 6505
* | | | | | | | | | | Use a different delimiter for dpinger socket namesDaniel Hoffend2016-06-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently underscores are used to seperate gwifip, monitorip, etc, but underscors are also used in vlan subinterfaces like em0_vlan10 and therefore can't be used because the interface scope is appended to IPv6 link-local addresses.
* | | | | | | | | | | Set pipe_slot_limit to the maximum configured qlimit value. Move the ↵Chris Buechler2016-06-281-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_sysctl out if the block where it only gets run if dummynet isn't already loaded. Ticket #6553
* | | | | | | | | | | Clean up limiter text. Remove old commented out bit.Chris Buechler2016-06-281-16/+7
| | | | | | | | | | |
* | | | | | | | | | | Fix matching of chars in IPv6 address segmentsPhil Davis2016-06-281-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing regex here is wrong, it matches 0 or more of the hex digits but then there can be other rubbish in the string, in fact anything at all! It matches "az", "z", "qwerty" and so on. So the "return false" inside this "if" never happens. In most cases the later code catches problems, because it converts the string from hex to decimal (and things like "z" end up as decimal 0), then it does some back-conversion of the answer to hex and realizes something is different and so does not count the entry as one of the needed 8 valid segments of the IPv6 address. This goes wrong if the user supplies a string with 8 valid IPv6 hex pieces and 1 or more extra invalid ones anywhere in the list. In that case the code finds 8 good chunks and thinks that all is well. Try using the pfSense is_ipaddrv6() with strings like: $ipaddr = "1:2:3:4:5:6:7:z:a"; $ret = is_ipaddrv6($ipaddr); var_dump($ret); That returns true - which is not good! You can put the invalid items anywhere you like, as long as you have 8 valid items, such as: "1:2:3:xy:4:5:6:7:8" "gh:1:2:3:xy:4:5:6:7:8" "1:2:3:xy:4:5:6:7:8:qw" This change makes this initial validity check on the characters actually work, so it avoids the later code having to deal with that at all.
* | | | | | | | | | Merge pull request #3022 from phil-davis/require_onceChris Buechler2016-06-277-17/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Always use require_oncePhil Davis2016-06-277-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of require() and require_once() throughout the system is inconsistent, and "bugs" come up now and then when the order of "requires" is a bit different and some require() happens after the include file is already included/required. It seems to me that there is no harm at all in always using require_once().
* | | | | | | | | | | Run generate-privdefs.php to update priv.defs.incjim-p2016-06-271-1/+1
|/ / / / / / / / / /
* | | | | | | | | | bring back subnetv4_expand function used by pfblockerngChris Buechler2016-06-251-0/+14
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3013 from dennypage/masterChris Buechler2016-06-241-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add include of functions.inc for declaration of gettextDenny Page2016-06-191-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Include interface scope on IPv6 static routes to link local gateway IPs. ↵Chris Buechler2016-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket #6506
* | | | | | | | | | Revert "adding privileges and separating DNS Resolver overrides from general ↵Chris Buechler2016-06-231-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings" This reverts commit fc76a1e390c8ce9579df31457c74d1d0e572b78d.
* | | | | | | | | | Move /etc/ascii-art to /usr/local/share/pfSenseRenato Botelho2016-06-233-6/+2
| | | | | | | | | |
* | | | | | | | | | Remove unused mtree fileRenato Botelho2016-06-231-0/+0
| | | | | | | | | |
* | | | | | | | | | Make base package to populate /etc/platformRenato Botelho2016-06-231-1/+0
| | | | | | | | | |
* | | | | | | | | | Move iso_3166-1_list_en.xml to /usr/local/share/pfSenseRenato Botelho2016-06-232-1/+2
| | | | | | | | | |
* | | | | | | | | | Create /home on rc if it's necessary, then remove home/.empty file from git repoRenato Botelho2016-06-231-0/+4
| | | | | | | | | |
* | | | | | | | | | Move athctrl.sh to /usr/local/sbinRenato Botelho2016-06-232-1/+2
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3010 from NOYB/Remove_Duplicate_ListTags_EntryStephen Beaver2016-06-222-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicate listtags() entry 'member'.NOYB2016-06-182-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3006 from stilez/patch-33Stephen Beaver2016-06-221-24/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove subnet_expand()stilez2016-06-171-24/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | Function isn't used in main or packages repo, and in any case would need a complete rewrite to handle IPv6.
* | | | | | | | | Merge pull request #3001 from NewEraCracker/patch-pppoe-mpdStephen Beaver2016-06-221-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bad escapeshellarg logic on mpd executionNewEraCracker2016-06-151-2/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change single-quotes are applied in correct places
* | | | | | | | | Merge pull request #2988 from stilez/patch-28Stephen Beaver2016-06-221-22/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | missing "("stilez2016-05-311-1/+1
| | | | | | | | | |
| * | | | | | | | | optional arg for old behaviourstilez2016-05-311-3/+4
| | | | | | | | | |
| * | | | | | | | | Simplify convert_seconds_to_hms() and show days for large numbers of hoursstilez2016-05-311-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Function can be simplified and all "if" statements removed, using intdiv (or casting result as int for PHP < 7) and % for calcs and sprintf for padding. 2) Input validity check before trying to convert format 3) If time represented is large (eg uptime might be several months) then hours becomes unhelpful, it's clearer to show "4921:02:06" as "205d 01:02:06". (Leading "days" value not shown unless >=1 for simplicity)
* | | | | | | | | | Merge pull request #2982 from stilez/patch-26Stephen Beaver2016-06-222-14/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use global backup count instead of hardcoded value and remove redundant functionstilez2016-05-241-12/+1
| | | | | | | | | | |
| * | | | | | | | | | set default_config_backup_count based on platformstilez2016-05-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the same time the platform is being detected for PHP/GUI purposes, set the default number of backups. Also handle the case where (for any reason) detection fails, which it shouldn't, so the variables are still created
* | | | | | | | | | | Merge pull request #2942 from stilez/patch-22Stephen Beaver2016-06-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud