New upstream version 5.6.3

21 files changed, 35 insertions, 25 deletions

diff --git a/src/starter/args.c b/src/starter/args.c
index 477a52082..a37ce6a3e 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2014 Tobias Brunner
  * Copyright (C) 2006 Andreas Steffen
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/args.h b/src/starter/args.h
index 76c05de8c..d1181f4a4 100644
--- a/src/starter/args.h
+++ b/src/starter/args.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006 Andreas Steffen
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/confread.c b/src/starter/confread.c
index f154f8951..345d0b60b 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
  *
diff --git a/src/starter/invokecharon.c b/src/starter/invokecharon.c
index 5d95305cb..e78e65792 100644
--- a/src/starter/invokecharon.c
+++ b/src/starter/invokecharon.c
@@ -1,6 +1,9 @@
-/* strongSwan charon launcher
- * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
- * Copyright (C) 2006 Martin Willi - Hochschule fuer Technik Rapperswil
+/*
+ * Copyright (C) 2006 Martin Willi
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * Copyright (C) 2001-2002 Mathieu Lafon
+ * Arkoon Network Security
  *
  * Ported from invokepluto.c to fit charons needs.
  *
diff --git a/src/starter/invokecharon.h b/src/starter/invokecharon.h
index aaf913c9b..b789c761d 100644
--- a/src/starter/invokecharon.h
+++ b/src/starter/invokecharon.h
@@ -1,6 +1,9 @@
-/* strongSwan charon launcher
- * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
- * Copyright (C) 2006 Martin Willi - Hochschule fuer Technik Rapperswil
+/*
+ * Copyright (C) 2006 Martin Willi
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * Copyright (C) 2001-2002 Mathieu Lafon
+ * Arkoon Network Security
  *
  * Ported from invokepluto.h to fit charons needs.
  *
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index 0e2d0fb4b..a8f50169a 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -32,7 +32,7 @@ error "gperf generated tables don't work with this execution character set. Plea
 
 /*
  * Copyright (C) 2005 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 27d16b0b8..d017134d9 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/keywords.h.in b/src/starter/keywords.h.in
index d2b08f2cf..60ec2723a 100644
--- a/src/starter/keywords.h.in
+++ b/src/starter/keywords.h.in
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index dd673bc7a..e696dce8e 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -1,7 +1,7 @@
 %{
 /*
  * Copyright (C) 2005 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/conf_parser.c b/src/starter/parser/conf_parser.c
index 66e0ae8e4..d35dad76c 100644
--- a/src/starter/parser/conf_parser.c
+++ b/src/starter/parser/conf_parser.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/conf_parser.h b/src/starter/parser/conf_parser.h
index 49131a0db..db486a03f 100644
--- a/src/starter/parser/conf_parser.h
+++ b/src/starter/parser/conf_parser.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/lexer.c b/src/starter/parser/lexer.c
index afca86341..d19cee08a 100644
--- a/src/starter/parser/lexer.c
+++ b/src/starter/parser/lexer.c
@@ -634,7 +634,7 @@ static yyconst flex_int16_t yy_rule_linenum[26] =
 #line 2 "parser/lexer.l"
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
index f70658e68..e10fd1b38 100644
--- a/src/starter/parser/lexer.l
+++ b/src/starter/parser/lexer.l
@@ -1,7 +1,7 @@
 %{
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/parser.c b/src/starter/parser/parser.c
index 7204cc61d..7d9cd7805 100644
--- a/src/starter/parser/parser.c
+++ b/src/starter/parser/parser.c
@@ -72,7 +72,7 @@
 
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/parser/parser.y b/src/starter/parser/parser.y
index 0b2b3b09f..1371fe931 100644
--- a/src/starter/parser/parser.y
+++ b/src/starter/parser/parser.y
@@ -1,7 +1,7 @@
 %{
 /*
  * Copyright (C) 2013-2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 51a42a504..8ca1af29c 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -276,7 +276,7 @@ static bool check_pid(char *pid_file)
 				pid = atoi(buf);
 			}
 			fclose(pidfile);
-			if (pid && kill(pid, 0) == 0)
+			if (pid && pid != getpid() && kill(pid, 0) == 0)
 			{	/* such a process is running */
 				return TRUE;
 			}
@@ -477,6 +477,7 @@ int main (int argc, char **argv)
 		}
 	}
 
+#ifndef STARTER_ALLOW_NON_ROOT
 	/* verify that we can start */
 	if (getuid() != 0)
 	{
@@ -484,6 +485,7 @@ int main (int argc, char **argv)
 		cleanup();
 		exit(LSB_RC_NOT_ALLOWED);
 	}
+#endif
 
 	if (check_pid(pid_file))
 	{
@@ -520,6 +522,7 @@ int main (int argc, char **argv)
 		exit(LSB_RC_INVALID_ARGUMENT);
 	}
 
+#ifndef SKIP_KERNEL_IPSEC_MODPROBES
 	/* determine if we have a native netkey IPsec stack */
 	if (!starter_netkey_init())
 	{
@@ -530,6 +533,7 @@ int main (int argc, char **argv)
 			DBG1(DBG_APP, "no known IPsec stack detected, ignoring!");
 		}
 	}
+#endif
 
 	last_reload = time_monotonic(NULL);
 
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index 90af9372a..90ba1cd72 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2007-2015 Tobias Brunner
  * Copyright (C) 2006 Martin Willi
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/starterstroke.h b/src/starter/starterstroke.h
index 126486325..685c528b6 100644
--- a/src/starter/starterstroke.h
+++ b/src/starter/starterstroke.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006 Martin Willi
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/tests/starter_tests.c b/src/starter/tests/starter_tests.c
index 4194c5256..23722e96f 100644
--- a/src/starter/tests/starter_tests.c
+++ b/src/starter/tests/starter_tests.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/tests/starter_tests.h b/src/starter/tests/starter_tests.h
index 3486597a0..79a75c568 100644
--- a/src/starter/tests/starter_tests.h
+++ b/src/starter/tests/starter_tests.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/src/starter/tests/suites/test_parser.c b/src/starter/tests/suites/test_parser.c
index 4ae7b22fa..81555a86f 100644
--- a/src/starter/tests/suites/test_parser.c
+++ b/src/starter/tests/suites/test_parser.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the