mirror of
https://abf.rosa.ru/djam/samba.git
synced 2025-02-23 17:12:48 +00:00
Updated to 4.1.6
This commit is contained in:
Denis Silakov
parent
b2032fd43c
commit
860f018b81
21 changed files with 1277 additions and 4596 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,3 +1,2 @@
|
|||
sources:
|
||||
"samba-3.6.19.tar.gz": 098fec00a0a02b704853e4077f2550d71f850c06
|
||||
"samba-virusfilter-0.1.4.tar.gz": 61368ed25bfab3c858b46c4aeb3e55fe2d6f49ad
|
||||
samba-4.1.6.tar.gz: e265ac592d3a3bf98899f3963d74ccd607106de3
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
This rpm was built with default options
|
||||
|
||||
samba-3.6.9-1
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,700 +0,0 @@
|
|||
--- samba-3.0.21c/source/po/fr.msg.orig 2005-02-25 18:59:36.000000000 +0100
|
||||
+++ samba-3.0.21c/source/po/fr.msg 2006-03-02 09:16:39.000000000 +0100
|
||||
@@ -1,5 +1,8 @@
|
||||
+# translation of fr.po to Français
|
||||
# French messages for international release of SWAT.
|
||||
# Copyright (C) 2001 François Le Lay <fanch@tuxfamily.org>
|
||||
+# Copyright (C) 2006 Nicolas Lecureuil <neoclust@mandriva.org>
|
||||
+# Copyright (C) 2006 Christophe Berthelé <cpjc@free.fr>
|
||||
#
|
||||
# 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
|
||||
@@ -13,41 +16,52 @@
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
#
|
||||
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
+# Christophe Berthelé <cpjc@free.fr>, 2006.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
-"Project-Id-Version: i18n_swat \n"
|
||||
+"Project-Id-Version: fr\n"
|
||||
"POT-Creation-Date: 2003-10-06 05:30+0900\n"
|
||||
-"PO-Revision-Date: 2000-02-08 14:45+0100\n"
|
||||
-"Last-Translator: François Le Lay <fanch@tuxfamily.org>\n"
|
||||
-"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
|
||||
+"PO-Revision-Date: 2006-03-01 16:30+0100\n"
|
||||
+"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
|
||||
+"Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
-"Content-Type: text/plain; charset=utf-8\n"
|
||||
-"Content-Transfer-Encoding: \n"
|
||||
+"Content-Type: text/plain; charset=UTF-8\n"
|
||||
+"Content-Transfer-Encoding: 8bit\n"
|
||||
+"X-Generator: KBabel 1.11.1\n"
|
||||
+"Plural-Forms: nplurals=2;plural=(n>1);\n"
|
||||
|
||||
#: ../web/swat.c:117
|
||||
#, c-format
|
||||
msgid "ERROR: Can't open %s"
|
||||
-msgstr ""
|
||||
+msgstr "ERREUR : Ne peut pas ouvrir %s"
|
||||
|
||||
#: ../web/swat.c:200
|
||||
msgid "Help"
|
||||
msgstr "Aide"
|
||||
|
||||
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
|
||||
+#: ../web/swat.c:206
|
||||
+#: ../web/swat.c:220
|
||||
+#: ../web/swat.c:235
|
||||
+#: ../web/swat.c:243
|
||||
+#: ../web/swat.c:252
|
||||
+#: ../web/swat.c:261
|
||||
+#: ../web/swat.c:267
|
||||
+#: ../web/swat.c:273
|
||||
+#: ../web/swat.c:286
|
||||
msgid "Set Default"
|
||||
-msgstr "Définir par défaut"
|
||||
+msgstr "Rétablir la valeur par défaut"
|
||||
|
||||
#: ../web/swat.c:408
|
||||
#, c-format
|
||||
msgid "failed to open %s for writing"
|
||||
-msgstr ""
|
||||
+msgstr "échec lors de l'ouverture de %s en écriture"
|
||||
|
||||
#: ../web/swat.c:431
|
||||
#, c-format
|
||||
msgid "Can't reload %s"
|
||||
-msgstr ""
|
||||
+msgstr "Ne peut recharger %s"
|
||||
|
||||
#: ../web/swat.c:501
|
||||
#, c-format
|
||||
@@ -60,7 +74,7 @@
|
||||
|
||||
#: ../web/swat.c:507
|
||||
msgid "Globals"
|
||||
-msgstr "Paramètres Généraux"
|
||||
+msgstr "Paramètres généraux"
|
||||
|
||||
#: ../web/swat.c:508
|
||||
msgid "Shares"
|
||||
@@ -72,11 +86,11 @@
|
||||
|
||||
#: ../web/swat.c:510
|
||||
msgid "Wizard"
|
||||
-msgstr ""
|
||||
+msgstr "Assistant"
|
||||
|
||||
#: ../web/swat.c:513
|
||||
msgid "Status"
|
||||
-msgstr "Statut"
|
||||
+msgstr "Etat"
|
||||
|
||||
#: ../web/swat.c:514
|
||||
msgid "View Config"
|
||||
@@ -88,134 +102,140 @@
|
||||
|
||||
#: ../web/swat.c:526
|
||||
msgid "Current View Is"
|
||||
-msgstr "Configuration Actuelle"
|
||||
+msgstr "La vue actuelle est"
|
||||
|
||||
-#: ../web/swat.c:527 ../web/swat.c:530
|
||||
+#: ../web/swat.c:527
|
||||
+#: ../web/swat.c:530
|
||||
msgid "Basic"
|
||||
-msgstr "Vue Basique"
|
||||
+msgstr "Vue simple"
|
||||
|
||||
-#: ../web/swat.c:528 ../web/swat.c:531
|
||||
+#: ../web/swat.c:528
|
||||
+#: ../web/swat.c:531
|
||||
msgid "Advanced"
|
||||
-msgstr "Vue Détaillée"
|
||||
+msgstr "Vue détaillée"
|
||||
|
||||
#: ../web/swat.c:529
|
||||
msgid "Change View To"
|
||||
-msgstr "Modifier le mot de passe"
|
||||
+msgstr "Changer la vue en"
|
||||
|
||||
#: ../web/swat.c:554
|
||||
msgid "Current Config"
|
||||
-msgstr "Configuration Actuelle"
|
||||
+msgstr "Configuration actuelle"
|
||||
|
||||
#: ../web/swat.c:558
|
||||
msgid "Normal View"
|
||||
-msgstr "Vue Normale"
|
||||
+msgstr "Vue normale"
|
||||
|
||||
#: ../web/swat.c:560
|
||||
msgid "Full View"
|
||||
-msgstr "Vue Complète"
|
||||
+msgstr "Vue complète"
|
||||
|
||||
#. Here we first set and commit all the parameters that were selected
|
||||
#. in the previous screen.
|
||||
#: ../web/swat.c:579
|
||||
msgid "Wizard Parameter Edit Page"
|
||||
-msgstr ""
|
||||
+msgstr "Assistant d'édition des paramètres"
|
||||
|
||||
#: ../web/swat.c:608
|
||||
msgid "Note: smb.conf file has been read and rewritten"
|
||||
-msgstr ""
|
||||
+msgstr "Note : le fichier smb.conf a été lu et réécrit"
|
||||
|
||||
#. Here we go ...
|
||||
#: ../web/swat.c:716
|
||||
msgid "Samba Configuration Wizard"
|
||||
-msgstr ""
|
||||
+msgstr "Assistant de configuration de Samba"
|
||||
|
||||
#: ../web/swat.c:720
|
||||
msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
|
||||
-msgstr ""
|
||||
+msgstr "Le bouton \"Réécrire le fichier smb.conf\" va enlever du fichier smb.conf toutes les valeurs par défaut ainsi que les commentaires"
|
||||
|
||||
#: ../web/swat.c:721
|
||||
msgid "The same will happen if you press the commit button."
|
||||
-msgstr ""
|
||||
+msgstr "La même chose surviendra si vous appuyez sur le bouton Appliquer"
|
||||
|
||||
#: ../web/swat.c:724
|
||||
msgid "Rewrite smb.conf file"
|
||||
-msgstr ""
|
||||
+msgstr "Réécrire le fichier smb.conf"
|
||||
|
||||
#: ../web/swat.c:725
|
||||
msgid "Commit"
|
||||
-msgstr "commentaire"
|
||||
+msgstr "Appliquer"
|
||||
|
||||
#: ../web/swat.c:726
|
||||
msgid "Edit Parameter Values"
|
||||
-msgstr "Paramètres Imprimantes"
|
||||
+msgstr "Editer les paramètres"
|
||||
|
||||
#: ../web/swat.c:732
|
||||
msgid "Server Type"
|
||||
-msgstr ""
|
||||
+msgstr "Type de serveur"
|
||||
|
||||
#: ../web/swat.c:733
|
||||
msgid "Stand Alone"
|
||||
-msgstr ""
|
||||
+msgstr "Indépendant"
|
||||
|
||||
#: ../web/swat.c:734
|
||||
msgid "Domain Member"
|
||||
-msgstr "master de domaine"
|
||||
+msgstr "Membre du domaine"
|
||||
|
||||
#: ../web/swat.c:735
|
||||
msgid "Domain Controller"
|
||||
-msgstr "master de domaine"
|
||||
+msgstr "Contrôleur de domaine"
|
||||
|
||||
#: ../web/swat.c:738
|
||||
msgid "Unusual Type in smb.conf - Please Select New Mode"
|
||||
-msgstr ""
|
||||
+msgstr "Type inhabituel dans smb.conf - Veuillez en sélectionner un nouveau"
|
||||
|
||||
#: ../web/swat.c:740
|
||||
msgid "Configure WINS As"
|
||||
-msgstr ""
|
||||
+msgstr "Configurer WINS en tant que"
|
||||
|
||||
#: ../web/swat.c:741
|
||||
msgid "Not Used"
|
||||
-msgstr "ne pas descendre"
|
||||
+msgstr "Non utilisé"
|
||||
|
||||
#: ../web/swat.c:742
|
||||
msgid "Server for client use"
|
||||
-msgstr ""
|
||||
+msgstr "Serveur pour client"
|
||||
|
||||
#: ../web/swat.c:743
|
||||
msgid "Client of another WINS server"
|
||||
-msgstr ""
|
||||
+msgstr "Client d'un autre serveur WINS"
|
||||
|
||||
#: ../web/swat.c:745
|
||||
msgid "Remote WINS Server"
|
||||
-msgstr ""
|
||||
+msgstr "Serveur WINS distant"
|
||||
|
||||
#: ../web/swat.c:756
|
||||
msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
|
||||
-msgstr ""
|
||||
+msgstr "Erreur : le mode serveur WINS et Support WINS sont tous les deux activés dans smb.conf"
|
||||
|
||||
#: ../web/swat.c:757
|
||||
msgid "Please Select desired WINS mode above."
|
||||
-msgstr ""
|
||||
+msgstr "Veuillez choisir ci-dessus le mode WINS désiré."
|
||||
|
||||
#: ../web/swat.c:759
|
||||
msgid "Expose Home Directories"
|
||||
-msgstr ""
|
||||
+msgstr "Montrer les répertoires personnels"
|
||||
|
||||
#: ../web/swat.c:774
|
||||
msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
|
||||
-msgstr ""
|
||||
+msgstr "Les options de configuration ci-dessus vont initialiser différents paramètres et vont généralement aider pour un déploiement rapide de Samba."
|
||||
|
||||
#: ../web/swat.c:787
|
||||
msgid "Global Parameters"
|
||||
-msgstr "Variables Globales"
|
||||
+msgstr "Paramètres généraux"
|
||||
|
||||
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
|
||||
+#: ../web/swat.c:815
|
||||
+#: ../web/swat.c:916
|
||||
+#: ../web/swat.c:1265
|
||||
msgid "Commit Changes"
|
||||
msgstr "Sauver les modifications"
|
||||
|
||||
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
|
||||
+#: ../web/swat.c:819
|
||||
+#: ../web/swat.c:919
|
||||
+#: ../web/swat.c:1267
|
||||
msgid "Reset Values"
|
||||
-msgstr "Réinitialiser Valeurs"
|
||||
+msgstr "Réinitialiser les valeurs"
|
||||
|
||||
#: ../web/swat.c:844
|
||||
msgid "Share Parameters"
|
||||
@@ -239,7 +259,7 @@
|
||||
|
||||
#: ../web/swat.c:957
|
||||
msgid "Can't setup password database vectors."
|
||||
-msgstr ""
|
||||
+msgstr "Impossible d'initialiser la base de mots de passe."
|
||||
|
||||
#: ../web/swat.c:983
|
||||
msgid " Must specify \"User Name\" "
|
||||
@@ -247,19 +267,19 @@
|
||||
|
||||
#: ../web/swat.c:999
|
||||
msgid " Must specify \"Old Password\" "
|
||||
-msgstr " Le champ \"Ancien mot de passe\" doît être spécifié"
|
||||
+msgstr " Le champ \"Ancien mot de passe\" doit être spécifié"
|
||||
|
||||
#: ../web/swat.c:1005
|
||||
msgid " Must specify \"Remote Machine\" "
|
||||
-msgstr " Le champ \"Machine Distante\" doît être spécifié"
|
||||
+msgstr " Le champ \"Machine Distante\" doit être spécifié "
|
||||
|
||||
#: ../web/swat.c:1012
|
||||
msgid " Must specify \"New, and Re-typed Passwords\" "
|
||||
-msgstr "Les champs \"Nouveau mot de passe\" et \"Confirmation du nouveau mot de passe\" doivent être spécifiés \n"
|
||||
+msgstr "Les champs \"Nouveau mot de passe\" et \"Confirmation du nouveau mot de passe\" doivent être spécifiés "
|
||||
|
||||
#: ../web/swat.c:1018
|
||||
msgid " Re-typed password didn't match new password "
|
||||
-msgstr " Echec de la confirmation du nouveau mot de passe"
|
||||
+msgstr " Echec les mots de passe sont différents"
|
||||
|
||||
#: ../web/swat.c:1048
|
||||
#, c-format
|
||||
@@ -269,7 +289,7 @@
|
||||
#: ../web/swat.c:1051
|
||||
#, c-format
|
||||
msgid " The passwd for '%s' has NOT been changed."
|
||||
-msgstr " Le mot de passe de '%s' n'a PAS été modifié. \n"
|
||||
+msgstr " Le mot de passe de '%s' n'a PAS été modifié."
|
||||
|
||||
#: ../web/swat.c:1076
|
||||
msgid "Server Password Management"
|
||||
@@ -278,41 +298,46 @@
|
||||
#.
|
||||
#. * Create all the dialog boxes for data collection
|
||||
#.
|
||||
-#: ../web/swat.c:1085 ../web/swat.c:1132
|
||||
+#: ../web/swat.c:1085
|
||||
+#: ../web/swat.c:1132
|
||||
msgid "User Name"
|
||||
-msgstr " Nom d'utilisateur : "
|
||||
+msgstr "Nom d'utilisateur"
|
||||
|
||||
-#: ../web/swat.c:1088 ../web/swat.c:1134
|
||||
+#: ../web/swat.c:1088
|
||||
+#: ../web/swat.c:1134
|
||||
msgid "Old Password"
|
||||
-msgstr " Ancien mot de passe : "
|
||||
+msgstr "Ancien mot de passe"
|
||||
|
||||
-#: ../web/swat.c:1091 ../web/swat.c:1136
|
||||
+#: ../web/swat.c:1091
|
||||
+#: ../web/swat.c:1136
|
||||
msgid "New Password"
|
||||
-msgstr " Nouveau mot de passe : "
|
||||
+msgstr "Nouveau mot de passe"
|
||||
|
||||
-#: ../web/swat.c:1093 ../web/swat.c:1138
|
||||
+#: ../web/swat.c:1093
|
||||
+#: ../web/swat.c:1138
|
||||
msgid "Re-type New Password"
|
||||
-msgstr " Confirmation du nouveau mot de passe : "
|
||||
+msgstr " Confirmation du nouveau mot de passe"
|
||||
|
||||
-#: ../web/swat.c:1101 ../web/swat.c:1149
|
||||
+#: ../web/swat.c:1101
|
||||
+#: ../web/swat.c:1149
|
||||
msgid "Change Password"
|
||||
msgstr "Modifier le mot de passe"
|
||||
|
||||
#: ../web/swat.c:1104
|
||||
msgid "Add New User"
|
||||
-msgstr "Nouvel Utilisateur"
|
||||
+msgstr "Ajouter l'utilisateur"
|
||||
|
||||
#: ../web/swat.c:1106
|
||||
msgid "Delete User"
|
||||
-msgstr "Supprimer Utilisateur"
|
||||
+msgstr "Supprimer l'utilisateur"
|
||||
|
||||
#: ../web/swat.c:1108
|
||||
msgid "Disable User"
|
||||
-msgstr "Désactiver Utilisateur"
|
||||
+msgstr "Désactiver l'utilisateur"
|
||||
|
||||
#: ../web/swat.c:1110
|
||||
msgid "Enable User"
|
||||
-msgstr "Activer Utilisateur"
|
||||
+msgstr "Activer l'utilisateur"
|
||||
|
||||
#: ../web/swat.c:1123
|
||||
msgid "Client/Server Password Management"
|
||||
@@ -320,7 +345,7 @@
|
||||
|
||||
#: ../web/swat.c:1140
|
||||
msgid "Remote Machine"
|
||||
-msgstr " Machine distante : "
|
||||
+msgstr "Machine distante"
|
||||
|
||||
#: ../web/swat.c:1179
|
||||
msgid "Printer Parameters"
|
||||
@@ -328,19 +353,20 @@
|
||||
|
||||
#: ../web/swat.c:1181
|
||||
msgid "Important Note:"
|
||||
-msgstr "Note Importante:"
|
||||
+msgstr "Note importante :"
|
||||
|
||||
#: ../web/swat.c:1182
|
||||
msgid "Printer names marked with [*] in the Choose Printer drop-down box "
|
||||
-msgstr "Les Noms d'imprimantes marqués du signe [*] dans le menu déroulant Choisir Imprimante"
|
||||
+msgstr "Les noms d'imprimantes marqués du signe [*] dans le menu déroulant Choisir Imprimante "
|
||||
|
||||
#: ../web/swat.c:1183
|
||||
msgid "are autoloaded printers from "
|
||||
-msgstr "désignent des imprimantes automatiquement chargées depuis le "
|
||||
+msgstr "désignent des imprimantes définies dans "
|
||||
|
||||
+# Traducteurs : Name volontairement non traduit
|
||||
#: ../web/swat.c:1184
|
||||
msgid "Printcap Name"
|
||||
-msgstr "Nom Printcap"
|
||||
+msgstr "Printcap"
|
||||
|
||||
#: ../web/swat.c:1185
|
||||
msgid "Attempting to delete these printers from SWAT will have no effect."
|
||||
@@ -348,63 +374,68 @@
|
||||
|
||||
#: ../web/swat.c:1231
|
||||
msgid "Choose Printer"
|
||||
-msgstr "Choisir Imprimante"
|
||||
+msgstr "Choisir une imprimante"
|
||||
|
||||
#: ../web/swat.c:1250
|
||||
msgid "Delete Printer"
|
||||
-msgstr "Supprimer Imprimante"
|
||||
+msgstr "Supprimer une imprimante"
|
||||
|
||||
#: ../web/swat.c:1257
|
||||
msgid "Create Printer"
|
||||
-msgstr "Créer Imprimante"
|
||||
+msgstr "Créer une imprimante"
|
||||
|
||||
#: ../web/statuspage.c:123
|
||||
msgid "RDONLY "
|
||||
-msgstr ""
|
||||
+msgstr "RDONLY "
|
||||
|
||||
#: ../web/statuspage.c:124
|
||||
msgid "WRONLY "
|
||||
-msgstr ""
|
||||
+msgstr "WRONLY "
|
||||
|
||||
#: ../web/statuspage.c:125
|
||||
msgid "RDWR "
|
||||
-msgstr ""
|
||||
+msgstr "RDWR "
|
||||
|
||||
#: ../web/statuspage.c:309
|
||||
msgid "Server Status"
|
||||
-msgstr "Statut du Serveur"
|
||||
+msgstr "Etat du serveur"
|
||||
|
||||
#: ../web/statuspage.c:314
|
||||
msgid "Auto Refresh"
|
||||
-msgstr "Rafraîchissement Automatique"
|
||||
+msgstr "Rafraîchissement automatique"
|
||||
|
||||
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
|
||||
+#: ../web/statuspage.c:315
|
||||
+#: ../web/statuspage.c:320
|
||||
msgid "Refresh Interval: "
|
||||
-msgstr "Intervalle de rafraîchissement: "
|
||||
+msgstr "Intervalle de rafraîchissement : "
|
||||
|
||||
#: ../web/statuspage.c:319
|
||||
msgid "Stop Refreshing"
|
||||
-msgstr "Stopper Rafraîchissement"
|
||||
+msgstr "Arrêter le rafraîchissement"
|
||||
|
||||
#: ../web/statuspage.c:334
|
||||
msgid "version:"
|
||||
-msgstr "version:"
|
||||
+msgstr "version :"
|
||||
|
||||
#: ../web/statuspage.c:337
|
||||
msgid "smbd:"
|
||||
-msgstr ""
|
||||
+msgstr "smbd :"
|
||||
|
||||
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
|
||||
+#: ../web/statuspage.c:337
|
||||
+#: ../web/statuspage.c:350
|
||||
+#: ../web/statuspage.c:364
|
||||
msgid "running"
|
||||
msgstr "actif"
|
||||
|
||||
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
|
||||
+#: ../web/statuspage.c:337
|
||||
+#: ../web/statuspage.c:350
|
||||
+#: ../web/statuspage.c:364
|
||||
msgid "not running"
|
||||
-msgstr "non actif"
|
||||
+msgstr "inactif"
|
||||
|
||||
#: ../web/statuspage.c:341
|
||||
msgid "Stop smbd"
|
||||
-msgstr "Stopper smbd"
|
||||
+msgstr "Arrêter smbd"
|
||||
|
||||
#: ../web/statuspage.c:343
|
||||
msgid "Start smbd"
|
||||
@@ -416,11 +447,11 @@
|
||||
|
||||
#: ../web/statuspage.c:350
|
||||
msgid "nmbd:"
|
||||
-msgstr ""
|
||||
+msgstr "nmbd :"
|
||||
|
||||
#: ../web/statuspage.c:354
|
||||
msgid "Stop nmbd"
|
||||
-msgstr "Stopper nmbd"
|
||||
+msgstr "Arrêter nmbd"
|
||||
|
||||
#: ../web/statuspage.c:356
|
||||
msgid "Start nmbd"
|
||||
@@ -432,51 +463,56 @@
|
||||
|
||||
#: ../web/statuspage.c:364
|
||||
msgid "winbindd:"
|
||||
-msgstr ""
|
||||
+msgstr "winbindd :"
|
||||
|
||||
#: ../web/statuspage.c:368
|
||||
msgid "Stop winbindd"
|
||||
-msgstr "Stopper nmbd"
|
||||
+msgstr "Arrêter winbindd"
|
||||
|
||||
#: ../web/statuspage.c:370
|
||||
msgid "Start winbindd"
|
||||
-msgstr "Lancer nmbd"
|
||||
+msgstr "Lancer winbindd"
|
||||
|
||||
#: ../web/statuspage.c:372
|
||||
msgid "Restart winbindd"
|
||||
-msgstr "Relancer nmbd"
|
||||
+msgstr "Relancer winbindd"
|
||||
|
||||
#. stop, restart all
|
||||
#: ../web/statuspage.c:381
|
||||
msgid "Stop All"
|
||||
-msgstr ""
|
||||
+msgstr "Arrêter tout"
|
||||
|
||||
#: ../web/statuspage.c:382
|
||||
msgid "Restart All"
|
||||
-msgstr "Relancer nmbd"
|
||||
+msgstr "Relancer tout"
|
||||
|
||||
#. start all
|
||||
#: ../web/statuspage.c:386
|
||||
msgid "Start All"
|
||||
-msgstr "Lancer nmbd"
|
||||
+msgstr "Lancer tout"
|
||||
|
||||
#: ../web/statuspage.c:393
|
||||
msgid "Active Connections"
|
||||
-msgstr "Connections Actives"
|
||||
+msgstr "Connexions actives"
|
||||
|
||||
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
|
||||
+#: ../web/statuspage.c:395
|
||||
+#: ../web/statuspage.c:408
|
||||
+#: ../web/statuspage.c:416
|
||||
msgid "PID"
|
||||
-msgstr ""
|
||||
+msgstr "PID"
|
||||
|
||||
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
|
||||
+#: ../web/statuspage.c:395
|
||||
+#: ../web/statuspage.c:408
|
||||
msgid "Client"
|
||||
-msgstr ""
|
||||
+msgstr "Client"
|
||||
|
||||
#: ../web/statuspage.c:395
|
||||
msgid "IP address"
|
||||
-msgstr "adresse IP"
|
||||
+msgstr "Adresse IP"
|
||||
|
||||
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
|
||||
+#: ../web/statuspage.c:395
|
||||
+#: ../web/statuspage.c:408
|
||||
+#: ../web/statuspage.c:416
|
||||
msgid "Date"
|
||||
msgstr "Date"
|
||||
|
||||
@@ -486,11 +522,11 @@
|
||||
|
||||
#: ../web/statuspage.c:405
|
||||
msgid "Active Shares"
|
||||
-msgstr "Partages Actifs"
|
||||
+msgstr "Partages actifs"
|
||||
|
||||
#: ../web/statuspage.c:408
|
||||
msgid "Share"
|
||||
-msgstr "Partager"
|
||||
+msgstr "Partage"
|
||||
|
||||
#: ../web/statuspage.c:408
|
||||
msgid "User"
|
||||
@@ -502,19 +538,19 @@
|
||||
|
||||
#: ../web/statuspage.c:414
|
||||
msgid "Open Files"
|
||||
-msgstr "Fichiers Ouverts"
|
||||
+msgstr "Fichiers ouverts"
|
||||
|
||||
#: ../web/statuspage.c:416
|
||||
msgid "Sharing"
|
||||
-msgstr ""
|
||||
+msgstr "Partage"
|
||||
|
||||
#: ../web/statuspage.c:416
|
||||
msgid "R/W"
|
||||
-msgstr ""
|
||||
+msgstr "R/W"
|
||||
|
||||
#: ../web/statuspage.c:416
|
||||
msgid "Oplock"
|
||||
-msgstr ""
|
||||
+msgstr "Verrouillage"
|
||||
|
||||
#: ../web/statuspage.c:416
|
||||
msgid "File"
|
||||
@@ -522,11 +558,11 @@
|
||||
|
||||
#: ../web/statuspage.c:425
|
||||
msgid "Show Client in col 1"
|
||||
-msgstr ""
|
||||
+msgstr "Montrer le client dans la col 1"
|
||||
|
||||
#: ../web/statuspage.c:426
|
||||
msgid "Show PID in col 1"
|
||||
-msgstr ""
|
||||
+msgstr "Montrer le PID dans la col 1"
|
||||
|
||||
#: ../param/loadparm.c:755
|
||||
msgid "Base Options"
|
||||
@@ -534,19 +570,19 @@
|
||||
|
||||
#: ../param/loadparm.c:775
|
||||
msgid "Security Options"
|
||||
-msgstr "Options de Sécurité"
|
||||
+msgstr "Options de sécurité"
|
||||
|
||||
#: ../param/loadparm.c:859
|
||||
msgid "Logging Options"
|
||||
-msgstr "Options de Logging"
|
||||
+msgstr "Options de journalisation"
|
||||
|
||||
#: ../param/loadparm.c:874
|
||||
msgid "Protocol Options"
|
||||
-msgstr "Options de Protocole"
|
||||
+msgstr "Options de protocole"
|
||||
|
||||
#: ../param/loadparm.c:911
|
||||
msgid "Tuning Options"
|
||||
-msgstr "Options de réglage"
|
||||
+msgstr "Options de réglage fin"
|
||||
|
||||
#: ../param/loadparm.c:940
|
||||
msgid "Printing Options"
|
||||
@@ -558,15 +594,15 @@
|
||||
|
||||
#: ../param/loadparm.c:996
|
||||
msgid "Domain Options"
|
||||
-msgstr "Options de Domaine"
|
||||
+msgstr "Options du Domaine"
|
||||
|
||||
#: ../param/loadparm.c:1000
|
||||
msgid "Logon Options"
|
||||
-msgstr "Options de Logon"
|
||||
+msgstr "Options de connexion"
|
||||
|
||||
#: ../param/loadparm.c:1019
|
||||
msgid "Browse Options"
|
||||
-msgstr "Options de Navigation"
|
||||
+msgstr "Options de navigation"
|
||||
|
||||
#: ../param/loadparm.c:1033
|
||||
msgid "WINS Options"
|
||||
@@ -574,7 +610,7 @@
|
||||
|
||||
#: ../param/loadparm.c:1043
|
||||
msgid "Locking Options"
|
||||
-msgstr "Options de Verrouillage"
|
||||
+msgstr "Options de verrouillage"
|
||||
|
||||
#: ../param/loadparm.c:1061
|
||||
msgid "Ldap Options"
|
||||
@@ -582,7 +618,7 @@
|
||||
|
||||
#: ../param/loadparm.c:1078
|
||||
msgid "Miscellaneous Options"
|
||||
-msgstr "Options Diverses"
|
||||
+msgstr "Options diverses"
|
||||
|
||||
#: ../param/loadparm.c:1138
|
||||
msgid "VFS module options"
|
||||
@@ -591,3 +627,4 @@
|
||||
#: ../param/loadparm.c:1148
|
||||
msgid "Winbind options"
|
||||
msgstr "Options Winbind"
|
||||
+
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
--- samba-3.5.1/source3/configure.in~ 2010-03-08 20:34:39.000000000 +0100
|
||||
+++ samba-3.5.1/source3/configure.in 2010-04-06 16:05:40.000000000 +0100
|
||||
@@ -1712,7 +1712,7 @@
|
||||
# platforms unresolved symbols might be intended, so we might have to add
|
||||
# platform specific exceptions here.
|
||||
|
||||
-for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
|
||||
+for flags in "-Wl,--no-undefined" "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
|
||||
saved_ldflags="$LDFLAGS"
|
||||
AC_MSG_CHECKING([if $flags works])
|
||||
LDFLAGS="$flags $saved_ldflags"
|
||||
--- samba-3.5.1/source3/Makefile.in~ 2010-03-08 20:34:39.000000000 +0100
|
||||
+++ samba-3.5.1/source3/Makefile.in 2010-04-08 15:35:20.000000000 +0100
|
||||
@@ -1432,6 +1432,7 @@
|
||||
@echo " LDFLAGS = $(LDFLAGS)"
|
||||
@echo " DYNEXP = $(DYNEXP)"
|
||||
@echo " LDSHFLAGS = $(LDSHFLAGS)"
|
||||
+ @echo "LDSHFLAGS_MODULES= $(LDSHFLAGS_MODULES)"
|
||||
@echo " SHLIBEXT = @SHLIBEXT@"
|
||||
@echo " SONAMEFLAG = @SONAMEFLAG@"
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -p -up samba-3.5.3/nsswitch/wins.c.wins_log samba-3.5.3/nsswitch/wins.c
|
||||
--- samba-3.5.3/nsswitch/wins.c.wins_log 2010-05-17 11:51:23.000000000 +0000
|
||||
+++ samba-3.5.3/nsswitch/wins.c 2010-06-06 15:48:54.401949879 +0000
|
||||
@@ -96,7 +96,7 @@ static void nss_wins_init(void)
|
||||
AllowDebugChange = False;
|
||||
|
||||
TimeInit();
|
||||
- setup_logging("nss_wins",False);
|
||||
+ setup_logging(NULL,False);
|
||||
load_case_tables();
|
||||
lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
|
||||
load_interfaces();
|
||||
diff -p -up samba-3.5.3/source3/lib/debug.c.wins_log samba-3.5.3/source3/lib/debug.c
|
||||
--- samba-3.5.3/source3/lib/debug.c.wins_log 2010-05-17 12:51:23.000000000 +0100
|
||||
+++ samba-3.5.3/source3/lib/debug.c 2010-06-07 20:20:56.000000000 +0100
|
||||
@@ -589,7 +589,7 @@
|
||||
x_setbuf( x_stdout, NULL );
|
||||
}
|
||||
#ifdef WITH_SYSLOG
|
||||
- else {
|
||||
+ else if (pname) {
|
||||
const char *p = strrchr_m( pname,'/' );
|
||||
if (p)
|
||||
pname = p + 1;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- samba-3.5.8/source3/lib/netapi/examples/Makefile.in~ 2011-03-06 20:48:05.000000000 +0200
|
||||
+++ samba-3.5.8/source3/lib/netapi/examples/Makefile.in 2011-05-02 15:22:07.000000000 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
KRB5LIBS=@KRB5_LIBS@
|
||||
LDAP_LIBS=@LDAP_LIBS@
|
||||
-LIBS=@LIBS@ -lnetapi -ltdb -ltalloc
|
||||
+LIBS=@LIBS@ -lnetapi -ltdb -ltalloc -lwbclient
|
||||
DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
|
||||
CCFLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
|
||||
CC=@CC@
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iD8DBQBSOWxfbzORW2Vot+oRAgrLAKCTDmB9wwOWtz4+JOX2l5QSzkdSmQCgvuv7
|
||||
kLF6NoTtZg7OB5AjK9laQJs=
|
||||
=kGaQ
|
||||
-----END PGP SIGNATURE-----
|
||||
10
samba-4.0.0-tirpc.patch
Normal file
10
samba-4.0.0-tirpc.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
--- samba-4.1.4/source3/wscript_build.tirpc~ 2014-02-18 20:30:42.011477913 +0100
|
||||
+++ samba-4.1.4/source3/wscript_build 2014-02-18 20:32:11.737474240 +0100
|
||||
@@ -982,6 +982,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
|
||||
netapi
|
||||
NDR_IOCTL
|
||||
''' + bld.env['dmapi_lib'],
|
||||
+ ldflags='-ltirpc',
|
||||
private_library=True,
|
||||
vars=locals())
|
||||
|
||||
14
samba-4.0.0a20-compile.patch
Normal file
14
samba-4.0.0a20-compile.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
--- samba-4.0.0alpha20/buildtools/wafsamba/samba_autoconf.py.bero 2012-05-15 16:00:22.127255528 +0200
|
||||
+++ samba-4.0.0alpha20/buildtools/wafsamba/samba_autoconf.py 2012-05-15 16:01:09.319256578 +0200
|
||||
@@ -734,8 +734,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
|
||||
def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
|
||||
# we don't want any libraries or modules to rely on runtime
|
||||
# resolution of symbols
|
||||
- if sys.platform != "openbsd4" and sys.platform != "openbsd5":
|
||||
- conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
|
||||
+# Unfortunately the Python bindings rely on it anyway
|
||||
+# if sys.platform != "openbsd4" and sys.platform != "openbsd5":
|
||||
+# conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
|
||||
|
||||
if sys.platform != "openbsd4" and sys.platform != "openbsd5" and conf.env.undefined_ignore_ldflags == []:
|
||||
if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
|
||||
7
samba-4.1.6.tar.asc
Normal file
7
samba-4.1.6.tar.asc
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAlMe+FYACgkQbzORW2Vot+qW8gCgjsPfEKKZ6HYlyH0tErAUCTjU
|
||||
wSUAnAou9AL9jlZ3C99q0KTi69Z5tkJU
|
||||
=aw1W
|
||||
-----END PGP SIGNATURE-----
|
||||
14
samba.log
14
samba.log
|
|
@ -1,9 +1,9 @@
|
|||
/var/log/samba/*.log {
|
||||
notifempty
|
||||
missingok
|
||||
sharedscripts
|
||||
copytruncate
|
||||
postrotate
|
||||
/bin/kill -HUP `cat /var/run/smbd.pid /var/run/nmbd.pid /var/run/winbindd.pid 2> /dev/null` 2> /dev/null || true
|
||||
endscript
|
||||
notifempty
|
||||
missingok
|
||||
sharedscripts
|
||||
copytruncate
|
||||
postrotate
|
||||
/bin/kill -HUP `cat /var/run/smbd.pid /var/run/nmbd.pid /var/run/winbindd.pid 2> /dev/null` 2> /dev/null || true
|
||||
endscript
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#%PAM-1.0
|
||||
auth required pam_nologin.so
|
||||
auth required pam_stack.so service=system-auth
|
||||
account required pam_stack.so service=system-auth
|
||||
session required pam_stack.so service=system-auth
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
session include system-auth
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
session include system-auth
|
||||
|
|
@ -1,2 +1,9 @@
|
|||
addFilter("W: macro-in-comment")
|
||||
addFilter("W: spelling-error")
|
||||
# Let's fix this later
|
||||
addFilter("binary-or-shlib-defines-rpath")
|
||||
# temp for abf issue
|
||||
addFilter("tag-not-utf8")
|
||||
# /lib{,64}/libnss_wins.so and /lib{,64}/libnss_winbind.so
|
||||
# Not actually a devel file, but a dlopen-ed bit
|
||||
addFilter("devel-file-in-non-devel-package")
|
||||
# "invalid" (unversioned) sonames on files that are dlopen-ed
|
||||
addFilter("invalid-soname")
|
||||
|
|
|
|||
2398
samba.spec
2398
samba.spec
File diff suppressed because it is too large
Load diff
27
samba4-socket-wrapper.patch
Normal file
27
samba4-socket-wrapper.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
--- a/lib/socket_wrapper/wscript_build
|
||||
+++ b/lib/socket_wrapper/wscript_build
|
||||
@@ -8,12 +8,14 @@ bld.SAMBA_LIBRARY('socket_wrapper',
|
||||
deps='replace')
|
||||
|
||||
bld.SAMBA_PYTHON('py_socket_wrapper',
|
||||
- source='py_socket_wrapper.c',
|
||||
- deps='socket_wrapper',
|
||||
- public_deps='talloc pytalloc-util',
|
||||
- realname='samba/socket_wrapper.so')
|
||||
+ source='py_socket_wrapper.c',
|
||||
+ deps='socket_wrapper',
|
||||
+ enabled=bld.CONFIG_SET('SOCKET_WRAPPER'),
|
||||
+ public_deps='talloc pytalloc-util',
|
||||
+ realname='samba/socket_wrapper.so')
|
||||
|
||||
-bld.SAMBA_SCRIPT('python_socket',
|
||||
- pattern='socket.py',
|
||||
- installdir='python',
|
||||
- installname='samba/socket.py')
|
||||
+if bld.CONFIG_SET('SOCKET_WRAPPER'):
|
||||
+ bld.SAMBA_SCRIPT('python_socket',
|
||||
+ pattern='socket.py',
|
||||
+ installdir='python',
|
||||
+ installname='samba/socket.py')
|
||||
--
|
||||
1.7.7.6
|
||||
197
smb-migrate
197
smb-migrate
|
|
@ -1,197 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
# migrate old samba2 smb.conf settings to new samba3 setup
|
||||
# as well as merge local configuration settings
|
||||
# Dec 3 2003 Stew Benedict <sbenedict@mandrakesoft.com>
|
||||
# revised Jan 6 2004 - dropping some parameters
|
||||
# revised Feb 11 2004 - don't try to process a config a second time
|
||||
|
||||
# check command line arguments
|
||||
my $numargs = @ARGV;
|
||||
if ($numargs lt 1) {
|
||||
print "useage: smb-migrate test|test-commit|commit\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
# define some variables
|
||||
my $user_parms = 0;
|
||||
my $new_conf_file = "/etc/samba/smb.conf";
|
||||
my @new_conf;
|
||||
my $merged_conf_file = "/etc/samba/smb.conf";
|
||||
my $merge_comment = "# *** merged from original smb.conf: ***\n";
|
||||
my $uncomment_comment = "# *** uncommented from original smb.conf: ***\n";
|
||||
my $unique_comment = "# *** unique added from original smb.conf: ***\n";
|
||||
my @merge_log;
|
||||
my $log_file = "/var/log/samba/smb-migrate.log";
|
||||
my $to_merge = "/etc/samba/smb.conf.tomerge";
|
||||
|
||||
if ($ARGV[0] eq "test" || $ARGV[0] eq "test-commit") {
|
||||
$to_merge = "smb.conf";
|
||||
$log_file = "smb-migrate.log";
|
||||
$merged_conf_file = "smb.conf.merged";
|
||||
}
|
||||
|
||||
# if the file has already been processed, don't do it again
|
||||
my $processed = `grep -c 'original smb.conf: ***' $to_merge`;
|
||||
if ($processed > 0) {
|
||||
`cp $to_merge $new_conf_file`;
|
||||
print "Already processed, aborting.\n";
|
||||
exit 0;
|
||||
}
|
||||
|
||||
# get the stripped, uncommented data from old smb.conf
|
||||
my @old_conf = `grep -v "^#" $to_merge | grep -v "^;" | grep -v "^\$"` or die;
|
||||
|
||||
# use a clean config file as a starting point
|
||||
`cp /usr/share/samba/smb.conf.clean $new_conf_file` if $ARGV[0] !~ /test/;
|
||||
|
||||
# and the whole new conf file we're going to merge with
|
||||
my @new_conf_org = `cat $new_conf_file` or die;
|
||||
|
||||
mlog("Data to change/add in standard sections of smb.conf:\n\n");
|
||||
|
||||
sub mlog {
|
||||
my (@dstring) = @_;
|
||||
if ($ARGV[0] eq "test") {
|
||||
print "@dstring";
|
||||
} else {
|
||||
push @merge_log, @dstring;
|
||||
}
|
||||
}
|
||||
|
||||
sub merge_conf {
|
||||
my ($header, $new_value) = @_;
|
||||
my @parmlist = split " = ", $new_value;
|
||||
my $match = 0;
|
||||
my $comment = '';
|
||||
$comment = $unique_comment if $continuation = 0;
|
||||
$continuation = 1;
|
||||
|
||||
# find the header in question
|
||||
$index = 0;
|
||||
foreach (@new_conf_org) {
|
||||
if (/^\[$header\]|;\[$header\]|^; \[$header\]|^\[$header\$\]|;\[$header\$\]|^; \[$header\$\]/) {
|
||||
# restore print$
|
||||
$header = "print" . '$' if $header eq "print";
|
||||
# if the header is commented, remove the comment
|
||||
if (/^;\[|^#\[|^; \[/) {
|
||||
my $entry = $_;
|
||||
@new_conf_org[$index] =~ s/^;|^; |^#//g;
|
||||
mlog("uncomment: $header line $index: $entry -> @new_conf_org[$index]");
|
||||
splice(@new_conf_org, $index, 0, $uncomment_comment);
|
||||
$index++
|
||||
}
|
||||
$start_loc = $index;
|
||||
# print "[$header]: $start_loc\n";
|
||||
last;
|
||||
}
|
||||
$index++
|
||||
}
|
||||
|
||||
my $elements = @new_conf_org;
|
||||
|
||||
# walk through this header's entries, update as needed
|
||||
for ($i = $start_loc + 1; $i < $elements; $i++) {
|
||||
# if we hit a new header, may be commented - bail out
|
||||
my $is_header = @new_conf_org[$i];
|
||||
$is_header =~ s/^ |\t|\n//;
|
||||
if ($is_header =~ /^\[|;\[|#\[/) {
|
||||
# print "new header: $is_header at $i\n";
|
||||
if ($match == 0) {
|
||||
# it's possible the parameter is continued across multiple lines
|
||||
$continuation = 0 if $new_value !~ /\\$/;
|
||||
# completely new entry, try to place it under the correct header
|
||||
# print "new entry for [$header]: $new_value\n";
|
||||
mlog("unique: $header line $last_index: $new_value");
|
||||
splice(@new_conf_org, $last_index + 1, 0, $comment, $new_value);
|
||||
$last_index++;$last_index++;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
# some syntax changes
|
||||
if ($new_value =~ /winbind/) {
|
||||
$old_value = $new_value;
|
||||
$new_value =~ s/winbind/idmap/;
|
||||
mlog("syntax: $header: $old_value -> $new_value");
|
||||
}
|
||||
|
||||
# partial match, decide whether to add or replace
|
||||
if (@new_conf_org[$i] =~ /@parmlist[0]/) {
|
||||
if (@new_conf_org[$i] !~ /^;|^#/) {
|
||||
if (@new_conf_org[$i] ne $_) {
|
||||
mlog("update: $header line $i: @new_conf_org[$i] -> $new_value");
|
||||
@new_conf_org[$i] = ";" . $new_conf_org[$i];
|
||||
splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
|
||||
# $match = 1;
|
||||
}
|
||||
$match = 1;
|
||||
} else {
|
||||
# is it really a definition or just a comment?
|
||||
if (@new_conf_org[$i] =~ / = /) {
|
||||
# commented in new config, add the old entry
|
||||
mlog("add: $header line $i: @new_conf_org[$i] -> $new_value");
|
||||
splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
|
||||
$i++;$i++;
|
||||
$match = 1;
|
||||
}
|
||||
}
|
||||
# $match = 1 if $new_value eq @new_conf_org[$i];
|
||||
$last_index = $i;
|
||||
return if ($match eq 1);
|
||||
$match = 0;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (@old_conf) {
|
||||
# check for section headers
|
||||
if (/^\[/) {
|
||||
# standard headers?
|
||||
if (!/^\[global\]|^\[homes\]|^\[netlogon\]|^\[Profiles\]|^\[printers\]|^\[print\$\]|^\[pdf-generator\]/) {
|
||||
# non-standard - add to new config
|
||||
$user_parms = 1;
|
||||
push (@new_conf, $_);
|
||||
} else {
|
||||
$user_parms = 0;
|
||||
chop;
|
||||
$header = $_;
|
||||
s/\[|\]|\$//g;
|
||||
$bare_header = $_;
|
||||
}
|
||||
} else {
|
||||
# non-standard - add to new config
|
||||
if ($user_parms == 1) {
|
||||
push (@new_conf, $_);
|
||||
} else {
|
||||
# now we're working with standard settings
|
||||
# update new config with values if they differ or are commented out
|
||||
# translate any old nomenclature to the new style
|
||||
# may still be some commented lines buried
|
||||
# throw those out and try to merge into new config
|
||||
if (!/^[ ]+#|^[ ]+;|^#|^;/) {
|
||||
# print "$header: $_\n";
|
||||
merge_conf($bare_header, $_);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# write the user config data to new smb.conf
|
||||
|
||||
mlog("\nNew data for smb.conf:\n\n");
|
||||
mlog("@new_conf");
|
||||
|
||||
if ($ARGV[0] eq "commit" || $ARGV[0] eq "test-commit") {
|
||||
local *NEWCONF;
|
||||
open(NEWCONF, "> $merged_conf_file");
|
||||
print NEWCONF @new_conf_org;
|
||||
print NEWCONF @new_conf;
|
||||
close NEWCONF;
|
||||
local *LOGFILE;
|
||||
open(LOGFILE, "> $log_file");
|
||||
print LOGFILE @merge_log;
|
||||
close LOGFILE
|
||||
}
|
||||
|
||||
541
smb.conf
541
smb.conf
|
|
@ -1,541 +0,0 @@
|
|||
# This is the main Samba configuration file. You should read the
|
||||
# smb.conf(5) manual page in order to understand the options listed
|
||||
# here. Samba has a huge number of configurable options (perhaps too
|
||||
# many!) most of which are not shown in this example
|
||||
#
|
||||
# Any line which starts with a ; (semi-colon) or a # (hash)
|
||||
# is a comment and is ignored. In this example we will use a #
|
||||
# for commentry and a ; for parts of the config file that you
|
||||
# may wish to enable
|
||||
#
|
||||
# NOTE: Whenever you modify this file you should run the command "testparm"
|
||||
# to check that you have not made any basic syntactic errors.
|
||||
#
|
||||
#======================= Global Settings =====================================
|
||||
[global]
|
||||
|
||||
# 1. Server Naming Options:
|
||||
# workgroup = NT-Domain-Name or Workgroup-Name
|
||||
workgroup = WORKGROUP
|
||||
|
||||
# netbios name is the name you will see in "Network Neighbourhood",
|
||||
# but defaults to your hostname
|
||||
# netbios name = <computer name>
|
||||
|
||||
# server string is the equivalent of the NT Description field
|
||||
server string = %h
|
||||
|
||||
# Message command is run by samba when a "popup" message is sent to it.
|
||||
# The example below is for use with LinPopUp:
|
||||
; message command = /usr/bin/linpopup "%f" "%m" %s; rm %s
|
||||
|
||||
# 2. Printing Options:
|
||||
# Required to load all CUPS printers
|
||||
printcap name = cups
|
||||
load printers = yes
|
||||
|
||||
# printcap cache time, so samba will automatically load new cups printers
|
||||
printcap cache time = 60
|
||||
|
||||
# It should not be necessary to spell out the print system type unless
|
||||
# yours is non-standard. Currently supported print systems include:
|
||||
# bsd, sysv, plp, lprng, aix, hpux, qnx, cups
|
||||
printing = cups
|
||||
|
||||
# Samba 2.2 supports the Windows NT-style point-and-print feature. To
|
||||
# use this, you need to be able to upload print drivers to the samba
|
||||
# server. The printer admins (or root) may install drivers onto samba.
|
||||
# Note that this feature uses the print$ share, so you will need to
|
||||
# enable it below.
|
||||
# Printer admins are now defined by granting the SePrintOperatorPrivilege, ie:
|
||||
# run: net rpc rights grant 'DOMAIN\Printer Operators' SePrintOperatorPrivilege
|
||||
|
||||
# 3. Logging Options:
|
||||
# this tells Samba to use a separate log file for each machine
|
||||
# that connects
|
||||
log file = /var/log/samba/%m.log
|
||||
|
||||
# Put a capping on the size of the log files (in Kb).
|
||||
max log size = 50
|
||||
|
||||
# Set the log (verbosity) level (0 <= log level <= 10)
|
||||
# log level = 3
|
||||
|
||||
# 4. Security and Domain Membership Options:
|
||||
# This option is important for security. It allows you to restrict
|
||||
# connections to machines which are on your local network. The
|
||||
# following example restricts access to two C class networks and
|
||||
# the "loopback" interface. For more examples of the syntax see
|
||||
# the smb.conf man page. Do not enable this if (tcp/ip) name resolution does
|
||||
# not work for all the hosts in your network.
|
||||
# hosts allow = 192.168.1. 192.168.2. 127.
|
||||
|
||||
# Uncomment this if you want a guest account, you must add this to /etc/passwd
|
||||
# otherwise the user "nobody" is used
|
||||
# guest account = pcguest
|
||||
# Allow users to map to guest:
|
||||
map to guest = bad user
|
||||
|
||||
# Security mode. Most people will want user level security. See
|
||||
# security_level.txt for details.
|
||||
security = user
|
||||
# Use password server option only with security = server or security = domain
|
||||
# When using security = domain, you should use password server = *
|
||||
# password server = <NT-Server-Name>
|
||||
# password server = *
|
||||
|
||||
# Password Level allows matching of _n_ characters of the password for
|
||||
# all combinations of upper and lower case.
|
||||
# password level = 8
|
||||
# username level = 8
|
||||
|
||||
# You may wish to use password encryption. Please read
|
||||
# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
|
||||
# Do not enable this option unless you have read those documents
|
||||
# Encrypted passwords are required for any use of samba in a Windows NT domain
|
||||
# The smbpasswd file is only required by a server doing authentication, thus
|
||||
# members of a domain do not need one.
|
||||
encrypt passwords = yes
|
||||
smb passwd file = /etc/samba/smbpasswd
|
||||
|
||||
# The following are needed to allow password changing from Windows to
|
||||
# also update the Linux system password.
|
||||
# NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above.
|
||||
# NOTE2: You do NOT need these to allow workstations to change only
|
||||
# the encrypted SMB passwords. They allow the Unix password
|
||||
# to be kept in sync with the SMB password.
|
||||
; unix password sync = Yes
|
||||
# You either need to setup a passwd program and passwd chat, or
|
||||
# enable pam password change
|
||||
; pam password change = yes
|
||||
# passwd program = /usr/bin/passwd '%u'
|
||||
; passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \
|
||||
;*passwd:*all*authentication*tokens*updated*successfully*
|
||||
|
||||
# Unix users can map to different SMB User names
|
||||
; username map = /etc/samba/smbusers
|
||||
|
||||
# Using the following line enables you to customise your configuration
|
||||
# on a per machine basis. The %m gets replaced with the netbios name
|
||||
# of the machine that is connecting
|
||||
# include = /etc/samba/smb.conf.%m
|
||||
|
||||
# Options for using winbind. Winbind allows you to do all account and
|
||||
# authentication from a Windows or samba domain controller, creating
|
||||
# accounts on the fly, and maintaining a mapping of Windows RIDs to unix uid's
|
||||
# and gid's. winbind uid and winbind gid are the only required parameters.
|
||||
#
|
||||
# winbind uid is the range of uid's winbind can use when mapping RIDs to uid's
|
||||
# idmap uid = 10000-20000
|
||||
#
|
||||
# winbind gid is the range of uid's winbind can use when mapping RIDs to gid's
|
||||
# idmap gid = 10000-20000
|
||||
#
|
||||
# winbind separator is the character a user must use between their domain
|
||||
# name and username, defaults to "\"
|
||||
# winbind separator = +
|
||||
#
|
||||
# winbind use default domain allows you to have winbind return usernames
|
||||
# in the form user instead of DOMAIN+user for the domain listed in the
|
||||
# workgroup parameter.
|
||||
# winbind use default domain = yes
|
||||
#
|
||||
# template homedir determines the home directory for winbind users, with
|
||||
# %D expanding to their domain name and %U expanding to their username:
|
||||
# template homedir = /home/%D/%U
|
||||
|
||||
# When using winbind, you may want to have samba create home directories
|
||||
# on the fly for authenticated users. Ensure that /etc/pam.d/samba is
|
||||
# using 'service=system-auth-winbind' in pam_stack modules, and then
|
||||
# enable obedience of pam restrictions below:
|
||||
# obey pam restrictions = yes
|
||||
|
||||
#
|
||||
# template shell determines the shell users authenticated by winbind get
|
||||
# template shell = /bin/bash
|
||||
|
||||
# 5. Browser Control and Networking Options:
|
||||
# Configure Samba to use multiple interfaces
|
||||
# If you have multiple network interfaces then you must list them
|
||||
# here. See the man page for details.
|
||||
# interfaces = 192.168.12.2/24 192.168.13.2/24
|
||||
|
||||
# Configure remote browse list synchronisation here
|
||||
# request announcement to, or browse list sync from:
|
||||
# a specific host or from / to a whole subnet (see below)
|
||||
# remote browse sync = 192.168.3.25 192.168.5.255
|
||||
# Cause this host to announce itself to local subnets here
|
||||
# remote announce = 192.168.1.255 192.168.2.44
|
||||
|
||||
# set local master to no if you don't want Samba to become a master
|
||||
# browser on your network. Otherwise the normal election rules apply
|
||||
# local master = no
|
||||
|
||||
# OS Level determines the precedence of this server in master browser
|
||||
# elections. The default value should be reasonable
|
||||
# os level = 33
|
||||
|
||||
# Domain Master specifies Samba to be the Domain Master Browser. This
|
||||
# allows Samba to collate browse lists between subnets. Don't use this
|
||||
# if you already have a Windows NT domain controller doing this job
|
||||
# domain master = yes
|
||||
|
||||
# Preferred Master causes Samba to force a local browser election on startup
|
||||
# and gives it a slightly higher chance of winning the election
|
||||
# preferred master = yes
|
||||
|
||||
# 6. Domain Control Options:
|
||||
# Enable this if you want Samba to be a domain logon server for
|
||||
# Windows95 workstations or Primary Domain Controller for WinNT and Win2k
|
||||
# domain logons = yes
|
||||
|
||||
# if you enable domain logons then you may want a per-machine or
|
||||
# per user logon script
|
||||
# run a specific logon batch file per workstation (machine)
|
||||
# logon script = %m.bat
|
||||
# run a specific logon batch file per username
|
||||
# logon script = %u.bat
|
||||
|
||||
# Where to store roaming profiles for WinNT and Win2k
|
||||
# %L substitutes for this servers netbios name, %u is username
|
||||
# You must uncomment the [Profiles] share below
|
||||
# logon path = \\%L\Profiles\%u
|
||||
|
||||
# Where to store roaming profiles for Win9x. Be careful with this as it also
|
||||
# impacts where Win2k finds it's /HOME share
|
||||
# logon home = \\%L\%u\.profile
|
||||
|
||||
|
||||
# The add user script is used by a domain member to add local user accounts
|
||||
# that have been authenticated by the domain controller, or when adding
|
||||
# users via the Windows NT Tools (ie User Manager for Domains).
|
||||
|
||||
# Scripts for file (passwd, smbpasswd) backend:
|
||||
# add user script = /usr/sbin/useradd -s /bin/false '%u'
|
||||
# delete user script = /usr/sbin/userdel '%s'
|
||||
# add user to group script = /usr/bin/gpasswd -a '%u' '%g'
|
||||
# delete user from group script = /usr/bin/gpasswd -d '%u' '%g'
|
||||
# set primary group script = /usr/sbin/usermod -g '%g' '%u'
|
||||
# add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}'
|
||||
# delete group script = /usr/sbin/groupdel '%g'
|
||||
|
||||
# Scripts for LDAP backend (assumes nss_ldap is in use on the domain controller,
|
||||
# and needs configuration in smbldap_conf.pm
|
||||
# add user script = /usr/sbin/smbldap-useradd -m '%u'
|
||||
# delete user script = /usr/sbin/smbldap-userdel '%u'
|
||||
# add user to group script = /usr/sbin/smbldap-groupmod -m '%u' '%g'
|
||||
# delete user from group script = /usr/sbin/smbldap-groupmod -x '%u' '%g'
|
||||
# set primary group script = /usr/sbin/smbldap-usermod -g '%g' '%u'
|
||||
# add group script = /usr/sbin/smbldap-groupadd '%g' && /usr/sbin/smbldap-groupshow %g|awk '/^gidNumber:/ {print $2}'
|
||||
# delete group script = /usr/sbin/smbldap-groupdel '%g'
|
||||
|
||||
|
||||
# The add machine script is use by a samba server configured as a domain
|
||||
# controller to add local machine accounts when adding machines to the domain.
|
||||
# The script must work from the command line when replacing the macros,
|
||||
# or the operation will fail. Check that groups exist if forcing a group.
|
||||
# Script for domain controller for adding machines:
|
||||
# add machine script = /usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false -M '%u'
|
||||
# Script for domain controller with LDAP backend for adding machines (please
|
||||
# configure in /etc/samba/smbldap_conf.pm first):
|
||||
# add machine script = /usr/sbin/smbldap-useradd -w -d /dev/null -c 'Machine Account' -s /bin/false '%u'
|
||||
|
||||
# Domain groups:
|
||||
# Domain groups are now configured by using the 'net groupmap' tool
|
||||
|
||||
# Enable priveleges, ie allowing members of Domain Admins to join machines
|
||||
# to the domain
|
||||
# enable privileges = yes
|
||||
|
||||
# Samba Password Database configuration:
|
||||
# Samba now has runtime-configurable password database backends. Multiple
|
||||
# passdb backends may be used, but users will only be added to the first one
|
||||
# Default:
|
||||
# passdb backend = tdbsam
|
||||
# TDB backen with fallback to smbpasswd and guest
|
||||
# passdb backend = tdbsam smbpasswd guest
|
||||
# LDAP with fallback to smbpasswd guest
|
||||
# Enable SSL by using an ldaps url, or enable tls with 'ldap ssl' below.
|
||||
# passdb backend = ldapsam:ldaps://ldap.mydomain.com smbpasswd guest
|
||||
# Use the samba2 LDAP schema:
|
||||
# passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com smbpasswd guest
|
||||
|
||||
# Idmap settings (set idmap uid and idmap gid above):
|
||||
# Idmap backend to use:
|
||||
# idmap backend = ldap:ldap://ldap.mydomain.com
|
||||
|
||||
# LDAP configuration for Domain Controlling:
|
||||
# The account (dn) that samba uses to access the LDAP server
|
||||
# This account needs to have write access to the LDAP tree
|
||||
# You will need to give samba the password for this dn, by
|
||||
# running 'smbpasswd -w mypassword'
|
||||
# ldap admin dn = cn=root,dc=mydomain,dc=com
|
||||
# ldap ssl = start_tls
|
||||
# start_tls should run on 389, but samba defaults incorrectly to 636
|
||||
# ldap port = 389
|
||||
# ldap suffix = dc=mydomain,dc=com
|
||||
# Seperate suffixes are available for machines, users, groups, and idmap, if
|
||||
# ldap suffix appears first, it is appended to the specific suffix.
|
||||
# Example for a unix-ish directory layout:
|
||||
# ldap machine suffix = ou=Hosts
|
||||
# ldap user suffix = ou=People
|
||||
# ldap group suffix = ou=Group
|
||||
# ldap idmap suffix = ou=Idmap
|
||||
# Example for AD-ish layout:
|
||||
# ldap machine suffix = cn=Computers
|
||||
# ldap user suffix = cn=Users
|
||||
# ldap group suffix = cn=Groups
|
||||
# ldap idmap suffix = cn=Idmap
|
||||
|
||||
|
||||
# 7. Name Resolution Options:
|
||||
# All NetBIOS names must be resolved to IP Addresses
|
||||
# 'Name Resolve Order' allows the named resolution mechanism to be specified
|
||||
# the default order is "host lmhosts wins bcast". "host" means use the unix
|
||||
# system gethostbyname() function call that will use either /etc/hosts OR
|
||||
# DNS or NIS depending on the settings of /etc/host.config, /etc/nsswitch.conf
|
||||
# and the /etc/resolv.conf file. "host" therefore is system configuration
|
||||
# dependant. This parameter is most often of use to prevent DNS lookups
|
||||
# in order to resolve NetBIOS names to IP Addresses. Use with care!
|
||||
# The example below excludes use of name resolution for machines that are NOT
|
||||
# on the local network segment
|
||||
# - OR - are not deliberately to be known via lmhosts or via WINS.
|
||||
# name resolve order = wins lmhosts bcast
|
||||
|
||||
# Windows Internet Name Serving Support Section:
|
||||
# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
|
||||
# wins support = yes
|
||||
|
||||
# WINS Server - Tells the NMBD components of Samba to be a WINS Client
|
||||
# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
|
||||
# wins server = w.x.y.z
|
||||
|
||||
# WINS Proxy - Tells Samba to answer name resolution queries on
|
||||
# behalf of a non WINS capable client, for this to work there must be
|
||||
# at least one WINS Server on the network. The default is NO.
|
||||
# wins proxy = yes
|
||||
|
||||
# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
|
||||
# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
|
||||
# this has been changed in version 1.9.18 to no.
|
||||
dns proxy = no
|
||||
|
||||
# 8. File Naming Options:
|
||||
# Case Preservation can be handy - system default is _no_
|
||||
# NOTE: These can be set on a per share basis
|
||||
# preserve case = no
|
||||
# short preserve case = no
|
||||
# Default case is normally upper case for all DOS files
|
||||
# default case = lower
|
||||
# Be very careful with case sensitivity - it can break things!
|
||||
# case sensitive = no
|
||||
|
||||
# Enabling internationalization:
|
||||
# you can match a Windows code page with a UNIX character set.
|
||||
# Windows: 437 (US), 737 (GREEK), 850 (Latin1 - Western European),
|
||||
# 852 (Eastern Eu.), 861 (Icelandic), 932 (Cyrillic - Russian),
|
||||
# 936 (Japanese - Shift-JIS), 936 (Simpl. Chinese), 949 (Korean Hangul),
|
||||
# 950 (Trad. Chin.).
|
||||
# UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.),
|
||||
# ISO8859-5 (Russian Cyrillic), KOI8-R (Alt-Russ. Cyril.)
|
||||
# This is an example for french users:
|
||||
# dos charset = 850
|
||||
# unix charset = ISO8859-1
|
||||
|
||||
# 9. Allow usershares through 'net' command:
|
||||
|
||||
usershare max shares = 100
|
||||
|
||||
# 10. Guest mode support for usershares. This is need for properly browsing machine through
|
||||
# "Network neighborhood" in Windows.
|
||||
|
||||
usershare allow guests = Yes
|
||||
|
||||
# 11.
|
||||
|
||||
usershare owner only = False
|
||||
|
||||
#============================ Share Definitions ==============================
|
||||
[homes]
|
||||
comment = Home Directories
|
||||
browseable = no
|
||||
writable = yes
|
||||
# You can enable VFS recycle bin and on-access virus-scanning on a per
|
||||
# share basis:
|
||||
# Uncomment the next 2 lines (make sure you create a .recycle folder in
|
||||
# the base of the share and ensure all users will have write access to it.
|
||||
# For virus scanning, install samba-vscan-clamav and ensure the clamd service
|
||||
# is running
|
||||
# vfs objects = vscan-clamav recycle
|
||||
# vscan-clamav: config-file = /etc/samba/vscan-clamav.conf
|
||||
|
||||
# Un-comment the following and create the netlogon directory for Domain Logons
|
||||
# [netlogon]
|
||||
# comment = Network Logon Service
|
||||
# path = /var/lib/samba/netlogon
|
||||
# guest ok = yes
|
||||
# writable = no
|
||||
|
||||
#Uncomment the following 2 lines if you would like your login scripts to
|
||||
#be created dynamically by ntlogon (check that you have it in the correct
|
||||
#location (the default of the ntlogon rpm available in contribs)
|
||||
#root preexec = /usr/bin/ntlogon -u '%u' -g '%g' -o %a -d /var/lib/samba/netlogon/
|
||||
#root postexec = rm -f '/var/lib/samba/netlogon/%u.bat'
|
||||
|
||||
# Un-comment the following to provide a specific roving profile share
|
||||
# the default is to use the user's home directory
|
||||
#[Profiles]
|
||||
# path = /var/lib/samba/profiles
|
||||
# browseable = no
|
||||
# guest ok = yes
|
||||
# writable = yes
|
||||
# This script can be enabled to create profile directories on the fly
|
||||
# You may want to turn off guest acces if you enable this, as it
|
||||
# hasn't been thoroughly tested.
|
||||
#root preexec = PROFILE='/var/lib/samba/profiles/%u'; if [ ! -e $PROFILE ]; \
|
||||
# then mkdir -pm700 $PROFILE; chown '%u':'%g' $PROFILE;fi
|
||||
# If you want read-only profiles, fake permissions so windows clients think
|
||||
# they have written to the files
|
||||
# vfs objects = fake_perms
|
||||
|
||||
# NOTE: If you have a CUPS print system there is no need to
|
||||
# specifically define each individual printer.
|
||||
# You must configure the samba printers with the appropriate Windows
|
||||
# drivers on your Windows clients or upload the printer driver to the
|
||||
# server from Windows (NT/2000/XP). On the Samba server no filtering is
|
||||
# done. If you wish that the server provides the driver and the clients
|
||||
# send PostScript ("Generic PostScript Printer" under Windows), you have
|
||||
# to use 'printcap name = cups' or swap the 'print command' line below
|
||||
# with the commented one. Note that print commands only work if not using
|
||||
# 'printing=cups'
|
||||
[printers]
|
||||
comment = All Printers
|
||||
path = /var/spool/samba
|
||||
browseable = no
|
||||
# to allow user 'guest account' to print.
|
||||
guest ok = yes
|
||||
writable = no
|
||||
printable = yes
|
||||
create mode = 0700
|
||||
# =====================================
|
||||
# print command: see above for details.
|
||||
# =====================================
|
||||
print command = lpr-cups -P %p -o raw %s -r # using client side printer drivers.
|
||||
# print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
|
||||
# If you install drivers on the server, you will want to uncomment this so
|
||||
# clients request the driver
|
||||
use client driver = yes
|
||||
|
||||
# This share is used for Windows NT-style point-and-print support.
|
||||
# To be able to install drivers, you need to be either root, or listed
|
||||
# in the printer admin parameter above. Note that you also need write access
|
||||
# to the directory and share definition to be able to upload the drivers.
|
||||
# For more information on this, please see the Printing Support Section of
|
||||
# /usr/share/doc/samba-<version>/docs/Samba-HOWTO-Collection.pdf
|
||||
#
|
||||
# A special case is using the CUPS Windows Postscript driver, which allows
|
||||
# all features available via CUPS on the client, by publishing the ppd file
|
||||
# and the cups driver by using the 'cupsaddsmb' tool. This requires the
|
||||
# installation of the CUPS driver (http://www.cups.org/windows.php)
|
||||
# on the server, but doesn't require you to use Windows at all :-).
|
||||
[print$]
|
||||
path = /var/lib/samba/printers
|
||||
browseable = yes
|
||||
write list = @adm root
|
||||
guest ok = yes
|
||||
inherit permissions = yes
|
||||
# Settings suitable for Winbind:
|
||||
# write list = @"Domain Admins" root
|
||||
# force group = +@"Domain Admins"
|
||||
|
||||
# A useful application of samba is to make a PDF-generation service
|
||||
# To streamline this, install windows postscript drivers (preferably colour)
|
||||
# on the samba server, so that clients can automatically install them.
|
||||
# Note that this only works if 'printing' is *not* set to 'cups'
|
||||
|
||||
[pdf-gen]
|
||||
path = /var/tmp
|
||||
guest ok = No
|
||||
printable = Yes
|
||||
comment = PDF Generator (only valid users)
|
||||
printing = bsd
|
||||
#print command = /usr/share/samba/scripts/print-pdf file path win_path recipient IP &
|
||||
print command = /usr/share/samba/scripts/print-pdf "%s" "%H" "//%L/%u" "%m" "%I" "%J" &
|
||||
lpq command = /bin/true
|
||||
|
||||
# A share allowing administrators to set ACLs on, or access for backup purposes
|
||||
# all files (as root).
|
||||
#[admin]
|
||||
# path = /
|
||||
# admin users = @"Domain Admins"
|
||||
# valid users = @"Domain Admins"
|
||||
# browseable = no
|
||||
# writeable = yes
|
||||
|
||||
# This one is useful for people to share files
|
||||
;[tmp]
|
||||
; comment = Temporary file space
|
||||
; path = /tmp
|
||||
; read only = no
|
||||
; public = yes
|
||||
|
||||
# A publicly accessible directory, but read only, except for people in
|
||||
# the "staff" group
|
||||
;[public]
|
||||
; comment = Public Stuff
|
||||
; path = /home/samba/public
|
||||
; public = yes
|
||||
; writable = no
|
||||
; write list = @staff
|
||||
# Audited directory through experimental VFS audit.so module:
|
||||
# Uncomment next line.
|
||||
# vfs object = /usr/lib/samba/vfs/audit.so
|
||||
|
||||
# Other examples.
|
||||
#
|
||||
# A private printer, usable only by Fred. Spool data will be placed in Fred's
|
||||
# home directory. Note that fred must have write access to the spool directory,
|
||||
# wherever it is.
|
||||
;[fredsprn]
|
||||
; comment = Fred's Printer
|
||||
; valid users = fred
|
||||
; path = /homes/fred
|
||||
; printer = freds_printer
|
||||
; public = no
|
||||
; writable = no
|
||||
; printable = yes
|
||||
|
||||
# A private directory, usable only by Fred. Note that Fred requires write
|
||||
# access to the directory.
|
||||
;[fredsdir]
|
||||
; comment = Fred's Service
|
||||
; path = /usr/somewhere/private
|
||||
; valid users = fred
|
||||
; public = no
|
||||
; writable = yes
|
||||
; printable = no
|
||||
|
||||
# a service which has a different directory for each machine that connects
|
||||
# this allows you to tailor configurations to incoming machines. You could
|
||||
# also use the %u option to tailor it by user name.
|
||||
# The %m gets replaced with the machine name that is connecting.
|
||||
;[pchome]
|
||||
; comment = PC Directories
|
||||
; path = /usr/pc/%m
|
||||
; public = no
|
||||
; writable = yes
|
||||
|
||||
# The following two entries demonstrate how to share a directory so that two
|
||||
# users can place files there that will be owned by the specific users. In this
|
||||
# setup, the directory should be writable by both users and should have the
|
||||
# sticky bit set on it to prevent abuse. Obviously this could be extended to
|
||||
# as many users as required.
|
||||
;[myshare]
|
||||
; comment = Mary's and Fred's stuff
|
||||
; path = /usr/somewhere/shared
|
||||
; valid users = mary fred
|
||||
; public = no
|
||||
; writable = yes
|
||||
; printable = no
|
||||
; create mask = 0765
|
||||
|
||||
106
smb.init
106
smb.init
|
|
@ -1,106 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# chkconfig: 35 91 9
|
||||
# description: Starts and stops the Samba smbd and nmbd daemons \
|
||||
# used to provide SMB network services.
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: smb nmb samba
|
||||
# Required-Start: $network
|
||||
# Required-Stop: $network
|
||||
# Default-Start: 3 4 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: Samba servers (nmbd and smbd)
|
||||
# Description:Starts and stops the Samba smbd and nmbd daemons
|
||||
# used to provide SMB network services.
|
||||
### END INIT INFO
|
||||
|
||||
# Source function library.
|
||||
if [ -f /etc/init.d/functions ] ; then
|
||||
. /etc/init.d/functions
|
||||
elif [ -f /etc/rc.d/init.d/functions ] ; then
|
||||
. /etc/rc.d/init.d/functions
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Source networking configuration.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ ${NETWORKING} = "no" ] && exit 0
|
||||
|
||||
# Check that smb.conf exists.
|
||||
[ -f /etc/samba/smb.conf ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
|
||||
|
||||
start() {
|
||||
export TMPDIR="/var/tmp"
|
||||
echo -n "Starting SMB services: "
|
||||
daemon smbd -D
|
||||
RETVAL=$?
|
||||
echo
|
||||
echo -n "Starting NMB services: "
|
||||
daemon nmbd -D
|
||||
RETVAL2=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
|
||||
RETVAL=1
|
||||
return $RETVAL
|
||||
}
|
||||
stop() {
|
||||
echo -n "Shutting down SMB services: "
|
||||
killproc smbd
|
||||
RETVAL=$?
|
||||
echo
|
||||
echo -n "Shutting down NMB services: "
|
||||
killproc nmbd
|
||||
RETVAL2=$?
|
||||
[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
|
||||
echo ""
|
||||
return $RETVAL
|
||||
}
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
reload() {
|
||||
export TMPDIR="/var/tmp"
|
||||
echo -n "Reloading smb.conf file: "
|
||||
killproc smbd -HUP
|
||||
RETVAL=$?
|
||||
echo
|
||||
return $RETVAL
|
||||
}
|
||||
mdkstatus() {
|
||||
status smbd
|
||||
status nmbd
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
reload)
|
||||
reload
|
||||
;;
|
||||
status)
|
||||
mdkstatus
|
||||
;;
|
||||
condrestart)
|
||||
[ -f /var/lock/subsys/smb ] && restart || :
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|status|condrestart}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
103
winbind.init
103
winbind.init
|
|
@ -1,103 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# chkconfig: 345 81 45
|
||||
# description: Starts and stops the Samba winbind daemon to provide \
|
||||
# user and group information from a domain controller to linux.
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: winbind
|
||||
# Required-Start: $network
|
||||
# Required-Stop: $network
|
||||
# Default-Start: 3 4 5
|
||||
# Short-Description: Winbind naming service (winbindd)
|
||||
# Description: Starts and stops the Samba winbind daemon to provide
|
||||
# user and group information from a domain controller to linux.
|
||||
### END INIT INFO
|
||||
|
||||
# Source function library.
|
||||
if [ -f /etc/init.d/functions ] ; then
|
||||
. /etc/init.d/functions
|
||||
elif [ -f /etc/rc.d/init.d/functions ] ; then
|
||||
. /etc/rc.d/init.d/functions
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Source networking configuration.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ ${NETWORKING} = "no" ] && exit 0
|
||||
|
||||
# Check that smb.conf exists.
|
||||
[ -f /etc/samba/smb.conf ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
|
||||
|
||||
start() {
|
||||
echo -n "Starting Winbind services: "
|
||||
RETVAL=1
|
||||
if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
|
||||
daemon winbindd
|
||||
RETVAL=$?
|
||||
else
|
||||
echo "Winbind is not configured in /etc/samba/smb.conf, not starting"
|
||||
fi
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
|
||||
RETVAL=1
|
||||
return $RETVAL
|
||||
}
|
||||
stop() {
|
||||
echo -n "Shutting down Winbind services: "
|
||||
RETVAL=1
|
||||
#if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
|
||||
killproc winbindd
|
||||
RETVAL=$?
|
||||
#fi
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbind
|
||||
return $RETVAL
|
||||
}
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
reload() {
|
||||
export TMPDIR="/var/tmp"
|
||||
echo -n "Checking domain trusts: "
|
||||
killproc winbindd -HUP
|
||||
RETVAL=$?
|
||||
echo
|
||||
return $RETVAL
|
||||
}
|
||||
mdkstatus() {
|
||||
status winbindd
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
reload)
|
||||
reload
|
||||
;;
|
||||
status)
|
||||
mdkstatus
|
||||
;;
|
||||
condrestart)
|
||||
[ -f /var/lock/subsys/winbindd ] && restart || :
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|status|condrestart}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
Loading…
Add table
Reference in a new issue