projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash
[paraslash.git]
/
server.ggo
diff --git
a/server.ggo
b/server.ggo
index a32673d56a59cce296a05ce51d27623dd7d1f1a8..4f6e05b290a2d0ea4cb1c4f61032124e8666b834 100644
(file)
--- a/
server.ggo
+++ b/
server.ggo
@@
-38,11
+38,11
@@
privileges right after parsing the command
line options, but before parsing the
configuration file. In this case,
real/effective/saved UID are all set to the
line options, but before parsing the
configuration file. In this case,
real/effective/saved UID are all set to the
-UID of '
user
name'. As the configuration file
+UID of 'name'. As the configuration file
is read afterwards, those options that have a
default value depending on the UID (e.g. the
directory for the configuration file) are
is read afterwards, those options that have a
default value depending on the UID (e.g. the
directory for the configuration file) are
-computed by using the uid of '
user
name'.
+computed by using the uid of 'name'.
This option has no effect if para_server is
started as a non-root user (i.e. EUID != 0)"
This option has no effect if para_server is
started as a non-root user (i.e. EUID != 0)"
@@
-59,7
+59,7
@@
Otherwise, real/effective GID and the saved
set-group ID are all set to the GID given by
'group'. Must not be given in the config file."
set-group ID are all set to the GID given by
'group'. Must not be given in the config file."
- string typestr="group
name
"
+ string typestr="group"
optional
optional
@@
-94,8
+94,8
@@
option "user_list" -
-section "
audio file sender
"
-#~~~~~~~~~~~~~~~~~~~~~~~~~~
+section "
virtual streaming system
"
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~
option "autoplay" a
option "autoplay" a
@@
-134,8
+134,8
@@
option "selector" S
-section "mysql selector
:
"
-#~~~~~~~~~~~~~~~~~~~~~~~
~
+section "mysql selector"
+#~~~~~~~~~~~~~~~~~~~~~~~
option "mysql_host" -
option "mysql_host" -