[Samba] On Samba4
I keep hearing Samba 4 is not ready to be used. Can anyone elaborate on its current status? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Microsoft Outlook pst files unable to open or create
Just to close this out for information purposes for anyone else that runs into this looking for an answer, adding these 2 lines globally fixed my issue. posix locking = no kernel oplocks = no Sincerely, Doug On Tue, 2011-05-10 at 22:04 +0200, Michael Wood wrote: On 10 May 2011 21:14, Doug Tucker tuck...@lyle.smu.edu wrote: Microsoft Outlook's personal folders (*.pst) react quite badly to oplocks. This statement got to me. So I created a share on the local drive of the server and wallah..Outlook can write a .pst file. So it has to do with doing it over nfs. I could understand this from an OS level, but I cannot wrap my head around why only outlook? Every other application works fine. Re-exporting an NFS mount with Samba is asking for trouble. See the following messages from some of the Samba developers: http://lists.samba.org/archive/samba/2007-February/129104.html http://lists.samba.org/archive/samba/2008-May/140374.html http://lists.samba.org/archive/samba/2008-July/142215.html http://lists.samba.org/archive/samba/2008-July/142131.html Also: http://lists.samba.org/archive/samba/2008-January/137441.html http://lists.samba.org/archive/samba/2005-May/105986.html http://lists.samba.org/archive/samba/2008-July/142214.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] getent passwd does not list trusted users
I am running Samba 3.5.5 on Solaris 10. This is the latest Sun/Oracle provided build. I have an ldap backend for everything (unix+samba accounts, idmapping for domain trusts.) The Samba server is a PDC for a domain we can call SAMBA.Each samba account is tied to a unix account. I have a one-way domain trust setup with a Windows 2003 domain which we can call WIN2003. SAMBA trusts WIN2003. getent passwd and getent group seem to fundamentally be working (depending on syntax) BUT getent passwd does NOT list trusted users. On the solaris machine: --- wbinfo -u and wbinfo -glists all users in this domain + the WIN2003 domain. For the SAMBA users, the domain name is stripped out. getent passwd - lists all unix users (in ldap or /etc/passwd.) It does not list the samba users - which is the expected and desired behaviour. I had expected it to list users from the WIN2003 domain. getent group - lists all unix groups (in ldap or /etc/passwd) It does not listed the SAMBA groups - which is the expected and desired behaviour. It does list WIN2003 groups- which is also the expected and desired behaviour. getent passwd SAMBA\\user - shows uid, gid, home directory, shell getent passwd WIN2003\\user - shows uid, gid, home directory, shell getent group SAMBA\\group - shows gid, members getent group WIN2003\\group - shows gid, members id SAMBA\\user - shows uid and gid id WIN2003 \\user - shows uid and gid --- I can use chown and other commands from solaris command line to grant rights to a user from the trusted domain. However, in a Windows machine in samba domain, when setting file permissions, I can not see the trusted domain. Any thoughts? Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba Digest, Vol 102, Issue 6
I am currently on annual leave. I will be back in the office on Friday 10th June 2011. If you have an urgent matter needing attention, it may be prudent to contact the ITSC main number 01236 757600. Thanks. -- Andrew McNaughton ICT Network Support Officer Learning Leisure Services North Lanarkshire Council ** ICT TECHNICAL SERVICES CENTRE (ITSC) Towers Road, Airdrie, North Lanarkshire ML6 8PG email: and...@nleducation.org.uk ** --- This e-mail and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this e-mail in error, please notify the System Manager and thereafter delete the e-mail from your system. The System Manager may be contacted at postmas...@nleducation.org.uk E-mail transmission is not secure and information can be intercepted, corrupted, lost, destroyed, delayed or incomplete. The sender does not accept any liability for errors or omissions arising as a result of e-mail transmission or interception. Please note that incoming e-mails are routinely scanned for the purpose of detecting offensive or inappropriate materials. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] getent passwd does not list trusted users
I have been looking at http://samba.2283325.n4.nabble.com/Trusted-domain-users-unwantedly-mapping-onto-local-domain-users-td3005928.html and I think that if you add this in your nsswitch.conf like it says in the website above: if you already have the passwd: files ldap and group: files ldap in your nsswitch.conf then just add winbind to the end of the lines of the passwd and group lines. just like it is shown below: If you need any more help just email me back, and I will try to help you. *passwd*: files ldap winbind group: files ldap winbind -- Forwarded message -- From: Gaiseric Vandal gaiseric.van...@gmail.com To: Samba samba@lists.samba.org Date: Mon, 06 Jun 2011 12:04:14 -0400 Subject: [Samba] getent passwd does not list trusted users I am running Samba 3.5.5 on Solaris 10. This is the latest Sun/Oracle provided build. I have an ldap backend for everything (unix+samba accounts, idmapping for domain trusts.) The Samba server is a PDC for a domain we can call SAMBA.Each samba account is tied to a unix account. I have a one-way domain trust setup with a Windows 2003 domain which we can call WIN2003. SAMBA trusts WIN2003. getent passwd and getent group seem to fundamentally be working (depending on syntax) BUT getent passwd does NOT list trusted users. On the solaris machine: --- wbinfo -u and wbinfo -glists all users in this domain + the WIN2003 domain. For the SAMBA users, the domain name is stripped out. getent passwd - lists all unix users (in ldap or /etc/passwd.) It does not list the samba users - which is the expected and desired behaviour. I had expected it to list users from the WIN2003 domain. getent group - lists all unix groups (in ldap or /etc/passwd) It does not listed the SAMBA groups - which is the expected and desired behaviour. It does list WIN2003 groups- which is also the expected and desired behaviour. getent passwd SAMBA\\user - shows uid, gid, home directory, shell getent passwd WIN2003\\user - shows uid, gid, home directory, shell getent group SAMBA\\group - shows gid, members getent group WIN2003\\group - shows gid, members id SAMBA\\user - shows uid and gid id WIN2003 \\user - shows uid and gid --- I can use chown and other commands from solaris command line to grant rights to a user from the trusted domain. However, in a Windows machine in samba domain, when setting file permissions, I can not see the trusted domain. Any thoughts? Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] anonymous printing not working
Hi, I have samba+ldap running on ubuntu 10.04 have multiple windows XP machines joined to the domain. A laserjet printer is configured on samba server using cups and samba is also print server. Domain users when they login to the Windows XP (domain option) then they can print however non domain users can't print. IDeally this is best configuration. However, I'd like to have non domain (local users) logging into XP also to be able to print from that printer. I login as local user to Windows XP and printer is shown ready so I go for a test print from properties of that printer , it spools but continues doing that until I Cancel the job after long wait. Nothing shows up in cups log. Here is Smb.conf [global] # Domain name .. workgroup = MYDOMAIN # Server name - as seen by Windows PCs .. netbios name = DOMAINNB # Be a PDC .. domain logons = Yes domain master = Yes # Be a WINS server .. wins support = true obey pam restrictions = Yes dns proxy = No os level = 35 log file = /var/log/samba/log.%m max log size = 1000 syslog = 0 panic action = /usr/share/samba/panic-action %d pam password change = Yes # Allows users on WinXP PCs to change their password when they press Ctrl-Alt-Del unix password sync = no ldap passwd sync = yes # Printing from PCs will go via CUPS .. load printers = yes printing = cups printcap name = cups # Use LDAP for Samba user accounts and groups .. passdb backend = ldapsam:ldap://localhost # This must match init.ldif .. ldap suffix = dc=pdc # The password for cn=admin MUST be stored in /etc/samba/secrets.tdb # This is done by running 'sudo smbpasswd -w'. ldap admin dn = cn=admin,dc=pdc # 4 OUs that Samba uses when creating user accounts, computer accounts, etc. # (Because we are using smbldap-tools, call them 'Users', 'Computers', etc.) ldap machine suffix = ou=Computers ldap user suffix = ou=Users ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap idmap uid = 1-2 idmap gid = 1-2 ldap ssl = no add user script = /usr/sbin/smbldap-useradd -m '%u' delete user script = /usr/sbin/smbldap-userdel %u add group script = /usr/sbin/smbldap-groupadd -p '%g' delete group script = /usr/sbin/smbldap-groupdel '%g' 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 machine script = /usr/sbin/smbldap-useradd -w '%u' logon path = \\%N\%U\profile logon drive = H: logon home = \\%N\%U #logon script = logon.cmd # This is required for Windows XP client .. server signing = auto server schannel = Auto [homes] comment = Home Directory for %S valid users = %S read only = No browseable = No strict sync = yes sync always = yes create mask = 0700 directory mask = 0700 hide files = /DESKTOP.INI/desktop.ini/Desktop.ini/ [netlogon] comment = Network Logon Service path = /var/lib/samba/netlogon admin users = root guest ok = Yes browseable = No logon script = logon.cmd read only = yes # share modes = no [Profiles] comment = Roaming Profile Share # would probably change this to elsewhere in a production system .. path = /var/lib/samba/profiles read only = No profile acls = Yes browsable = No [printers] comment = All Printers path = /var/spool/samba use client driver = Yes create mask = 0700 guest ok = Yes printable = Yes # browseable = No browseable = Yes browsable = Yes public = Yes writable = Yes null passwords = Yes [print$] comment = Printer Drivers Share path = /var/lib/samba/printers write list = root create mask = 0664 directory mask = 0775 admin users = root ##Additional Info ### ls -ald /var/spool/samba drwxrwxrwt 2 root root 4096 2011-06-06 12:23 /var/spool/samba testparm -s -v | grep guest account Load smb config files from /etc/samba/smb.conf rlimit_max: rlimit_max (1024) below minimum Windows limit (16384) Processing section [homes] Processing section [netlogon] Global parameter logon script found in service section! Processing section [Profiles] Processing section [printers] Global parameter security found in service section! Global parameter null passwords found in service section! Processing section [print$] Loaded services file OK. Server role: ROLE_DOMAIN_PDC guest account = nobody Question, is
Re: [Samba] getent passwd does not list trusted users
I do have the entries in /etc/nswitch.conf The getent passwd won't list the winbind users although I can get details on a specific user with the getent passwd SOMEDOMAIN\\someuser common I looked in the /var/samba/locks directory - I have a winbindd_cache.tdb file that is current. I don't have a current idmap_cache.tdb file anymore. Not sure I need one. I initially stated with samba 3.0.x, then upgraded to 3.4.x, then to 3.5.x, and it seems with .X upgrade that the configuration for winbind and idmapping changes. This may be a bug in Solaris itself rather than samba. On 06/06/2011 02:28 PM, timothy mcdaniel wrote: I have been looking at http://samba.2283325.n4.nabble.com/Trusted-domain-users-unwantedly-mapping-onto-local-domain-users-td3005928.html and I think that if you add this in your nsswitch.conf like it says in the website above: if you already have the passwd: files ldap and group: files ldap in your nsswitch.conf then just add winbind to the end of the lines of the passwd and group lines. just like it is shown below: If you need any more help just email me back, and I will try to help you. *passwd*: files ldap winbind group: files ldap winbind -- Forwarded message -- From: Gaiseric Vandalgaiseric.van...@gmail.com To: Sambasamba@lists.samba.org Date: Mon, 06 Jun 2011 12:04:14 -0400 Subject: [Samba] getent passwd does not list trusted users I am running Samba 3.5.5 on Solaris 10. This is the latest Sun/Oracle provided build. I have an ldap backend for everything (unix+samba accounts, idmapping for domain trusts.) The Samba server is a PDC for a domain we can call SAMBA.Each samba account is tied to a unix account. I have a one-way domain trust setup with a Windows 2003 domain which we can call WIN2003. SAMBA trusts WIN2003. getent passwd and getent group seem to fundamentally be working (depending on syntax) BUT getent passwd does NOT list trusted users. On the solaris machine: --- wbinfo -u and wbinfo -glists all users in this domain + the WIN2003 domain. For the SAMBA users, the domain name is stripped out. getent passwd - lists all unix users (in ldap or /etc/passwd.) It does not list the samba users - which is the expected and desired behaviour. I had expected it to list users from the WIN2003 domain. getent group - lists all unix groups (in ldap or /etc/passwd) It does not listed the SAMBA groups - which is the expected and desired behaviour. It does list WIN2003 groups- which is also the expected and desired behaviour. getent passwd SAMBA\\user - shows uid, gid, home directory, shell getent passwd WIN2003\\user - shows uid, gid, home directory, shell getent group SAMBA\\group - shows gid, members getent group WIN2003\\group - shows gid, members id SAMBA\\user - shows uid and gid id WIN2003 \\user - shows uid and gid --- I can use chown and other commands from solaris command line to grant rights to a user from the trusted domain. However, in a Windows machine in samba domain, when setting file permissions, I can not see the trusted domain. Any thoughts? Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] getent passwd does not list trusted users
This maybe related to idmap allocation - tho not sure how. Initially my PDC was running Samba 3.0.x.When I did getent passwd or getent group samba would create idmap entries for users and groups from trusted domains.There were some other things broken with idmap and samba that made it unstable for maintaining a trust with Active Directory, thus the move to 3.4 and then to 3.5. The 3.4 upgrade seems to have broken the automatic allocation. (This could just be a configuration error in my smb.conf) In my environment, that wasn't a huge deal since the number of users and groups in the trusted domain us quite small and stable. I could manually add an idmapping with the wbinfo or with an LDAP editor. This morning, getent group would show the trusted WINDOWS groups. I added another group in the WINDOWS domain to see if Samba would automatically create a group mapping (which it didn't) and to make sure that it at least showed up with wbinfo -g (which it did- so at least I wasn't working just from a cache.)But then getent group stopped listing WINDOWS groups. (getent group WINDOWS\\thenewgroup did work.) Once I manually created an idmap entry for the new group, getent group was able to list all the groups. So my guess is that samba or winbind chokes up when it finds a winbind user or group in a domain for which an idmap entry is missing and can't be created. I tried adding idmap entries for the few users in the WINDOWS domain who didn't have idmappings, but getent passwd still doesn't work. Original Message Subject:Re: [Samba] getent passwd does not list trusted users Date: Mon, 06 Jun 2011 15:16:28 -0400 From: Gaiseric Vandal gaiseric.van...@gmail.com Reply-To: gaiseric.van...@gmail.com To: samba@lists.samba.org I do have the entries in /etc/nswitch.conf The getent passwd won't list the winbind users although I can get details on a specific user with the getent passwd SOMEDOMAIN\\someuser common I looked in the /var/samba/locks directory - I have a winbindd_cache.tdb file that is current. I don't have a current idmap_cache.tdb file anymore. Not sure I need one. I initially stated with samba 3.0.x, then upgraded to 3.4.x, then to 3.5.x, and it seems with .X upgrade that the configuration for winbind and idmapping changes. This may be a bug in Solaris itself rather than samba. On 06/06/2011 02:28 PM, timothy mcdaniel wrote: I have been looking at http://samba.2283325.n4.nabble.com/Trusted-domain-users-unwantedly-mapping-onto-local-domain-users-td3005928.html and I think that if you add this in your nsswitch.conf like it says in the website above: if you already have the passwd: files ldap and group: files ldap in your nsswitch.conf then just add winbind to the end of the lines of the passwd and group lines. just like it is shown below: If you need any more help just email me back, and I will try to help you. *passwd*: files ldap winbind group: files ldap winbind -- Forwarded message -- From: Gaiseric Vandalgaiseric.van...@gmail.com To: Sambasamba@lists.samba.org Date: Mon, 06 Jun 2011 12:04:14 -0400 Subject: [Samba] getent passwd does not list trusted users I am running Samba 3.5.5 on Solaris 10. This is the latest Sun/Oracle provided build. I have an ldap backend for everything (unix+samba accounts, idmapping for domain trusts.) The Samba server is a PDC for a domain we can call SAMBA.Each samba account is tied to a unix account. I have a one-way domain trust setup with a Windows 2003 domain which we can call WIN2003. SAMBA trusts WIN2003. getent passwd and getent group seem to fundamentally be working (depending on syntax) BUT getent passwd does NOT list trusted users. On the solaris machine: --- wbinfo -u and wbinfo -glists all users in this domain + the WIN2003 domain. For the SAMBA users, the domain name is stripped out. getent passwd - lists all unix users (in ldap or /etc/passwd.) It does not list the samba users - which is the expected and desired behaviour. I had expected it to list users from the WIN2003 domain. getent group - lists all unix groups (in ldap or /etc/passwd) It does not listed the SAMBA groups - which is the expected and desired behaviour. It does list WIN2003 groups- which is also the expected and desired behaviour. getent passwd SAMBA\\user - shows uid, gid, home directory, shell getent passwd WIN2003\\user - shows uid, gid, home directory, shell getent group SAMBA\\group - shows gid, members getent group WIN2003\\group - shows gid, members id SAMBA\\user - shows uid and gid id WIN2003 \\user - shows uid and gid
Re: [Samba] getent passwd does not list trusted users
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Monday, June 06, 2011, Gaiseric Vandal wrote: I do have the entries in /etc/nswitch.conf The getent passwd won't list the winbind users although I can get details on a specific user with the getent passwd SOMEDOMAIN\\someuser common Isn't that the expected behavior using the default smb.conf values of no for winbind enum users and winbind enum groups? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAk3tKgIACgkQ5vihyNWuA4VsugCgiVnEZfTUlMGNqdSMrjIpMghE 2mUAn0cd7KEgq7Sd+JIO+Lcg02ppVdTM =15SB -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] getent passwd does not list trusted users
my smb.conf includes winbind use default domain = Yes winbind enum users = Yes winbind enum groups = Yes I did notice that some idmap entries are being created in the gencache.tdb file (specifically for LDAP groups that DON'T have a Samba SID) -I am guessing that is a symptom that idmap is trying to create idmap entries but can't post them to ldap. On 06/06/2011 03:26 PM, Frank Mori Hess wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Monday, June 06, 2011, Gaiseric Vandal wrote: I do have the entries in /etc/nswitch.conf The getent passwd won't list the winbind users although I can get details on a specific user with the getent passwd SOMEDOMAIN\\someuser common Isn't that the expected behavior using the default smb.conf values of no for winbind enum users and winbind enum groups? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAk3tKgIACgkQ5vihyNWuA4VsugCgiVnEZfTUlMGNqdSMrjIpMghE 2mUAn0cd7KEgq7Sd+JIO+Lcg02ppVdTM =15SB -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Prob found: (Re: missing symbols talloc_* (opensuse 11.4/samba 3.5.7-xxx))
Linda Walsh wrote: upgraded to opensuse 11.4. basic smbd is running mostly fine (some name res-errors, login server missing, (can't connect to Domain service). Notably nmbd won't start due to undefined symbols: /usr/sbin/nmbd: symbol lookup error: /usr/sbin/nmbd: undefined symbol: _talloc_realloc_array. ldd -r shows a bunch of similar undefined symbols (shown further below). nmbd was linking with a 'mismatched' (and unowned) libwbclient0 in /lib64 -- the real libwclient0 from the suse package is installed in /usr/lib64. So this was basically a local system config screwup were I had out-of-date, self-built libs in the wrong place that were given preference over the official system built ones. A configuration-build mistake put them in /lib64 instead of the desired /usr/lib64 *sigh* live learn. thought I'd doc the resolution incase anyone else ran into something similar. FWIW, I used ldd -r on nmbd to see what libs it was really loading. I also noted that 'readelf' showed nmbd didn't need talloc, which is what led me to start looking at the libs that nmbd was pulling in C'est la vie -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] LARGE_SMB_OFF_T problem
Hi all, I have been porting samba-3.0.36 version to one MIPS CPU environment. Firstly I encounterd the problem that the file greater than 4G size can't be size-shown correctly at Windows XP file manager, and when I tried to download/upload the large file (4G) from samba server, it always failed. I investigated the source code and found LARGE_SMB_OFF_T option (in header file ./source/includes/includes.h) was undefined in my code, then I re-enable it, such as: #ifndef LARGE_SMB_OFF_T # if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) defined(HAVE_OFF64_T)) || (defined(SIZEOF_OFF_T) (SIZEOF_OFF_T == 8)) #define LARGE_SMB_OFF_T 1 # endif #endif /* #undef LARGE_SMB_OFF_T */ The test result is the large file ( 4G) can be size-shown correctly and the download transfer seems OK. However, here I am suffering the new problem. When I disable LARGE_SMB_OFF_T option, both Windows XP and Windows 7 file managers can browse the samba server file directory trees well (my security setting is SHARE mode). After I enabled LARGE_SMB_OFF_T option, the Windows XP version still can browse the samba server well. Unfortunately, the Windows 7 failed to open the samba server. It can see the server netbios name icon, but when I clicked the icon to browse it, it expired and failed. Does any one have the same experience and have fixed the problem? If you can share, your help will be appreciated. Best Regards, JC PS: I had used one expired email address to post this thread, however, I dodn't know if it can be accepted or rejected by news server since that mail address was expired. So I re-post this thread. Sorry for the confusion if this is duplicate. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] removing windows 2003 from samba4
Hello! I've setup last version of samba on git repositories, Samba version 4.0.0alpha16-GIT-43ab5aa and joined a windows 2003 as a additional domain controller, but when i try to remove these domain controller with dcpromo command appears the following error on log.samba: [2011/06/07 00:18:55, 0] ../source4/dsdb/repl/drepl_out_helpers.c:765(dreplsrv_update_refs_done) UpdateRefs failed with WERR_DS_DRA_BUSY/NT code 0xc00020f6 for f34e07bd-b0b9-4398-84ca-b3f030a33ef9._msdcs.samba4.casa CN=Schema,CN=Configuration,DC=samba4,DC=casa On windows appears that the directory service is very busy to finish operation now... regards, -- Alan Morais -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b9108ca s3-s4-param: Add hooks for parametric options in the s3/s4 glue layer via d72b05c s3-passdb use new loadparm_init_s3 rather than reloading the smb.conf via 907cdb5 s4-modules Remove lp_ctx from init functions that no longer need it via f67a149 s4-param Remove 'modules dir' via de46ad9 lib/util use modules_path(), data_path() and shlib_ext() from source3 via 876b1b3 s3-lib Remove unused lib_path() via 1dfc6fa s4-param Add hook between Samba3 and Samba4 loadparm systems. via 521687b s4-param make lpcfg_sam_name() cope with PDC and BDC roles via 698538e s3-param always allow the realm parameter via a18efb1 s4-param Remove 'sid generator' via 834d590 s4-param Remove 'idmap database' via 1565da7 s4-param Remove 'secrets database' parameter via c091a92 s4-param Remove 'sam database' parameter via 6bf8822 libcli/util Remove prototype for ntstatus_dos_equal() from d168a5e s4-ipv6: fill in family when initialising from sockaddr http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b9108cac529dac4b4b392fab4bac4fd0e6da1b4b Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 16:47:32 2011 +1000 s3-s4-param: Add hooks for parametric options in the s3/s4 glue layer Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Mon Jun 6 10:48:53 CEST 2011 on sn-devel-104 commit d72b05cfe7d5c020fa32c8906f6185e1427e0a88 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 11:16:19 2011 +1000 s3-passdb use new loadparm_init_s3 rather than reloading the smb.conf commit 907cdb5de7f16a2540299aeba211bf2a5ae6fafe Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 14:58:28 2011 +1000 s4-modules Remove lp_ctx from init functions that no longer need it Now that we don't allow the smb.conf to change the modules dir, many functions that simply load modules or initialise a subsytem that may load modules no longer need an lp_ctx. Andrew Bartlett commit f67a14976bd6ccdacd319df872e6add994f0e0f3 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 14:39:19 2011 +1000 s4-param Remove 'modules dir' The Samba waf build ensures that dyn_MODULESDIR is always correct (even for in-tree binaries), so we don't need to allow the user to configure this at run time. Andrew Bartlett commit de46ad9084aff4384f33660acf91da3b81554a88 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 14:37:06 2011 +1000 lib/util use modules_path(), data_path() and shlib_ext() from source3 This brings these helpful utility functions in common, as they are not based on either loadparm system. (The 'modules dir' parameter from Samba4 will shortly be removed, so there is no loss in functionality) Andrew Bartlett commit 876b1b3d198e2306c36423bfb1449870c74181fd Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 14:22:12 2011 +1000 s3-lib Remove unused lib_path() commit 1dfc6fa558e7735341a7095aa46e5568a4f56cfe Author: Andrew Bartlett abart...@samba.org Date: Wed Jun 1 23:22:24 2011 +1000 s4-param Add hook between Samba3 and Samba4 loadparm systems. In the top level build, this allows calls to code that requires a lpcfg_ style loadparm_context, while using the global parameters loaded from the source3 loadparm code. Andrew Bartlett commit 521687be0d4bcd6326417696fabdce6506824b99 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 11:38:04 2011 +1000 s4-param make lpcfg_sam_name() cope with PDC and BDC roles These roles (ROLE_DOMAIN_CONTROLLER is ROLE_DOMAIN_BDC) will come in from the s3 loadparm. Andrew Bartlett commit 698538e594f65dd7ae2bd3854371ae914328b536 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 6 10:56:19 2011 +1000 s3-param always allow the realm parameter commit a18efb1490cebd92205973c50ce1582b091a7676 Author: Andrew Bartlett abart...@samba.org Date: Thu Jun 2 18:56:10 2011 +1000 s4-param Remove 'sid generator' This was only used by the Fedora DS backend for Samba4. We agreed to no longer support external LDAP backends. Andrew Bartlett commit 834d590bcff79e2d458b9e193be0c64e849a6362 Author: Andrew Bartlett abart...@samba.org Date: Thu Jun 2 15:49:36 2011 +1000 s4-param Remove 'idmap database' This is now just idmap.ldb in the private dir, which remains. commit 1565da76947f91add10a54096cdfe2ab67917b32 Author: Andrew Bartlett abart...@samba.org Date: Thu Jun 2 15:47:44 2011 +1000 s4-param Remove 'secrets database' parameter This is now just secrets.ldb in the private dir, which remains. commit c091a92be51e8c14bf0b51ab83319fbcb704c91f Author: Andrew Bartlett
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 81e48df s4/server: simplify and replace bad portable gettimeofday
by time
via 4778d35 s3/pthreadpool: replace bad portable gettimeofday by
clock_gettime
from b9108ca s3-s4-param: Add hooks for parametric options in the s3/s4
glue layer
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 81e48dfa35e1b4df6cf46df74572a2ace81c1b84
Author: Björn Jacke b...@sernet.de
Date: Sun Jun 5 21:32:11 2011 +0200
s4/server: simplify and replace bad portable gettimeofday by time
Signed-off-by: Stefan Metzmacher me...@samba.org
Autobuild-User: Björn Jacke b...@sernet.de
Autobuild-Date: Mon Jun 6 12:58:26 CEST 2011 on sn-devel-104
commit 4778d35c34031f7724379ac2d3b554af4adc48dc
Author: Björn Jacke b...@sernet.de
Date: Sun Jun 5 21:30:16 2011 +0200
s3/pthreadpool: replace bad portable gettimeofday by clock_gettime
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
source3/lib/pthreadpool/pthreadpool.c |6 ++
source4/smbd/server.c | 17 ++---
2 files changed, 4 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/pthreadpool/pthreadpool.c
b/source3/lib/pthreadpool/pthreadpool.c
index 7538fb7..9981ed2 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -427,7 +427,6 @@ static void *pthreadpool_server(void *arg)
}
while (1) {
- struct timeval tv;
struct timespec ts;
struct pthreadpool_job *job;
@@ -436,9 +435,8 @@ static void *pthreadpool_server(void *arg)
* time, exit this thread.
*/
- gettimeofday(tv, NULL);
- ts.tv_sec = tv.tv_sec + 1;
- ts.tv_nsec = tv.tv_usec*1000;
+ clock_gettime(CLOCK_REALTIME, ts);
+ ts.tv_sec += 1;
while ((pool-jobs == NULL) (pool-shutdown == 0)) {
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 53dc20d..6acccd1 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -178,13 +178,7 @@ _NORETURN_ static void max_runtime_handler(struct
tevent_context *ev,
struct timeval t, void *private_data)
{
const char *binary_name = (const char *)private_data;
- struct timeval tv;
- struct timezone tz;
- if (gettimeofday(tv, tz) == 0) {
- DEBUG(0,(%s: maximum runtime exceeded - terminating, current
ts: %d\n, binary_name, (int)tv.tv_sec));
- } else {
- DEBUG(0,(%s: maximum runtime exceeded - terminating\n,
binary_name));
- }
+ DEBUG(0,(%s: maximum runtime exceeded - terminating, current ts:
%d\n, binary_name, time(NULL)));
exit(0);
}
@@ -444,14 +438,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
discard_const(binary_name));
if (max_runtime) {
- struct timeval tv;
- struct timezone tz;
-
- if (gettimeofday(tv, tz) == 0) {
- DEBUG(0,(Called with maxruntime %d - current ts %d\n,
max_runtime, (int)tv.tv_sec));
- } else {
- DEBUG(0,(Called with maxruntime %d\n, max_runtime));
- }
+ DEBUG(0,(Called with maxruntime %d - current ts %d\n,
max_runtime, time(NULL)));
tevent_add_timer(event_ctx, event_ctx,
timeval_current_ofs(max_runtime, 0),
max_runtime_handler,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 411c52a s3: Fix two debug messages
from 81e48df s4/server: simplify and replace bad portable gettimeofday
by time
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 411c52aba33a01afc5a2824183f5ebdaa144ab49
Author: Volker Lendecke v...@samba.org
Date: Mon Jun 6 12:41:26 2011 +0200
s3: Fix two debug messages
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Jun 6 14:11:06 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/messages.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 7b2b8c1..932d478 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -205,7 +205,7 @@ struct messaging_context *messaging_init(TALLOC_CTX
*mem_ctx,
status = messaging_ctdbd_init(ctx, ctx, ctx-remote);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(2, (messaging_ctdb_init failed: %s\n,
+ DEBUG(2, (messaging_ctdbd_init failed: %s\n,
nt_errstr(status)));
TALLOC_FREE(ctx);
return NULL;
@@ -257,7 +257,7 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx,
msg_ctx-remote);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, (messaging_ctdb_init failed: %s\n,
+ DEBUG(1, (messaging_ctdbd_init failed: %s\n,
nt_errstr(status)));
return status;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 976a43c s3: Remove a pointless if-statement
from 411c52a s3: Fix two debug messages
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 976a43c5aac7a1b972efc1a4f600013b789eabaa
Author: Volker Lendecke v...@samba.org
Date: Mon Jun 6 17:03:06 2011 +0200
s3: Remove a pointless if-statement
We are here only if we have more than one num_pending
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Jun 6 18:21:17 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/async_smb.c |4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8fdcac4..2ce6410 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -180,9 +180,7 @@ void cli_smb_req_unset_pending(struct tevent_req *req)
/*
* Remove ourselves from the cli-pending array
*/
- if (num_pending 1) {
- cli-pending[i] = cli-pending[num_pending-1];
- }
+ cli-pending[i] = cli-pending[num_pending-1];
/*
* No NULL check here, we're shrinking by sizeof(void *), and
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0efcc94 Fix bug #8197 - winbind does not properly detect when a DC
connection is dead.
from 976a43c s3: Remove a pointless if-statement
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0efcc94fb834aeb03e8edc3034aa0cdeefdc0985
Author: Jeremy Allison j...@samba.org
Date: Fri Jun 3 10:22:44 2011 -0700
Fix bug #8197 - winbind does not properly detect when a DC connection is
dead.
Only waiting for writability doesn't get fd errors back with poll.
So always begin by selecting for readability, and if we get it then
see if bytes were available to read or it really is an error condition.
If bytes were available, remove the select on read as we know we
will retrieve the error when we've finished writing and start
reading the reply (or the write will timeout or fail).
Metze and Volker please check.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Jun 6 21:53:16 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/async_req/async_sock.c | 38 --
1 files changed, 32 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 86053d9..dfb1a1c 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -386,6 +386,7 @@ struct writev_state {
int count;
size_t total_size;
uint16_t flags;
+ bool err_on_readability;
};
static void writev_trigger(struct tevent_req *req, void *private_data);
@@ -413,10 +414,8 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct
tevent_context *ev,
if (state-iov == NULL) {
goto fail;
}
- state-flags = TEVENT_FD_WRITE;
- if (err_on_readability) {
- state-flags |= TEVENT_FD_READ;
- }
+ state-flags = TEVENT_FD_WRITE|TEVENT_FD_READ;
+ state-err_on_readability = err_on_readability;
if (queue == NULL) {
struct tevent_fd *fde;
@@ -462,8 +461,35 @@ static void writev_handler(struct tevent_context *ev,
struct tevent_fd *fde,
to_write = 0;
if ((state-flags TEVENT_FD_READ) (flags TEVENT_FD_READ)) {
- tevent_req_error(req, EPIPE);
- return;
+ int ret, value;
+
+ if (state-err_on_readability) {
+ /* Readable and the caller wants an error on read. */
+ tevent_req_error(req, EPIPE);
+ return;
+ }
+
+ /* Might be an error. Check if there are bytes to read */
+ ret = ioctl(state-fd, FIONREAD, value);
+ /* FIXME - should we also check
+ for ret == 0 and value == 0 here ? */
+ if (ret == -1) {
+ /* There's an error. */
+ tevent_req_error(req, EPIPE);
+ return;
+ }
+ /* A request for TEVENT_FD_READ will succeed from now and
+ forevermore until the bytes are read so if there was
+ an error we'll wait until we do read, then get it in
+ the read callback function. Until then, remove TEVENT_FD_READ
+ from the flags we're waiting for. */
+ state-flags = ~TEVENT_FD_READ;
+ TEVENT_FD_NOT_READABLE(fde);
+
+ /* If not writable, we're done. */
+ if (!(flags TEVENT_FD_WRITE)) {
+ return;
+ }
}
for (i=0; istate-count; i++) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8b02b78 s3-waf: Fix pthreadpool build which needs librt now.
from 0efcc94 Fix bug #8197 - winbind does not properly detect when a DC
connection is dead.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8b02b78044bd5baf1654ad6c2f4f28c5e9934c91
Author: Andreas Schneider a...@samba.org
Date: Mon Jun 6 22:22:34 2011 +0200
s3-waf: Fix pthreadpool build which needs librt now.
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Mon Jun 6 23:31:09 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/pthreadpool/wscript_build |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/pthreadpool/wscript_build
b/source3/lib/pthreadpool/wscript_build
index 7679b58..611ff5a 100644
--- a/source3/lib/pthreadpool/wscript_build
+++ b/source3/lib/pthreadpool/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA3_SUBSYSTEM('PTHREADPOOL',
source='pthreadpool.c',
- deps='pthread',
+ deps='pthread rt',
enabled=bld.env.WITH_PTHREADPOOL)
bld.SAMBA3_BINARY('pthreadpooltest',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 56eab75 s3: Remove unused variables
from 8b02b78 s3-waf: Fix pthreadpool build which needs librt now.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 56eab757d011f89553ac364d8aa4809ffbb6b500
Author: Volker Lendecke v...@samba.org
Date: Mon Jun 6 22:31:33 2011 +0200
s3: Remove unused variables
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Jun 7 00:42:51 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/namequery.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 7bb8caf..2ad1071 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1750,8 +1750,6 @@ NTSTATUS name_resolve_bcast(const char *name,
{
struct sockaddr_storage *bcast_addrs;
int i, num_addrs, num_bcast_addrs;
- struct sockaddr_storage *ss_list;
- NTSTATUS status = NT_STATUS_NOT_FOUND;
if (lp_disable_netbios()) {
DEBUG(5,(name_resolve_bcast(%s#%02x): netbios is disabled\n,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 776598a s3-docs Add documentation for ncalrpc dir
via a8d1d0c s3-auth Use loadparm_init_s3() to get an lp_ctx for
auth_samba4
via 5197331 s4-auth Move default auth methods back into auth.c
from 56eab75 s3: Remove unused variables
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 776598a98103a20fc6a0bfafdebd105e448518ac
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jun 7 09:47:26 2011 +1000
s3-docs Add documentation for ncalrpc dir
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Tue Jun 7 02:57:33 CEST 2011 on sn-devel-104
commit a8d1d0c94cf1bcc60d68d0385d8f092271d0145c
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jun 7 09:09:16 2011 +1000
s3-auth Use loadparm_init_s3() to get an lp_ctx for auth_samba4
This avoids loading the smb.conf twice.
Andrew Bartlett
commit 5197331fe5af0a53e02e642c9e006b19ae92ba19
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jun 7 09:07:52 2011 +1000
s4-auth Move default auth methods back into auth.c
This changes auth_methods_from_lp to no longer use the parametric
options, and to cope with ROLE_DOMAIN_BDC and ROLE_DOMAIN_PDC. This
will assist in calling the source4 auth subsystem with a source3
derived lp_ctx.
Andrew Bartlett
---
Summary of changes:
docs-xml/smbdotconf/misc/ncalrpcdir.xml | 13 +
source3/auth/auth_samba4.c | 17 ++---
source4/auth/ntlm/auth.c| 10 ++
source4/param/loadparm.c|3 ---
4 files changed, 21 insertions(+), 22 deletions(-)
create mode 100644 docs-xml/smbdotconf/misc/ncalrpcdir.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml
b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
new file mode 100644
index 000..b53acef
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -0,0 +1,13 @@
+samba:parameter name=ncalrpc dir
+ context=G
+ advanced=1 developer=1
+type=string
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+ paraThis directory will hold a series of named pipes to allow RPC
over inter-process communication. /para.
+ paraThis will allow Samba and other unix processes to interact over
DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted
permissions, and allows a trusted communication channel between Samba
processes/para
+/description
+
+value type=default${prefix}/var/ncalrpc/value
+value type=example/var/run/samba/ncalrpc/value
+/samba:parameter
diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 57c07dd..a4673db 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -42,22 +42,9 @@ static NTSTATUS check_samba4_security(const struct
auth_context *auth_context,
struct loadparm_context *lp_ctx;
const char *config_file;
- lp_ctx = loadparm_init(frame);
+ lp_ctx = loadparm_init_s3(frame, loadparm_s3_context());
if (lp_ctx == NULL) {
- DEBUG(10, (loadparm_init failed\n));
- talloc_free(frame);
- return NT_STATUS_INVALID_SERVER_STATE;
- }
-
- if (lp_loaded()) {
- config_file = lp_configfile();
- }
- if (!config_file || !config_file[0]) {
- config_file = get_dyn_CONFIGFILE();
- }
-
- if (!lpcfg_load(lp_ctx, config_file)) {
- DEBUG(1, (s4 lpcfg_load() of s3 config file %s failed,
config_file));
+ DEBUG(10, (loadparm_init_s3 failed\n));
talloc_free(frame);
return NT_STATUS_INVALID_SERVER_STATE;
}
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 72338ac..2308b15 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -488,15 +488,17 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX
*mem_ctx, const char **
const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context
*lp_ctx)
{
const char **auth_methods = NULL;
+
switch (lpcfg_server_role(lp_ctx)) {
case ROLE_STANDALONE:
- auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL,
auth methods, standalone, NULL);
+ auth_methods = str_list_make(mem_ctx, anonymous
sam_ignoredomain, NULL);
break;
case ROLE_DOMAIN_MEMBER:
- auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL,
auth methods, member server, NULL);
+ auth_methods = str_list_make(mem_ctx, anonymous sam winbind,
NULL);
break;
- case ROLE_DOMAIN_CONTROLLER:
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8acbc3a s4-provision: fixed detection of V4/V6 addresses
via 3ccb72d s4-ipv6: fixed iface_list_same_net() for IPv6
via 64380ff s4-ipv6: fixed DNS handling with new IPv6 code
via 5d7ba30 s4-dsdb: cope with missing backlinks in rpmd handling
via c6252c2 s4-netlogon: force an IPv4 address
via 6a6d4d8 s4-ipv6: fix iface_list_best_ip() for IPv6
from 776598a s3-docs Add documentation for ncalrpc dir
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8acbc3a17435ef330910993aa40b5ec1e4c1dab2
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jun 7 12:55:31 2011 +1000
s4-provision: fixed detection of V4/V6 addresses
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Jun 7 06:07:24 CEST 2011 on sn-devel-104
commit 3ccb72d7496aadbdf35b0aee3b2384466d9dd3b8
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jun 7 12:55:09 2011 +1000
s4-ipv6: fixed iface_list_same_net() for IPv6
commit 64380ff050c77b2b67c0fac4ada8650e834c4b4a
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jun 7 12:35:10 2011 +1000
s4-ipv6: fixed DNS handling with new IPv6 code
commit 5d7ba305490b5047b4d404353e95c217c8ef7d10
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jun 7 10:44:48 2011 +1000
s4-dsdb: cope with missing backlinks in rpmd handling
if backlinks have not propogated correctly in a previous replication
this allows us to recover
commit c6252c2e9d9c43496f1b5ecbf66099979096f66e
Author: Andrew Tridgell tri...@samba.org
Date: Mon Jun 6 15:19:16 2011 +1000
s4-netlogon: force an IPv4 address
this interface is currently V4 only, don't try and return a V6 address
in a V4 structure
commit 6a6d4d8884788c1e860bda886d168301623e1ea3
Author: Andrew Tridgell tri...@samba.org
Date: Mon Jun 6 15:18:12 2011 +1000
s4-ipv6: fix iface_list_best_ip() for IPv6
return an interface with the same address family as the target
---
Summary of changes:
source4/cldap_server/netlogon.c|2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c| 11 +-
source4/lib/socket/interface.c | 42 ++--
source4/libcli/resolve/dns_ex.c| 17 +++-
.../scripting/python/samba/provision/__init__.py | 31 +-
5 files changed, 94 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index e950d70..92f7a4a 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -300,7 +300,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context
*sam_ctx,
if (src_address) {
pdc_ip = iface_list_best_ip(ifaces, src_address);
} else {
- pdc_ip = iface_list_n_ip(ifaces, 0);
+ pdc_ip = iface_list_first_v4(ifaces);
}
ZERO_STRUCTP(netlogon);
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 90933c4..04311a4 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -254,7 +254,16 @@ static int replmd_process_backlink(struct ldb_module
*module, struct la_backlink
msg-elements[0].flags |= LDB_FLAG_INTERNAL_DISABLE_SINGLE_VALUE_CHECK;
ret = dsdb_module_modify(module, msg, DSDB_FLAG_NEXT_MODULE, parent);
- if (ret != LDB_SUCCESS) {
+ if (ret == LDB_ERR_NO_SUCH_ATTRIBUTE !bl-active) {
+ /* we allow LDB_ERR_NO_SUCH_ATTRIBUTE as success to
+ cope with possible corruption where the backlink has
+ already been removed */
+ DEBUG(0,(WARNING: backlink from %s already removed from %s -
%s\n,
+ldb_dn_get_linearized(target_dn),
+ldb_dn_get_linearized(source_dn),
+ldb_errstring(ldb)));
+ ret = LDB_SUCCESS;
+ } else if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb, Failed to %s backlink from %s to
%s - %s,
bl-active?add:remove,
ldb_dn_get_linearized(source_dn),
diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index 96cee2f..9cb8f5e 100644
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -372,6 +372,23 @@ const char *iface_list_first_v4(struct interface *ifaces)
}
/**
+ return the first IPv6 interface address we have registered
+ **/
+static const char *iface_list_first_v6(struct interface *ifaces)
+{
+ struct interface *i;
+
+#ifdef HAVE_IPV6
+ for (i=ifaces; i; i=i-next)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 78a0195 selftest: Fix 'make quicktest' on systems without LDAP development support from 8acbc3a s4-provision: fixed detection of V4/V6 addresses http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 78a0195cdc0d6f18cc797f2af7d8ca261662979f Author: Andrew Bartlett abart...@samba.org Date: Tue Jun 7 13:22:58 2011 +1000 selftest: Fix 'make quicktest' on systems without LDAP development support This should ensure that we don't run the Samba3/Samba4 integration tests on machines without ADS support. (Some samba3 tests in the full 'make test' may still fail however) Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Tue Jun 7 07:17:32 CEST 2011 on sn-devel-104 --- Summary of changes: source4/selftest/tests.py | 23 +-- 1 files changed, 17 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 54c2b22..9aeeec4 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -61,11 +61,20 @@ print OPTIONS %s % .join(torture_options) for options in ['-U$USERNAME%$PASSWORD --option=socket:testnonblock=true', '-U$USERNAME%$PASSWORD', '-U$USERNAME%$PASSWORD -k yes', '-U$USERNAME%$PASSWORD -k no', '-U$USERNAME%$PASSWORD -k no --sign', '-U$USERNAME%$PASSWORD -k no --encrypt', '-U$USERNAME%$PASSWORD -k yes --encrypt', '-U$USERNAME%$PASSWORD -k yes --sign']: plantestsuite(samba4.ldb.ldap with options %s(dc) % options, dc, %s/test_ldb.sh ldap $SERVER %s % (bbdir, options)) -# see if we support ldaps +# see if we support ADS on the Samba3 side try: config_h = os.environ[CONFIG_H] except KeyError: -config_h = os.path.join(samba4bindir, default/source4/include/config.h) +config_h = os.path.join(samba4bindir, default/include/config.h) + +f = open(config_h, 'r') +try: +# The other parts of the HAVE_ADS test are always supplied by the top level build +have_ads_support = (HAVE_LDAP 1 in f.read()) +finally: +f.close() + +# see if we support ldaps f = open(config_h, 'r') try: have_tls_support = (ENABLE_GNUTLS 1 in f.read()) @@ -309,8 +318,9 @@ for mech in [ -k yes]: signoptions = %s --signing=off % mech name = smb.signing disabled on with %s % signoptions -for env in [ s4member, s3member ]: -plantestsuite_loadlist(samba4.%s domain-creds % name, env, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) +plantestsuite_loadlist(samba4.%s domain-creds % name, s4member, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) +if have_ads_support: +plantestsuite_loadlist(samba4.%s domain-creds % name, s3member, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) for mech in [ -k no, @@ -319,8 +329,9 @@ for mech in [ signoptions = %s --signing=off % mech name = smb.signing on with %s % signoptions plantestsuite_loadlist(samba4.%s local-creds % name, s4member, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy']) -plantestsuite_loadlist(samba4.%s % name, plugin_s4_dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) -plantestsuite_loadlist(samba4.%s administrator % name, plugin_s4_dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) +if have_ads_support: +plantestsuite_loadlist(samba4.%s % name, plugin_s4_dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy']) +plantestsuite_loadlist(samba4.%s administrator % name, plugin_s4_dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy']) plantestsuite_loadlist(samba4.smb.signing --signing=yes anon, dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy']) plantestsuite_loadlist(samba4.smb.signing --signing=required anon, dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy']) plantestsuite_loadlist(samba4.smb.signing --signing=no anon, s4member, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy']) -- Samba Shared Repository
