smeserver/smeserver-samba
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme

Browse Source 
- use esmith::util::ldap for machines LDAP account [SME: 12687]
This commit is contained in:
Jean-Philippe Pialasse 2024-08-13 21:36:55 -04:00
parent 873bae7efd
commit fd1b3c13c3
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
root/etc/e-smith/events/actions/create-machine-account
View File

@ -1,6 +1,7 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# copyright (C) 2001 Mitel Networks Corporation # copyright (C) 2001 Mitel Networks Corporation
# Copyright (C) 2024 Koozali Foundation inc.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -26,6 +27,9 @@ use Errno;
use esmith::ConfigDB; use esmith::ConfigDB;
use esmith::AccountsDB; use esmith::AccountsDB;
use esmith::util; use esmith::util;
use utf8;
use esmith::util::ldap;
my $a = esmith::AccountsDB->open || die "Couldn't open accounts db\n"; my $a = esmith::AccountsDB->open || die "Couldn't open accounts db\n";
my $c = esmith::ConfigDB->open_ro || die "Could not open Config DB"; my $c = esmith::ConfigDB->open_ro || die "Could not open Config DB";
@ -33,8 +37,8 @@ my $c = esmith::ConfigDB->open_ro || die "Could not open Config DB";
my $ldapauth = $c->get('ldap')->prop('Authentication') || 'disabled'; my $ldapauth = $c->get('ldap')->prop('Authentication') || 'disabled';
my $x = 0; # exit value my $x = 0; # exit value
my $domain = $c->get('DomainName')->value(); # prepare LDAP bind
my $base = esmith::util::ldapBase ($domain); my $ldap=esmith::util::ldap->new();
my $event = $ARGV [0]; my $event = $ARGV [0];
my $machineName = $ARGV [1]; my $machineName = $ARGV [1];
@ -101,34 +105,16 @@ if ($ldapauth ne 'enabled')
} }
# Create the machine's unique group first (in ldap) # Create the machine's unique group first (in ldap)
system( my $result = $ldap->ldapgroup($m);
"/usr/sbin/cpu", "-C/etc/cpu-system.conf", "groupadd", $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) group $machineName.\n" );
"-g", $gid,
"-o",
"$machineName"
) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) group $machineName.\n" );
# Now create the machine account (in ldap) # Now create the machine account (in ldap). samba related action script will add more
system( $result = $ldap->ldapaddmachine($m);
"/usr/sbin/cpu", "-C/etc/cpu-system.conf", "useradd", $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $machineName.\n" );
"-u", $uid,
"-g", $gid,
"--userbase=ou=Computers,$base",
"-c", "Hostname account for $machineName",
"-o",
"-d", "/noexistingpath",
"-s", "/bin/false",
"$machineName"
) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $machineName.\n" );
warn "create-machine-account $machineName: Locking account\n"; warn "create-machine-account $machineName: Locking account\n";
system("/usr/sbin/cpu", "-C/etc/cpu-system.conf", "usermod", # esmith::util::ldap ldapaddmachine already lock account on creation in LDAP
"--userbase=ou=Computers,$base",
"-o",
"-L",
"$machineName"
) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed locking (ldap) password for $machineName\n" );
if ($ldapauth ne 'enabled') if ($ldapauth ne 'enabled')
{ {

7
smeserver-samba.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver specific Samba configuration files and templates
%define name smeserver-samba %define name smeserver-samba
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 5 %define release 6
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -18,7 +18,7 @@ Provides: e-smith-samba
Obsoletes: e-smith-samba Obsoletes: e-smith-samba
BuildRequires: smeserver-devtools >= 1.13.1-03 BuildRequires: smeserver-devtools >= 1.13.1-03
Obsoletes: e-smith-regedit Obsoletes: e-smith-regedit
Requires: smeserver-lib >= 2.2.0-2 Requires: smeserver-lib >= 11.0.0-7
Requires: smeserver-formmagick >= 1.4.0-9 Requires: smeserver-formmagick >= 1.4.0-9
Requires: samba >= 3.5.10 Requires: samba >= 3.5.10
Requires: samba-client >= 3.5.10 Requires: samba-client >= 3.5.10
@ -41,6 +41,9 @@ Requires: /usr/bin/tdbbackup
AutoReqProv: no AutoReqProv: no
%changelog %changelog
* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
- use esmith::util::ldap for machines LDAP account [SME: 12687]
* Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme * Tue Apr 16 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- remove deprecated options [SME: 12630] - remove deprecated options [SME: 12630]