summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Substitute proper paths in ax25d.conf.Ralf Baechle2015-05-264-7/+69
| | | | | | | | | | | | | Depending on the prefix configured, the default ax25d.conf file may contain incorrects paths. Generate config file using the correct sbin dir. Assume node which is not part of ax25-tools to be installed with the same prefix. Don't probe - chances are the sysadmin of a node system is going to install it after ax25-tools so we'd likely have to guess which never is a good thing. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* axwrapper: Indent with tabs instead of spaces.Ralf Baechle2015-05-251-2/+2
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Add Tomi Manninen OH2BNS's axwrapper program.Ralf Baechle2015-05-259-1/+260
| | | | | | | | | | | | | Axwrapper first creates a pipe and then forks and execs the program <server-program> with arguments given at the axwrapper command line. The argv[0] argument is mandatory; further arguments are optional. The parent process then sits and waits for any I/O to and from the user and converts any carriage return characters from the user to line feeds and any line feeds from the program to carriage returns. This is useful when starting non-AX.25-aware programs from ax25d. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Add config files to rpm spec file.Ralf Baechle2015-05-231-1/+12
| | | | | | | Even though these files are just templates to get started with they make it much easier to the user trying to get started. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* rsparms: Fix harmless -Werror=format-security build error.Ralf Baechle2015-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | make[2]: Entering directory '/home/ralf/src/ax25/ax25-tools/rose' gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25_LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -MT rsparms.o -MD -MP -MF .deps/rsparms.Tpo -c -o rsparms.o rsparms.c rsparms.c: In function ‘nodes’: rsparms.c:71:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, nodes_usage); ^ rsparms.c:117:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, nodes_usage); ^ cc1: some warnings being treated as errors Makefile:462: recipe for target 'rsparms.o' failed make[2]: *** [rsparms.o] Error 1 make[2]: Leaving directory '/home/ralf/src/ax25/ax25-tools/rose' The string is a constant in the application code itself so no security issue Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* nrparms: Fix harmless -Werror=format-security build error.Ralf Baechle2015-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | make[2]: Entering directory '/home/ralf/src/ax25/ax25-tools/netrom' gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25_LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -MT nrparms.o -MD -MP -MF .deps/nrparms.Tpo -c -o nrparms.o nrparms.c nrparms.c: In function ‘main’: nrparms.c:213:4: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, nodes_usage); ^ nrparms.c:224:4: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, routes_usage); ^ cc1: some warnings being treated as errors Makefile:438: recipe for target 'nrparms.o' failed make[2]: *** [nrparms.o] Error 1 make[2]: Leaving directory '/home/ralf/src/ax25/ax25-tools/netrom' The strings are constants in the application code itself so no security issue. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* m6pack: Fix harmless -Werror=format-security build error.Ralf Baechle2015-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | make[2]: Entering directory '/home/ralf/src/ax25/ax25-tools/6pack' gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25_LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -MT m6pack.o -MD -MP -MF .deps/m6pack.Tpo -c -o m6pack.o m6pack.c m6pack.c: In function ‘main’: m6pack.c:446:4: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ m6pack.c:452:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ m6pack.c:457:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ cc1: some warnings being treated as errors Makefile:384: recipe for target 'm6pack.o' failed make[2]: *** [m6pack.o] Error 1 make[2]: Leaving directory '/home/ralf/src/ax25/ax25-tools/6pack' The string are constants in the application code itself so no security issue. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* mkiss: Fix harmless -Werror=format-security build error.Ralf Baechle2015-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25_LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -MT mkiss.o -MD -MP -MF .deps/mkiss.Tpo -c -o mkiss.o mkiss.c mkiss.c: In function ‘main’: mkiss.c:469:4: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ mkiss.c:475:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ mkiss.c:480:3: error: format not a string literal and no format arguments [-Werror=format-security] fprintf(stderr, usage_string); ^ cc1: some warnings being treated as errors The strings are constants in the application code itself so no security issues. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* axparms: Fix harmless -Werror=format-security build error.Ralf Baechle2015-05-181-1/+1
| | | | | | | | | | | | | | | | | | | gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25_LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -MT axparms.o -MD -MP -MF .deps/axparms.Tpo -c -o axparms.o axparms.c axparms.c: In function ‘routes’: axparms.c:142:4: error: format not a string literal and no format arguments [-Werror=format-security] printf(routebuf); ^ axparms.c: In function ‘associate’: axparms.c:189:3: warning: ignoring return value of ‘fgets’, declared with attribute warn_unused_result [-Wunused-result] fgets(buffer, 80, fp); ^ cc1: some warnings being treated as errors Makefile:570: recipe for target 'axparms.o' failed make[3]: *** [axparms.o] Error 1 Note that routebuf has been read from /procfs so should be safe. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Ignore "compile" file.Ralf Baechle2015-05-181-0/+1
| | | | | | | | | | | | automake 1.14 will install this file into the top directory with "automake --add-missing" and complain if it's missing: $ automake configure.ac:10: error: required file './compile' not found configure.ac:10: 'automake --add-missing' can install 'compile' $ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* ROSE: Add back installconf rule.Ralf Baechle2015-05-181-0/+1
| | | | | | | | | | | | | | Without this dummy rule, make installconf failes in the rose subdir with: [...] make[1]: Entering directory `/home/ralf/src/ax25/ax25-tools/rose' make[1]: *** No rule to make target `installconf'. Stop. make[1]: Leaving directory `/home/ralf/src/ax25/ax25-tools/rose' [...] This bug exists since 0.0.3 and predates the CVS history. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* automake: Replace use of deprecated automake macro INCLUDES.Ralf Baechle2015-05-178-16/+16
| | | | | | | | | | | | | | | | | This fixes the automake warnings: 6pack/Makefile.am:10: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ax25/Makefile.am:26: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') hdlcutil/Makefile.am:16: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') kiss/Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') netrom/Makefile.am:28: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') rose/Makefile.am:15: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') tcpip/Makefile.am:27: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') INCLUDES has been deprecated since automake 1.5. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* axspawn: Remove unused variable command.Ralf Baechle2015-05-071-1/+0
| | | | | | | | | | | | | gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25 _LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -g -O2 -Wall -MT axspawn.o -MD -MP -MF .deps/axspawn.Tpo -c -o axspawn.o axspawn.c [...] axspawn.c:1049:7: warning: unused variable ‘command’ [-Wunused-variable] char command[1024]; ^ [...] Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Ignore *~ files.Ralf Baechle2015-05-021-0/+1
| | | | | | These are just editor backup files and don't provide any useful content. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-toolsRalf Baechle2015-05-0295-3949/+3896
|\ | | | | | | | | Conflicts: ax25/axspawn.c
| * axgetput: Use shifts instead of a silly table to compute bitmask.Ralf Baechle2013-06-171-3/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * axgetput: Simplify do_crc() a bit.Ralf Baechle2013-06-171-2/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * axgetput: Use calc_crc() to simplify CRC calculations.Ralf Baechle2013-06-171-11/+4
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * axgetput: Provide calc_crc() function to iterate over memory area.Ralf Baechle2013-06-171-0/+8
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * axgetput: Get rid of unused length argument of do_crc().Ralf Baechle2013-06-171-4/+4
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Insert space between `)' and a following `{'.Ralf Baechle2013-06-172-2/+2
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Reformat consistently. Strictly whitespace changes only.Ralf Baechle2013-06-1735-2548/+2548
| | | | | | | | | | | | | | Indentation by tabs only. Move case labels in switches are on the same level as the switch keyword. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Remove pointless return statements at the end of void functions.Ralf Baechle2013-06-173-3/+0
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Always have a space between if, for, switch, while and the following `('.Ralf Baechle2013-06-1710-29/+29
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Remove parenthesis around arguments of return statements.Ralf Baechle2013-06-176-19/+19
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Use tabs for indentation, not spaces.Ralf Baechle2013-06-1731-560/+560
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Remove useless initializations to 0 or NULL.Ralf Baechle2013-06-1719-59/+59
| | | | | | | | | | | | | | They only inflate the .data section of the binary. Initializations to FALSE are still left to do. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Nuke trailing whitespace.Ralf Baechle2013-06-1776-767/+767
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Nuke trailing blank lines.Ralf Baechle2013-06-1722-35/+0
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Use dist_ prefix in Makefile.am rather than EXTRA_DIST where possible.Ralf Baechle2013-06-1711-32/+19
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | Fix typo SIOCAX25CTLCON in perror()Thomas Osterried2015-05-011-1/+1
| | | | | | | | Signed-off-by: Thomas Osterried <thomas@osterried.de>
* | Signed-off-by: Thomas Osterried <ax25@x-berg.in-berlin.de>Thomas Osterried2015-05-011-1/+1
| | | | | | | | | | | | | | | | | | Security patch submitted by Jaroslav Skarvada <jskarvad@redhat.com> Netrom and ROSE Addresses are copied to Node. Room was enough for Netrom, but rose addresses returned by rose_ntoa() are one byte longer (a 10 bytes string plus null-termination) which lead to an buffer overflow.
* | The current linux kernel has no limit anymore for the number of netromThomas Osterried2015-05-012-2/+4
| | | | | | | | | | | | and rose devices (previously 4 netrom, 6 rose). Thanks to Jaroslav, OK2JRQ for the patch
* | Provide defaults for user_shell if unset.Thomas Osterried2015-05-012-2/+8
| | | | | | | | | | | | | | | | | | The user_shell config variable is optional. If not specified, /bin/bash is used. Except: if create_with_useradd is configured and there's a config file /etc/default/useradd, then it's not passed to useradd in order to let the user choose. Signed-off-by: Thomas Osterried <ax25@x-berg.in-berlin.de>
* | Found debian wheezy useradd bug: useradd did terminates and eats 100%Thomas Osterried2015-05-011-10/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpu power, if it was called from axspawn. This could be prevented if SIGCHLD is masked. To increase security, no longer call useradd via system() but fork() and execve(). Fixed a bug when useradd failed then the login process continued anyway. Empty lines in axspawn.conf are now valid. The user_shell config variable is optional. If not specified, /bin/bash is used. Except: if create_with_useradd is configured and there's a config file /etc/default/useradd, then it's not passed to useradd in order to let him choose. Signed-off-by: Thomas Osterried <ax25@x-berg.in-berlin.de>
* | Fix: kernel learned qualities < configured worst_qual.Thomas Osterried2015-05-011-3/+3
|/ | | | | | | | First compute the node quality by remotely reported quality * best_quality) + 128) / 256; (the well known algorithm) and afterwards verify if it's < worst_qual. Signed-off-by: Thomas Osterried <thomas@osterried.de>
* Bump version to 0.0.10-rc4.ax25-tools-0.0.10-rc4Ralf Baechle2013-06-171-1/+1
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Fix linking order.Ralf Baechle2013-06-101-2/+1
| | | | | | | This fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671016 but using a smaller patch. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Fix warnings about passing of string constant as argument.Ralf Baechle2013-06-062-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | g++ -DHAVE_CONFIG_H -I. -I../.. -I./.. -g -O2 -MT xfsmmixer_main.o -MD -MP - MF .deps/xfsmmixer_main.Tpo -c -o xfsmmixer_main.o xfsmmixer_main.cxx xfsmmixer_main.cxx: In function ‘int main(int, char**)’: xfsmmixer_main.cxx:318:31: warning: deprecated conversion from string constant t o ‘char*’ [-Wwrite-strings] [...] g++ -DHAVE_CONFIG_H -I. -I../.. -I./.. -g -O2 -MT xfhdlcchpar_main.o -MD -MP -MF .deps/xfhdlcchpar_main.Tpo -c -o xfhdlcchpar_main.o xfhdlcchpar_main.cxx xfhdlcchpar_main.cxx: In function ‘int main(int, char**)’: xfhdlcchpar_main.cxx:88:31: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] [...] g++ -DHAVE_CONFIG_H -I. -I../.. -I./.. -g -O2 -MT xfhdlcst_main.o -MD -MP -M F .deps/xfhdlcst_main.Tpo -c -o xfhdlcst_main.o xfhdlcst_main.cxx xfhdlcst_main.cxx: In function ‘int main(int, char**)’: xfhdlcst_main.cxx:84:31: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] [...] g++ -DHAVE_CONFIG_H -I. -I../.. -I./.. -g -O2 -MT xfsmdiag_main.o -MD -MP -M F .deps/xfsmdiag_main.Tpo -c -o xfsmdiag_main.o xfsmdiag_main.cxx xfsmdiag_main.cxx: In function ‘int main(int, char**)’: xfsmdiag_main.cxx:360:31: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Fix implicit declaration caused missing #include <string.h>Ralf Baechle2013-06-061-0/+1
| | | | | | | | gcc -DHAVE_CONFIG_H -I. -I.. -g -O2 -flto -MT user_io.o -MD -MP -MF .deps/user_io.Tpo -c -o user_io.o user_io.c user_io.c: In function ‘err’: user_io.c:38:25: warning: incompatible implicit declaration of built-in function ‘strlen’ [enabled by default] Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* ROSE: Fix warnings caused by bogus variable initializations.Ralf Baechle2013-06-061-4/+6
| | | | | | | | | | | | | | | gcc -DHAVE_CONFIG_H -I. -I.. -DAX25_SYSCONFDIR=\""/usr/local/etc/ax25/"\" -DAX25 _LOCALSTATEDIR=\""/usr/local/var/ax25/"\" -g -O2 -flto -MT rsparms.o -MD -MP -MF .deps/rsparms.Tpo -c -o rsparms.o rsparms.c rsparms.c: In function ‘printnb’: rsparms.c:38:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] rsparms.c:38:42: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] rsparms.c:39:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] rsparms.c:39:38: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] rsparms.c: In function ‘nodes’: rsparms.c:120:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Weed out all use of RCS strings.Ralf Baechle2013-06-0612-92/+5
| | | | | | | Their value has always been dubious and git doesn't support them so let's get rid of the clutter. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Split off doc files into ax25-tools-docs package.Ralf Baechle2013-06-041-41/+19
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Remove bogus removal of doc files.Ralf Baechle2013-06-041-3/+0
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Building an rpm requires mesa-libGLU-devel.Ralf Baechle2013-06-041-0/+1
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Remove all definitions of docdir from makefiles.Ralf Baechle2013-06-044-4/+0
| | | | | | | This may result in docfiles getting installed in ${prefix}/doc/, not ${prefix}/share/doc which is the convention. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Ignore even more generated files.Ralf Baechle2013-06-041-14/+23
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Convert .cvsignore files to .gitignoreRalf Baechle2013-06-0413-20/+20
| | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* Bump version number to 0.0.10-rc3.ax25-tools-0.0.10-rc3Ralf Baechle2013-05-311-1/+1
|
* Replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS.Ralf Baechle2013-05-301-2/+2
| | | | | | | Since the introduction of AC_CONFIG_HEADERS in automake 1.7 AM_CONFIG_HEADER has been deprecated and it has finally been removed in automake 1.12. So this change also generates a dependency on automake 1.7 or newer.