diff --git a/additional.orig.spec b/additional.orig.spec deleted file mode 100644 index e69de29..0000000 diff --git a/additional/CVS/Entries b/additional/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/additional/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/additional/CVS/Repository b/additional/CVS/Repository deleted file mode 100644 index e52aec4..0000000 --- a/additional/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -rpms/e-smith-base/sme10/e-smith-base-5.8.0 diff --git a/additional/CVS/Root b/additional/CVS/Root deleted file mode 100644 index a20ba0c..0000000 --- a/additional/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:ext:jpp@shell.koozali.org:/cvs/smeserver diff --git a/additional/createlinks.orig b/additional/createlinks.orig deleted file mode 100755 index 4b9714d..0000000 --- a/additional/createlinks.orig +++ /dev/null @@ -1,672 +0,0 @@ -#!/usr/bin/perl -w - -use esmith::Build::CreateLinks qw(:all); - -templates2events("/etc/sysconfig/i18n", qw(post-install post-upgrade e-smith-base-update)); - -templates2events("/etc/selinux/config", qw(post-install post-upgrade e-smith-base-update)); - -# give the correct configuration file of dhcpd.conf -templates2events("/etc/dhcp/dhcpd.conf", qw(bootstrap-console-save e-smith-base-update)); - -# ppp-conf-users - -foreach (qw(pap-secrets chap-secrets)) -{ - templates2events("/etc/ppp/$_", qw( - bootstrap-console-save - console-save - remoteaccess-update - e-smith-base-update)); -} - -foreach (qw( - /var/service/wan/pppoe.pppd.conf - /var/service/wan/run.pppoe.conf - /etc/ppp/ip-down.local - /etc/ppp/ip-up.local - )) -{ - templates2events("$_", qw( - console-save - bootstrap-console-save - e-smith-base-update - )); -} - -safe_symlink("daemontools", "root/etc/rc.d/init.d/wan"); -service_link_enhanced("wan", "S37", "7"); -service_link_enhanced("wan", "K90", "6"); -service_link_enhanced("wan", "K90", "0"); -service_link_enhanced("wan", "K90", "1"); - -# conf-dialup -foreach (qw( - /etc/sysconfig/network-scripts/ifcfg-ppp0 - /etc/sysconfig/network-scripts/chat-ppp0 - /etc/ppp/ip-up.local - /etc/ppp/ip-down.local - /etc/diald.conf - /etc/diald.filter - /etc/diald/link - /var/service/ippp/config - /etc/ppp/ioptions - )) -{ - templates2events($_, qw(console-save bootstrap-console-save e-smith-base-update)); -} - -# conf-networking - -foreach (qw( - /etc/sysconfig/network-scripts/ifcfg-bond0 - /etc/modprobe.d/bonding.conf - /etc/sysconfig/network - /etc/nsswitch.conf - /etc/HOSTNAME - /etc/hosts - /etc/resolv.conf - /etc/sysctl.conf - /var/service/wan/dhclient.config - )) -{ - templates2events($_, qw(console-save bootstrap-console-save e-smith-base-update)); -} -event_link("update-ifcfg", "console-save", "05"); -event_link("update-ifcfg", "bootstrap-console-save", "05"); - -# conf-other - -templates2events("/etc/crontab", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - email-update - logrotate - e-smith-base-update - )); -templates2events("/etc/mime.types", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - email-update - logrotate - e-smith-base-update - )); -templates2events("/etc/sysconfig/rsyslog", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - email-update - logrotate - e-smith-base-update - )); -templates2events("/etc/rsyslog.conf", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - email-update - logrotate - e-smith-base-update - )); -templates2events("/etc/updatedb.conf", qw( - bootstrap-console-save - e-smith-base-update -)); -templates2events("/etc/openssl.conf", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - domain-create - domain-delete - network-create - network-delete - ip-change - e-smith-base-update - )); - -# conf-routes -event_link("update-ifcfg", "network-create", "05"); -event_link("update-ifcfg", "network-delete", "05"); - -# conf-security - -templates2events("/etc/securetty", qw( - console-save - bootstrap-console-save - ibay-create - ibay-delete - ibay-modify - ibay-modify-servers - network-create - network-delete - ip-change - email-update - remoteaccess-update - e-smith-base-update - )); -templates2events("/etc/services", qw( - console-save - bootstrap-console-save - ibay-create - ibay-delete - ibay-modify - ibay-modify-servers - network-create - network-delete - ip-change - email-update - remoteaccess-update - e-smith-base-update - )); -templates2events("/etc/shells", qw( - console-save - bootstrap-console-save - ibay-create - ibay-delete - ibay-modify - ibay-modify-servers - network-create - network-delete - ip-change - email-update - remoteaccess-update - e-smith-base-update - )); -templates2events("/etc/hosts.deny", qw( - console-save - bootstrap-console-save - ibay-create - ibay-delete - ibay-modify - ibay-modify-servers - network-create - network-delete - ip-change - email-update - remoteaccess-update - e-smith-base-update - )); -templates2events("/etc/hosts.allow", qw( - console-save - bootstrap-console-save - ibay-create - ibay-delete - ibay-modify - ibay-modify-servers - network-create - network-delete - ip-change - email-update - remoteaccess-update - e-smith-base-update - )); -foreach my $file (qw( - /etc/pam.d/login - /etc/pam.d/system-auth - /etc/pam.d/passwd - /etc/pam.d/pwauth - /etc/pam_ldap.conf - /etc/pam_ldap.secret - /etc/security/pam_abl.conf - )) -{ - templates2events($file, qw(console-save bootstrap-console-save e-smith-base-update)); -} - -foreach (qw( - /etc/cpu.conf - /etc/cpu-system.conf - )) -{ - templates2events("$_", qw( - post-upgrade - console-save - bootstrap-console-save - ldap-update - e-smith-base-update - )); -} - -# conf-userlists - -foreach (qw(users.allow accounts.allow accounts.deny)) -{ - templates2events("/etc/e-smith/pam/$_", qw( - bootstrap-console-save - ibay-create - ibay-delete - user-create - user-delete - password-modify - e-smith-base-update - )); -} - -# fstab-conf - -templates2events("/etc/fstab", qw(post-install post-upgrade e-smith-base-update)); - -# init-conf - -templates2events("/etc/inittab", qw( - console-save - bootstrap-console-save - post-install - post-upgrade - remoteaccess-update - e-smith-base-update - )); - -# lynx-conf - -templates2events("/etc/lynx.cfg", qw(console-save bootstrap-console-save e-smith-base-update)); -templates2events("/etc/elinks.conf", qw(bootstrap-console-save e-smith-base-update)); - -# -# Set up generic logfile timestamp renaming/symlinking - -foreach (qw( - /var/log/messages - /var/log/boot.log - /var/log/secure - /var/log/cron - /var/log/spooler - /var/log/maillog - )) -{ - safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/post-install/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/post-upgrade/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/e-smith-base-update/logfiles2timestamp/$_"; -} - -#-------------------------------------------------- -# functions for manager panel -#-------------------------------------------------- -my $panel = "manager"; - -panel_link("groups", $panel); -panel_link("localnetworks", $panel); -panel_link("online-manual", $panel); -panel_link("reboot", $panel); -panel_link("remoteaccess", $panel); -panel_link("review", $panel); -panel_link("useraccounts", $panel); - -#-------------------------------------------------- -# actions for e-smith-base-update event -#-------------------------------------------------- -my $event = "e-smith-base-update"; - - -templates2events("/etc/smartd.conf", $event); -templates2events("/home/e-smith/ssl.pem/pem", $event); -event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); -event_link("init-accounts", $event, "05"); -event_link("set-hostname", $event, "10"); -event_link("rmmod-bonding", $event, "10"); -event_link("conf-startup", $event, "10"); -event_link("user-lock-passwd", $event, "15"); -event_link("group-modify-unix", $event, "15"); -event_link("update-passwd", $event, "20"); -event_link("count-active-user-accounts", $event, "25"); -event_link("conf-modules", $event, "30"); -event_link("create-mnt-floppy", $event, "50"); -event_link("conf-routes", $event, "89"); -event_link("reset-unsavedflag", $event, "95") - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/crond"); - -#-------------------------------------------------- -# actions for console-save event -#-------------------------------------------------- -my $event = "console-save"; - - -templates2events("/etc/smartd.conf", $event); -templates2events("/home/e-smith/ssl.pem/pem", $event); -event_link("set-hostname", $event, "10"); -event_link("conf-modules", $event, "30"); -event_link("conf-startup", $event, "60"); -event_link("reset-unsavedflag", $event, "95"); - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); - -#-------------------------------------------------- -# actions for bootstrap-console-save event -#-------------------------------------------------- -$event = "bootstrap-console-save"; - - -templates2events("/etc/smartd.conf", $event); -templates2events("/home/e-smith/ssl.pem/pem", $event); -event_link("rmmod-bonding", $event, "10"); -event_link("set-hostname", $event, "10"); -event_link("conf-modules", $event, "30"); -event_link("conf-startup", $event, "60"); -event_link("conf-routes", $event, "89"); -event_link("reset-unsavedflag", $event, "95"); - -#-------------------------------------------------- -# actions for bootstrap-ldap-save -#-------------------------------------------------- -$event = "bootstrap-ldap-save"; - -templates2events("/etc/nsswitch.conf", $event); -templates2events("/etc/pam.d/system-auth", $event); -event_link("user-lock-passwd", $event, "15"); -event_link("user-modify-unix", $event, "15"); - -#-------------------------------------------------- -# actions for group-create event -#-------------------------------------------------- - -$event = "group-create"; - -event_link("group-create-unix", $event, "04"); - -#-------------------------------------------------- -# actions for group-delete event -#-------------------------------------------------- - -$event = "group-delete"; - -event_link("group-delete-unix", $event, "15"); - -#-------------------------------------------------- -# actions for group-modify event -#-------------------------------------------------- - -$event = "group-modify"; - -event_link("group-modify-unix", $event, "15"); - -#-------------------------------------------------- -# actions for halt event -#-------------------------------------------------- - -$event = "halt"; - -event_link("halt", $event, "70"); - -#-------------------------------------------------- -# actions for ip-change event -#-------------------------------------------------- - -$event = "ip-change"; - -event_link("set-external-ip", $event, "03"); -event_link("update-dns", $event, "85"); - -#-------------------------------------------------- -# actions for network-create event -#-------------------------------------------------- - -$event = "network-create"; - -event_link("conf-routes", $event, "89"); - -#-------------------------------------------------- -# actions for network-delete event -#-------------------------------------------------- - -$event = "network-delete"; - -event_link("conf-routes", $event, "89"); - -#-------------------------------------------------- -# actions for post-install event -#-------------------------------------------------- - -$event = "post-install"; - -event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); -event_link("init-accounts", $event, "05"); -event_link("init-passwords", $event, "10"); -event_link("conf-startup", $event, "10"); -event_link("conf-modules", $event, "30"); -event_link("create-mnt-floppy", $event, "50"); - -#-------------------------------------------------- -# actions for post-upgrade event -#-------------------------------------------------- - -$event = "post-upgrade"; - -event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); -event_link("init-accounts", $event, "05"); -event_link("conf-startup", $event, "10"); -event_link("user-lock-passwd", $event, "15"); -event_link("group-modify-unix", $event, "15"); -event_link("update-passwd", $event, "20"); -event_link("count-active-user-accounts", $event, "25"); -event_link("conf-modules", $event, "30"); -event_link("create-mnt-floppy", $event, "50"); -event_link("copy-anaconda-logs", $event, "90"); - -#-------------------------------------------------- -# actions for reboot event -#-------------------------------------------------- - -$event = "reboot"; - -safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/wan"); -event_link("reboot", $event, "99"); - -#-------------------------------------------------- -# actions for remoteaccess-update event -#-------------------------------------------------- - -$event = "remoteaccess-update"; - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); - -#-------------------------------------------------- -# actions for user-create event -#-------------------------------------------------- - -$event = "user-create"; - -event_link("user-create-unix", $event, "04"); -event_link("count-active-user-accounts", $event, "25"); -event_link("user-group-modify", $event, "85"); - -#-------------------------------------------------- -# actions for user-delete event -#-------------------------------------------------- - -$event = "user-delete"; - -event_link("user-delete-groups-and-pseudonyms", $event, "02"); -event_link("user-delete-unix", $event, "15"); -event_link("initialize-default-databases", $event, "23"); -event_link("count-active-user-accounts", $event, "25"); - -#-------------------------------------------------- -# actions for user-modify event -#-------------------------------------------------- - -$event = "user-modify"; - -event_link("user-modify-unix", $event, "15"); -event_link("user-group-modify", $event, "85"); - -$event = "user-modify-admin"; - -event_link("user-modify-unix", $event, "15"); - -#-------------------------------------------------- -# actions for user-lock event -#-------------------------------------------------- - -$event = "user-lock"; - -event_link("user-lock-passwd", $event, "15"); -event_link("count-active-user-accounts", $event, "25"); - -#-------------------------------------------------- -# actions for password-modify event -#-------------------------------------------------- - -$event = "password-modify"; - -event_link("count-active-user-accounts", $event, "25"); - -#-------------------------------------------------- -# actions for timeserver-update event -#-------------------------------------------------- - -$event = "timeserver-update"; - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/crond"); - -#-------------------------------------------------- -# actions for ip-up event -#-------------------------------------------------- - -$event = "ip-up"; - -event_link("set-gateway-ip", $event, "55"); - -#-------------------------------------------------- -# actions for ip-down event -#-------------------------------------------------- - -$event = "ip-down"; - -event_link("isdn-down-notify", $event, "50"); - -#-------------------------------------------------- -# actions for logrotate event -#-------------------------------------------------- - -$event = "logrotate"; - -event_link("rotate_timestamped_logfiles", $event, "05"); -event_link("purge-old-logs", $event, "75"); - -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); - -#-------------------------------------------------- -# actions for local event -#-------------------------------------------------- - -$event = "local"; - -#-------------------------------------------------- -# actions for ldap-update event -#-------------------------------------------------- - -$event = "ldap-update"; - -templates2events("/home/e-smith/ssl.pem/pem", $event); - -#-------------------------------------------------- -# actions for ldap-update event -#-------------------------------------------------- - -$event = "ssl-update"; - -templates2events("/home/e-smith/ssl.pem/pem", $event); - - -#-------------------------------------------------- -# actions for email-update event: -# email parameters have been changed in the e-smith -# manager; update system security, rewrite email config -# files, configure other system files (crontab is the -# important one), and restart server -#-------------------------------------------------- -$event = "email-update"; - - -my %service2order = -( - # Start rsyslog up before network! - raidmonitor => "15", - network => "37", - dhcpd => "65", - 'local' => "99", -); - -foreach my $service (keys %service2order) -{ - service_link_enhanced($service, $service2order{$service}, 7); -} - -%service2order = -( - dhcpd => "K35", -); - -foreach my $service (keys %service2order) -{ - service_link_enhanced($service, $service2order{$service}, 0); - service_link_enhanced($service, $service2order{$service}, 6); - service_link_enhanced($service, $service2order{$service}, 1); -} - -# Set up links to daemontools. -safe_symlink("daemontools", "root/etc/rc.d/init.d/raidmonitor"); - -safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPHostname"); -safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPEthernetAddress"); - -# Local event -safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/local"); -safe_symlink("/var/service/local" , 'root/service/local'); -safe_touch("root/var/service/local/down"); - -# no template headers for /etc/pam_ldap.secret -safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin"); - - -system('mkdir -p root/usr/lib/systemd/system/multi-user.target.wants/'); - unlink "root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service"; -symlink("/usr/lib/systemd/system/bootstrap-console.service", - "root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service") - or die "Can't symlink to root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service: $!"; - -# languages links -foreach (qw(fr-be fr-lu fr-mc fr-ch)) -{ - safe_symlink("fr", "root/etc/e-smith/locale/$_"); -} -foreach (qw(en-bz en-ca en-ie en-in en-jm en-my en-ph en-sg en-tt en-za en-zw)) -{ - safe_symlink("en-us", "root/etc/e-smith/locale/$_"); -} -foreach (qw(es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py es-sv es-us es-uy es-ve)) -{ - safe_symlink("es", "root/etc/e-smith/locale/$_"); -} -foreach (qw(de-at de-ch de-de de-li de-lu)) -{ - safe_symlink("de", "root/etc/e-smith/locale/$_"); -} -foreach (qw(it-ch it-it)) -{ - safe_symlink("it", "root/etc/e-smith/locale/$_"); -} -foreach (qw(ro-ro ro-md)) -{ - safe_symlink("ro", "root/etc/e-smith/locale/$_"); -} -foreach (qw(sv-fi sv-se)) -{ - safe_symlink("sv", "root/etc/e-smith/locale/$_"); -} -safe_symlink("zh-tw", "root/etc/e-smith/locale/zh-hk"); diff --git a/contriborbase b/contriborbase deleted file mode 100644 index ef36a67..0000000 --- a/contriborbase +++ /dev/null @@ -1 +0,0 @@ -sme10 diff --git a/root/etc/e-smith/events/actions/group-delete-unix b/root/etc/e-smith/events/actions/group-delete-unix index 6706122..d14f9bb 100755 --- a/root/etc/e-smith/events/actions/group-delete-unix +++ b/root/etc/e-smith/events/actions/group-delete-unix @@ -60,6 +60,6 @@ $result = $ldap->ldapdelgroup($groupName); $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) group $groupName.\n" ); # delete mail spool file -unless ($x == 255) { unlink("/var/spool/mail/$groupName") or ( $x = 255, warn "Failed to delete /var/spool/mail/$groupName.\n" );} +unless ($x == 255) { (if -e "/var/spool/mail/$groupName" ) {unlink("/var/spool/mail/$groupName") or ( $x = 255, warn "Failed to delete /var/spool/mail/$groupName.\n" );} } exit ($x); diff --git a/root/etc/e-smith/templates/etc/pam.d/system-auth/40password b/root/etc/e-smith/templates/etc/pam.d/system-auth/40password index 11c6f1a..41ea133 100644 --- a/root/etc/e-smith/templates/etc/pam.d/system-auth/40password +++ b/root/etc/e-smith/templates/etc/pam.d/system-auth/40password @@ -2,7 +2,7 @@ password sufficient pam_unix.so nullok md5 shadow { my $status = $ldap{Authentication} || 'disabled'; return unless $status eq 'enabled'; - $OUT .= "password sufficient pam_ldap.so use_authtok"; + $OUT .= "password sufficient pam_ldap.so"; } password required pam_deny.so diff --git a/smeserver-base.spec b/smeserver-base.spec index df819e1..0e63008 100644 --- a/smeserver-base.spec +++ b/smeserver-base.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module %define name smeserver-base Name: %{name} %define version 11.0.0 -%define release 14 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -184,6 +184,10 @@ fi %changelog +* Sat Dec 21 2024 Jean-Philippe Pialasse 11.0.0-15.sme +- fix use of passwd command when ldap auth enabled [SME: 6453] +- delete spool file only if exists to avoid error [SME: 12763] + * Mon Sep 23 2024 Jean-Philippe Pialasse 11.0.0-14.sme - fix result variable not initialized [SME: 12663]