Accepting request 801369 from home:hgraeber:branches:network

- Fix handling of WSDD_WORKGROUP
- Let WSDD_DOMAIN override WSDD_WORKGROUP

OBS-URL: https://build.opensuse.org/request/show/801369
OBS-URL: https://build.opensuse.org/package/show/network/wsdd?expand=0&rev=2

sysconfig.wsdd

@@ -4,7 +4,7 @@
 ## Default:        ""
 ## ServiceRestart:·wsdd
 # Windows domain
-# If empty use the machines domain
+# If empty use the machines domain, overrides WSDD_WORKGROUP
 WSDD_DOMAIN=""
 
 ## Type:           string

wsdd-init.sh

@@ -7,9 +7,7 @@ fi
 
 if [ "${WSDD_DOMAIN}" != "" ]; then
   WSDD_DOMAIN="-d \"${WSDD_DOMAIN}\""
-fi
+elif [ "${WSDD_WORKGROUP}" != "" ]; then
-
-if [ "${WSDD_WORKGROUP}" != "" ]; then
   WSDD_DOMAIN="-w \"${WSDD_WORKGROUP}\""
 fi
 
@@ -27,5 +25,5 @@ fi
 
 install -o wsdd -g wsdd -p 0700 -d /run/sysconfig
 
-echo "WSDD_ARGS=${WSDD_HOSTNAME} ${WSDD_WORKGROUP} ${WSDD_DOMAIN} ${WSDD_INTERFACE_ARGS} \
+echo "WSDD_ARGS=${WSDD_HOSTNAME} ${WSDD_DOMAIN} ${WSDD_INTERFACE_ARGS} \
 	${WSDD_ARGS}" >/run/sysconfig/wsdd

wsdd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  7 18:54:30 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>
+
+- Fix handling of WSDD_WORKGROUP
+- Let WSDD_DOMAIN override WSDD_WORKGROUP
+
 -------------------------------------------------------------------
 Sun Apr 26 20:24:03 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>