[Eisfair] avahi-client

[Thomas Bork]

Am 25.02.2021 um 21:58 schrieb Marcus Röckrath:

> Das wäre für samba doch dann ein gangbarer und relativ einfacher Weg.
> Ich schau mir das mal an.

deveisgcc5 2.8.25 # diff -Nurp /samba-10.4.7/etc/init.d/samba 
/sambaneu/etc/init.d/samba
--- /samba-10.4.7/etc/init.d/samba      2020-03-03 20:38:10.000000000 +0100
+++ /sambaneu/etc/init.d/samba  2021-02-25 18:01:10.647964359 +0100
@@ -2,12 +2,12 @@
 
#----------------------------------------------------------------------------
  # /etc/init.d/samba - init samba
  #
-# Copyright (c) 2002-2020 Thomas Bork, tom(at)eisfair(dot)net
+# Copyright (c) 2002-2021 Thomas Bork, tom(at)eisfair(dot)net
  #
  # usage: /etc/init.d/samba {start|forcestart|status|stop|restart|reload}
  #
  # Creation   : 2001-11-04 tb
-# Last Update: 2020-03-03 tb
+# Last Update: 2021-02-25 tb
  #
  # 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
@@ -198,6 +198,12 @@ do_startsamba ()
    then
        /etc/init.d/wsdd start
    fi
+
+  if [ -d /etc/avahi/services ]
+  then
+      cp /usr/share/doc/samba/tools/avahi_service_file \
+         /etc/avahi/services/smb.service
+  fi
  }

  do_showmapping ()
@@ -273,6 +279,11 @@ case $1 in
  'stop')
      boot_mesg " * Stopping Samba ..."

+    if [ -d /etc/avahi/services ]
+    then
+        rm -f /etc/avahi/services/smb.service
+    fi
+
      if [ -f /etc/init.d/wsdd ]
      then
          /etc/init.d/wsdd stop


deveisgcc5 2.8.25 # cat 
/sambaneu/usr/share/doc/samba/tools/avahi_service_file
<?xml version="1.0" standalone='no'?>
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
   <name replace-wildcards="yes">eisfair-SAMBA on %h</name>
   <service>
     <type>_smb._tcp</type>
     <port>445</port>
   </service>
</service-group>


Und hier die Änderung für wide links in 4.13.4. Und eine für die 
deprecated option 'domain logons', die dann nur angemeckert wird, wenn 
Samba als PDC konfiguriert wurde (NT-4-Modus ist generell als deprecated 
markiert).

deveisgcc5 2.8.25 # diff -Nurp 
/samba-10.4.7/var/install/config.d/samba.sh 
/sambaneu/var/install/config.d/samba.sh
--- /samba-10.4.7/var/install/config.d/samba.sh 2021-01-16 
09:59:27.000000000 +0100
+++ /sambaneu/var/install/config.d/samba.sh     2021-02-25 
18:51:33.499946973 +0100
@@ -6,9 +6,9 @@
  #               2020-2021 Marcus Roeckrath, 
marcus(dot)roeckrath(at)gmx(dot)de
  #
  # Creation   : 2002-02-04 tb
-# Last Update: 2021-01-16 mr
+# Last Update: __DATE__ tb
  #
-# Version    : 10.4.4
+# Version    : __EIS-SAMBA-VERSION__
  #
  # 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
@@ -47,7 +47,7 @@ manual="$SAMBA_MANUAL_CONFIGURATION"
  serverstring="$SAMBA_SERVERSTRING"
  generate='/etc/smb.conf'
  printcap='/etc/printcap'
-version=$(eisman query --installed --fields=version samba | head -n 1 | 
awk '{print  $2}')
+version=`cat /usr/share/doc/samba/version`
  add_user_script="/usr/sbin/useradd -m '%u' -c '%u'"
  #delete_user_script="/var/install/bin/remove-user '%u' y"
  delete_user_script=''
@@ -370,6 +370,24 @@ do_write_vfs_acl_xattr ()
    fi
  }

+do_check_vfs_widelinks ()
+{
+  sambalibdir=`smbd -b | grep LIBDIR | awk '{ print $2 }'`
+  if [ -f ${sambalibdir}/vfs/widelinks.so ]
+  then
+      if [ -z "$vfs_objects" ]
+      then
+          vfs_objects='widelinks'
+      else
+          vfs_objects="$vfs_objects, widelinks"
+      fi
+
+      show_widelinks_warning='no'
+  else
+      show_widelinks_warning='yes'
+  fi
+}
+
  do_write_vfs_objects ()
  {
    if [ -n "$vfs_objects" ]
@@ -1095,6 +1113,7 @@ echo " mangling method = hash2"

  if [ "$SAMBA_PDC" = "yes" ]
  then
+    echo " domain logons = $domainlogons"
      echo " logon script = $logonscript"
      # xp is buggy
      echo " logon drive = x:"
@@ -1111,7 +1130,6 @@ then
      fi
  fi

-echo " domain logons = $domainlogons"
  echo " add user script = $add_user_script"
  echo " add machine script = $add_machine_script"
  echo " delete user script = $delete_user_script"
@@ -1266,6 +1284,7 @@ then
      do_check_vfs_acl_xattr "%H"
      do_check_vfs_recycle
      do_check_vfs_dirsort
+    do_check_vfs_widelinks

     {
      echo "[homes]"
@@ -1303,6 +1322,7 @@ then
      do_check_vfs_acl_xattr "${path}"
      do_check_vfs_recycle
      do_check_vfs_dirsort
+    do_check_vfs_widelinks

     {
      echo "[all]"
@@ -1348,6 +1368,7 @@ then
      do_check_vfs_acl_xattr "${path}"
      do_check_vfs_recycle
      do_check_vfs_dirsort
+    do_check_vfs_widelinks

     {
      echo "[public]"
@@ -1690,6 +1711,7 @@ else
              do_check_vfs_acl_xattr "${path}"
              do_check_vfs_recycle
              do_check_vfs_dirsort
+            do_check_vfs_widelinks

             {
              echo "[$name]"
@@ -2433,6 +2455,12 @@ then
      fi
  fi

+if [ "$show_widelinks_warning" = "yes" ]
+then
+      mecho --warn "No module ${sambalibdir}/vfs/widelinks.so"
+      mecho --warn "found. You cannot use wide links ..."
+fi
+
  do_remove_recycle_cron
  do_add_recycle_cron

-- 
der tom