From fed77b74466b3ca1c24c7a7e703e5c3ed2d9984e Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Tue, 19 Aug 2025 12:12:18 +0200 Subject: [PATCH] =?UTF-8?q?La=20commande=20samba=20ne=20doit=20pas=20utili?= =?UTF-8?q?er=20l=E2=80=99OU=20sp=C3=A9cifique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches.d/scribe-backend.patch | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/patches.d/scribe-backend.patch b/patches.d/scribe-backend.patch index 6e881c4..4b7f104 100644 --- a/patches.d/scribe-backend.patch +++ b/patches.d/scribe-backend.patch @@ -1,7 +1,7 @@ diff --git usr/bin/importation_scribe usr/bin/importation_scribe index 0db4982..47f5c80 100755 ---- usr/bin/importation_scribe -+++ usr/bin/importation_scribe +--- usrbin/importation_scribe ++++ usrbin/importation_scribe @@ -42,21 +42,22 @@ choix de la source de données et imports - personnels administratifs - comptes invités @@ -272,32 +272,9 @@ index 05569fd..c092698 100644 def _get_ead_type(self, login): diff --git usr/lib/python3/dist-packages/scribe/importation/writer.py usr/lib/python3/dist-packages/scribe/importation/writer.py -index 34ce0fb..626143b 100644 +index 34ce0fb..d4a2f27 100644 --- usr/lib/python3/dist-packages/scribe/importation/writer.py +++ usr/lib/python3/dist-packages/scribe/importation/writer.py -@@ -810,21 +810,21 @@ def _new_enseignant(enseignant, user, prefs, etab=None, new_passwords=[]): - 'classe':classe, - 'groups':groups, - 'entlogin':False, - 'disciplines':eval(enseignant.disciplines), - 'entpersonjointure':str(enseignant.entpersonjointure), - # préférences générales - 'quota':prefs.get_default('quota'), - 'profil':prefs.get_default('profil'), - 'shell':prefs.get_default('shell') == 'oui', - 'change_pwd':prefs.get_default('change_pwd') == 'oui' if FORCED_PASSWORD_MODIFICATION_ALLOWED else False, -- 'etab': etab, -+ 'etab': etab if etab is None else '00000000', - 'syncpassword': not EOLE_AD, - } - # création de l'enseignant - user._add(**my_enseignant) - info = "%(nom)s;%(prenom)s;%(login)s;%(password)s" - log.write_info(info % my_enseignant, config.ENS_INFO) - if EOLE_AD: - new_passwords.append((login, password)) - return login - @@ -832,25 +832,26 @@ def _maj_enseignant(enseignant, user, login, etab, administratif=False): """ traitement d'un enseignant existant (mise à jour)