From e52cd26f86d85aa24b101d5858e82b0ac02f1f17 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 5 Apr 2016 22:13:54 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- init.d/samba | 16 +++---- openldap/schema/samba.schema | 16 ++++++- samba/smb.conf.default | 87 ++++++++---------------------------- 3 files changed, 39 insertions(+), 80 deletions(-) diff --git a/init.d/samba b/init.d/samba index 96bb94ec..ff42552e 100755 --- a/init.d/samba +++ b/init.d/samba @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.4 2014/03/14 09:30:41 polynomial-c Exp $ +# $Id$ extra_started_commands="reload" piddir="/var/run/samba" @@ -34,15 +34,11 @@ signal_do() { return ${result} } -mkdir_sambadirs() { - [ -d "${piddir}" ] || mkdir -p ${piddir} -} - start() { ${my_service_PRE} - mkdir_sambadirs + [ -d "${piddir}" ] || mkdir -p "${piddir}" signal_do start && return 0 - + eerror "Error: starting services (see system logs)" signal_do stop return 1 @@ -50,8 +46,8 @@ start() { stop() { ${my_service_PRE} if signal_do stop ; then - ${my_service_POST} - return 0 + ${my_service_POST} + return 0 fi } reload() { diff --git a/openldap/schema/samba.schema b/openldap/schema/samba.schema index 716c1912..08173119 100644 --- a/openldap/schema/samba.schema +++ b/openldap/schema/samba.schema @@ -21,6 +21,10 @@ ## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations ## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track ## +## External projects +## 1.3.6.1.4.1.7165.655.x +## 1.3.6.1.4.1.7165.655.1.x - GSS-NTLMSSP +## ## ----- READ THIS WHEN ADDING A NEW ATTRIBUTE OR OBJECT CLASS ------ ## ## Run the 'get_next_oid' bash script in this directory to find the @@ -514,6 +518,15 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} ) +attributetype ( 1.3.6.1.4.1.7165.2.1.79 NAME 'sambaTrustPosixOffset' + DESC 'POSIX offset of a trust' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.80 NAME 'sambaSupportedEncryptionTypes' + DESC 'Supported encryption types of a trust' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) ####################################################################### ## objectClasses used by Samba 3.0 schema ## @@ -627,4 +640,5 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTUR MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ - sambaTrustForestTrustInfo) ) + sambaTrustForestTrustInfo $ sambaTrustPosixOffset $ + sambaSupportedEncryptionTypes) ) diff --git a/samba/smb.conf.default b/samba/smb.conf.default index 57061345..bb9c2e25 100644 --- a/samba/smb.conf.default +++ b/samba/smb.conf.default @@ -28,10 +28,16 @@ # server string is the equivalent of the NT Description field server string = Samba Server -# Security mode. Defines in which mode Samba will operate. Possible -# values are share, user, server, domain and ads. Most people will want -# user level security. See the Samba-HOWTO-Collection for details. - security = user +# Server role. Defines in which mode Samba will operate. Possible +# values are "standalone server", "member server", "classic primary +# domain controller", "classic backup domain controller", "active +# directory domain controller". +# +# Most people will want "standalone sever" or "member server". +# Running as "active directory domain controller" will require first +# running "samba-tool domain provision" to wipe databases and create a +# new domain. + server role = standalone server # This option is important for security. It allows you to restrict # connections to machines which are on your local network. The @@ -40,51 +46,23 @@ # the smb.conf man page ; hosts allow = 192.168.1. 192.168.2. 127. -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this - load printers = yes - -# you may wish to override the location of the printcap file -; printcap name = /etc/printcap - -# on SystemV system setting printcap name to lpstat should allow -# you to automatically obtain a printer list from the SystemV spool -# system -; printcap name = lpstat - -# It should not be necessary to specify the print system type unless -# it is non-standard. Currently supported print systems include: -# bsd, cups, sysv, plp, lprng, aix, hpux, qnx -; printing = cups - # Uncomment this if you want a guest account, you must add this to /etc/passwd # otherwise the user "nobody" is used ; guest account = pcguest # this tells Samba to use a separate log file for each machine # that connects - log file = /var/log/samba/log.%m + log file = /usr/local/samba/var/log.%m # Put a capping on the size of the log files (in Kb). max log size = 50 -# Use password server option only with security = server -# The argument list may include: -# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] -# or to auto-locate the domain controller/s -# password server = * -; password server = - -# Use the realm option only with security = ads -# Specifies the Active Directory realm the host is part of +# Specifies the Kerberos or Active Directory realm the host is part of ; realm = MY_REALM # Backend to store user information in. New installations should # use either tdbsam or ldapsam. smbpasswd is available for backwards -# compatibility. tdbsam requires no further configuration. If you're -# migrating from < samba 3.4, you'll have to convert your old user -# passwords to the new backend with the command: -# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e +# compatibility. tdbsam requires no further configuration. ; passdb backend = tdbsam # Using the following line enables you to customise your configuration @@ -92,42 +70,13 @@ # of the machine that is connecting. # Note: Consider carefully the location in the configuration file of # this line. The included file is read at that point. -; include = /etc/samba/smb.conf.%m +; include = /usr/local/samba/lib/smb.conf.%m # 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 -# Browser Control Options: -# 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 - -# Enable this if you want Samba to be a domain logon server for -# Windows95 workstations. -; 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 roving profiles (only for Win95 and WinNT) # %L substitutes for this servers netbios name, %U is username # You must uncomment the [Profiles] share below @@ -169,7 +118,7 @@ # Un-comment the following and create the netlogon directory for Domain Logons ; [netlogon] ; comment = Network Logon Service -; path = /var/lib/samba/netlogon +; path = /usr/local/samba/lib/netlogon ; guest ok = yes ; writable = no ; share modes = no @@ -178,7 +127,7 @@ # 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 +; path = /usr/local/samba/profiles ; browseable = no ; guest ok = yes @@ -187,7 +136,7 @@ # specifically define each individual printer [printers] comment = All Printers - path = /var/spool/samba + path = /usr/spool/samba browseable = no # Set public = yes to allow user 'guest account' to print guest ok = no @@ -207,7 +156,7 @@ ; comment = Public Stuff ; path = /home/samba ; public = yes -; writable = yes +; writable = no ; printable = no ; write list = @staff -- 2.39.5