From 9b842f58868a3348ff55cd62e2181200a71a5b05 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 15 May 2017 17:21:08 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- init.d/slpd | 3 +- slp.conf | 81 +++++++++++++++++++++++++++++++++++++++++++++++------ slp.reg | 6 ++++ 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/init.d/slpd b/init.d/slpd index bbc0eac1..de7f5af3 100755 --- a/init.d/slpd +++ b/init.d/slpd @@ -1,7 +1,6 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.5 2012/02/09 08:19:35 robbat2 Exp $ depend() { need net diff --git a/slp.conf b/slp.conf index e858e9e5..cf221b89 100644 --- a/slp.conf +++ b/slp.conf @@ -40,6 +40,14 @@ # if isDA is false. ;net.slp.DAHeartBeat = 10800 +# A 32 bit integer giving the number of seconds after which a DA is considered +# stale and is removed from the list of known DAs, if a DA advert has not +# been received for it. This value affects DAs in that it overrides +# net.slp.DAHeartBeat to ensure that DA adverts are sent out at an appropriate +# rate dependent on this value. It affects SA operation, in that heartbeats +# (DA adverts) are monitored to maintain only active DAs in the known DA list. +# Default is 0 (disabled). A minimum of 60s will be applied if non-zero. +;net.slp.staleDACheckPeriod = 60 #---------------------------------------------------------------------------- # SA Specific Configuration @@ -48,8 +56,9 @@ # If net.slp.watchRegistrationPID is set to true, local registrations made # with the SA via the SLPReg() API call will be monitored. If the PID of the # process (and/or thread on Linux) disappears (the registering process died -# unexpectedly with out calling SLPDereg()), then the registration is -# automatically de-registered. (Default value is true. Uncomment the line +# unexpectedly without calling SLPDereg()), then the registration is +# automatically de-registered. Default value is true. Note that 'slptool' +# always uses value false for the 'register' command. Uncomment the line # below to disable PID watching. ;net.slp.watchRegistrationPID = false @@ -64,6 +73,11 @@ ;net.slp.maxResults = 256 +# An experimental/test setting that tells libslp to send SLP v1 commands +# instead of v2 commands where-ever the code currently supports it. +# Default is false. +;net.slp.preferSLPv1 = false + #---------------------------------------------------------------------------- # Network Configuration Properties #---------------------------------------------------------------------------- @@ -127,8 +141,6 @@ # A value-list of 32 bit integers used as timeouts, in milliseconds, to # implement unicast datagram transmission to DAs. The nth value gives # the time to block waiting for a reply on the nth try to contact the DA. -# Currently OpenSLP uses TCP for all unicast communication so this setting -# does not do anything ;net.slp.unicastTimeouts = 500,750,1000,1500,2000,3000 # To OpenSLP the following is the same as net.slp.unicastTimeouts. Use @@ -142,10 +154,34 @@ # A integer giving the network packet MTU in bytes. (Default is 1400) ;net.slp.MTU = 1400 -# A list of IP address of network interfaces on which the DA/SA should listen -# for slp requests. By default, slpd will use all interfaces. -;net.slp.interfaces = 1.2.3.4,1.2.3.5,1.2.3.6 - +# +# If operating as an SA or DA, this specifies the maximum number of interfaces +# that can be active. (Default is 100) +;net.slp.max_ifaces = 100 + +# If operating as an SA or DA, then any local addresses that are going to be +# used must be specified. Both IPv4 and IPv6 addresses may be specified. +# Only link-local addresses can be used for IPv6 SLP multicast. Any +# site-local or global addresses will be used, but only for unicast SLP. +# Option parameter "%" can be used to specify the interface when multiple +# instance of the same link-local address are present in the same host. If +# the interface option is not provided, the daemon will bind to the first +# interface with specified ip. This option is only valid for IPv6 link-local +# addresses. Eg: fe80::215:58ff:fe7e:c037%eth0 +;net.slp.interfaces = 192.168.0.1 + +# This option is a string indicating the broadcast address to use when +# sending broadcast packets. This parameter is only applicable when the +# other broadcast configuration variables are set (multicast is used by default) +;net.slp.broadcastAddr = 255.255.255.255 + +# Port to use for all SLP messages. Changing this from the reserved SLP +# listening port will break compliance with RFC2608. (Default is 427). +;net.slp.port = 427 + +# A boolean indicating whether DHCP should be used for DA discovery and/or +# scope discovery. (Default setting is true). +;net.slp.useDHCP = true #---------------------------------------------------------------------------- # Security @@ -161,6 +197,23 @@ # address checking. ;net.slp.checkSourceAddr=false +#---------------------------------------------------------------------------- +# Indexing +#---------------------------------------------------------------------------- +# A boolean indicating whether SLP service types should be indexed. This +# uses additional memory, but speeds up searching by (concrete) service type, +# and attribute retrieval. (Default setting is false). +;net.slp.indexSrvtype=true + +# A list of names of attributes with string values that should be indexed. +# This uses additional memory but speeds up searching by equality (including +# wildcard searches) +# eg. (location=Main Building Second Floor) or (location=Main Building*) +# The index will also be used when the equality expression is part of a top-level +# '&' expression eg. (&(grade>=C)(location=Main Building*)) would use +# the index on the location attribute. +# Note that whitespace is significant in the list of names. +;net.slp.indexedAttributes=attr1,attr2,... #---------------------------------------------------------------------------- # Tracing and Logging @@ -188,6 +241,10 @@ # tracing. ;net.slp.traceMsg = true +# A boolean controlling whether or not slpd appends log messages to slpd.log, +# or if it overwrites the existing log. Default is true. Uncomment the +# following line to overwrite the existing log. +;net.slp.appendLog = false #---------------------------------------------------------------------------- # Serialized Proxy Registration @@ -199,4 +256,12 @@ # /etc/slp.reg +#---------------------------------------------------------------------------- +# IPv6 configuration options +#---------------------------------------------------------------------------- +# These settings specify which IP protocols to use for SLP. The default is +# that IPv4 is enabled, and IPv6 is disabled. Uncomment one or other of the +# following lines to change this. +;net.slp.useIPv4 = false +;net.slp.useIPv6 = true diff --git a/slp.reg b/slp.reg index 31cd5bcb..2cf7eaf2 100644 --- a/slp.reg +++ b/slp.reg @@ -37,3 +37,9 @@ ##Register telnet service with no attributes #service:telnet.myorg://192.168.100.1,en,65535 #use default scopes + +##Register vnc kdm service, can be used via krdc +#service:remotedesktop.kde:vnc://192.168.100.1:1,en,65535 +#attrid=(type=shared),(username=joe),(fullname=Joe User),(serviceid=1235456) +#description=KDE remote login + -- 2.39.5