Re: [Samba] Unable to find Samba Server, Windows Network
It's probably an authentication or permission problem. Since you can see \\Server, name resolution is working, but the Samba server won't let your XP user have access to anything. To confirm that this is the problem, try turning on guest accounts with the setting (be careful with this setting; read man smb.conf for a pitfall warning!) Map to guest = bad password And then guest ok = yes in each of your shares. This will leave your Samba server wide open for everybody. If things now works, you know that the problem is related to Samba not recognizing the user. -Original Message- From: samba-boun...@lists.samba.org [mailto:samba- boun...@lists.samba.org] On Behalf Of Michael Johnston Sent: Sunday, February 28, 2010 8:56 PM To: samba Subject: [Samba] Unable to find Samba Server, Windows Network Hi, I am having some problems setting permissions to access a Samba share on my Windows XP box. So what follows is all the information I thought would be useful to helping me out. Firstly, neither box has a firewall running. Both computers are able to ping each other's IPs. When on my XP box, I go to Map Network Drive I am able to find my Samba computer \\Server in my workgroup MSHOME. I am able to expand the \\Server to see \\Server\Shared. However when I click finish, it tells me The network path \\Server\Shared could not be found. Here is the output of the command net view \\Server from my XP box: [CODE] Microsoft Windows XP [Version 5.1.2600] (C) Copyright 1985-2001 Microsoft Corp. C:\net view \\server Shared resources at \\server server server (Samba, Ubuntu) Share name Type Used as Comment --- Shared Disk Linux Home Server The command completed successfully. C:\ [/CODE]The line I find peculiar is server server (Samba, Ubuntu) - what is server server? Now here is my smb.conf file: [CODE]# # Sample configuration file for the Samba suite for Debian GNU/Linux. # # # 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 most of which # are not shown in this example # # Some options that are often worth tuning have been included as # commented-out examples in this file. # - When such options are commented with ;, the proposed setting #differs from the default Samba behaviour # - When commented with #, the proposed setting is the default #behaviour of Samba but the option is considered important #enough to be mentioned here # # NOTE: Whenever you modify this file you should run the command # testparm to check that you have not made any basic syntactic # errors. # A well-established practice is to name the original file # smb.conf.master and create the real config file with # testparm -s smb.conf.master smb.conf # This minimizes the size of the really used smb.conf file # which, according to the Samba Team, impacts performance # However, use this with caution if your smb.conf file contains nested # include statements. See Debian bug #483187 for a case # where using a master file is not a good idea. # #=== Global Settings === [global] ## Browsing/Identification ### # Change this to the workgroup/NT-domain name your Samba server will part of workgroup = MSHOME # server string is the equivalent of the NT Description field server string = %h server (Samba, Ubuntu) # Windows Internet Name Serving Support Section: # WINS Support - Tells the NMBD component of Samba to enable its WINS Server # wins support = no # 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 # This will prevent nmbd to search for NetBIOS names through DNS. dns proxy = no # What naming service and in what order should we use to resolve host names # to IP addresses ; name resolve order = lmhosts host wins bcast Networking # The specific set of interfaces / networks to bind to # This can be either the interface name or an IP address/netmask; # interface names are normally preferred ; interfaces = 127.0.0.0/8 eth0 # Only bind to the named interfaces and/or networks; you must use the # 'interfaces' option above to use this. # It is recommended that you enable this feature if your Samba machine is # not protected by a firewall or is a firewall itself. However, this # option cannot handle dynamic or non-broadcast interfaces correctly. ; bind interfaces only = yes Debugging/Accounting # This tells Samba to use a separate log file for each machine #
Re: [Samba] Problems accessing a file share using kerberos
On Sat, Feb 27, 2010 at 12:55 AM, Pedro Côrte-Real pe...@pedrocr.net wrote: I've upgraded to samba 3.4.5 and now the error message has changed: $ smbclient -U WIN/pedrocr //gsb-filer2/pedrocr -k ads_krb5_mk_req: krb5_get_credentials failed for gsb-file...@su-gsb.win.stanford.edu (Server not found in Kerberos database) cli_session_setup_kerberos: spnego_gen_negTokenTarg failed: Server not found in Kerberos database session setup failed: SUCCESS - 0 before it was gathering a bunch of credentials before failing. Now it can't find the credential for the SU-GSB.WIN realm. I upgraded the whole distro so it could just be kerberos that is broken. Any idea how to diagnose this or if it is even a bug? Cheers, Pedro -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Winbindd Domain Controllers
How intensely does Samba (winbindd) interact with a DC after the initial login ? I'm looking at a situation where the DC is in a different area to the samba system, and is liable to lose power during maintenance. No other DCs will be available. The Windows apps that use samba need to keep on running. Is an unavailable DC an issue ? Can I use the winbindd caching options to help ? Thanks, -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Your password expires today problem
Am 26.02.2010 14:51, schrieb Marcelo Terres: Let me understand. On Fri, Feb 26, 2010 at 6:52 AM, Martin Schmidt martin.schm...@uni-wuerzburg.de mailto:martin.schm...@uni-wuerzburg.de wrote: hi again, in my case it works now after setting the maximum password age to a point far in future, but not to never. So this works: pdbedit -P maximum password age -C 4294967294 This way, the message stops ? see below. but this not: pdbedit -P maximum password age -C -1 I have also re-disabled the users account control property Password does not expire using pdbedit -r -c [] test Unix username:test NT username: Account Flags:[U ] User SID: S-1-5-21-1200361472-1041780773-253280391-2648 Primary Group SID:S-1-5-21-1200361472-1041780773-253280391-513 Full Name: Home Directory: \\fecenter\test HomeDir Drive:Q: Logon Script:Profile Path: \\fecenter\profiles\test Domain: LSFE Account desc:Workstations:Munged dial: Logon time: 0 Logoff time: never Kickoff time: never Password last set:Thu, 25 Feb 2010 10:35:29 CET Password can change: Thu, 25 Feb 2010 10:35:29 CET Password must change: Sun, 03 Apr 2146 18:03:43 CEST Last bad password : 0 Bad password count : 0 Logon hours : FF I could have hit on it in a moment! Disabling this policy the message stop too ? I'm not sure what stoped the message eventually. But I think the first one, the second procedure was only to undo my changes I have done while testing. Regards, Martin Regards , regards, Martin Martin Schmidt schrieb: hi, I tried pdbedit -P maximum password age -C -1, but with no effect. pdbedit -r -c [X] test and retyping the password via smbpasswd test had also no effect, curiously pdbedit -v test gives following: Unix username:test NT username: Account Flags:[UX ] User SID: S-1-5-21-1200361472-1041780773-253280391-2648 Primary Group SID:S-1-5-21-1200361472-1041780773-253280391-513 Full Name: Home Directory: \\fecenter\test HomeDir Drive:Q: Logon Script:Profile Path: \\fecenter\profiles\test Domain: LSFE Account desc:Workstations:Munged dial: Logon time: 0 Logoff time: never Kickoff time: never Password last set:Thu, 25 Feb 2010 09:47:06 CET Password can change: Thu, 25 Feb 2010 09:47:06 CET Password must change: never Last bad password : 0 Bad password count : 0 Logon hours : FF regards, Martin Gaiseric Vandal schrieb: We had a few users with the same problem when we moved the password backend from tdb to ldap.The following command seem to fix it. pdbedit -P maximum password age -C -1 On 02/24/2010 04:25 PM, Marcelo Terres wrote: Samba 3.0.24 doesn't have the problem, maybe because it doesn't support the policies domain account (configured with pdbedit). This feature starts in 3.0.25 and the problems with password expiration starts in the version either. Regards, Marcelo H. Terres mhter...@gmail.com mailto:mhter...@gmail.com ICQ: 6649932 MSN: mhter...@hotmail.com mailto:mhter...@hotmail.com Jabber: mhter...@jabber.org mailto:mhter...@jabber.org http://twitter.com/mhterres http://identi.ca/mhterres http://mundoopensource.blogspot.com/ http://www.propus.com.br Sent from Porto Alegre, RS, Brazil On Wed, Feb 24, 2010 at 2:38 PM, Martin Schmidt martin.schm...@uni-wuerzburg.de mailto:martin.schm...@uni-wuerzburg.de wrote: Hi, I have a very similiar problem, but the story is an other: I migrated from sles 10 sp2 samba 3.0.24 to ubuntu 9.10 server samba 3.4.3 (pdc). The user-accounts were moved following this instruction: http://www.cyberciti.biz/faq/howto-move-migrate-user-accounts-old-to-new-server/.
[Samba] [Announce] Samba 3.5.0 Available for Download
= “Perfection is attained by slow degrees; it requires the hand of time” Voltaire = Release Announcements = This is the first stable release of Samba 3.5. Major enhancements in Samba 3.5.0 include: General changes: o Add support for full Windows timestamp resolution o The Using Samba HTML book has been removed. o 'net', 'smbclient' and libsmbclient can use credentials cached by Winbind. o The default value of wide links has been changed to no. Protocol changes: o Experimental implementation of SMB2 Printing Changes: o Add encryption support for connections to a CUPS server Winbind changes: o Major refactoring o Asynchronous VFS modules: o New vfs_scannedonly module has been added. General changes: Support for full Windows timestamp resolution has been added. This effectively makes us use Windows' full 100ns timestamp resolution if supported by the kernel (2.6.22 and higher) and the glibc (2.6 and higher). The Using Samba HTML book has been removed from the Samba tarball. It is still available at http://www.samba.org/samba/docs/using_samba/toc.html. Samba client tools like 'net', 'smbclient' and libsmbclient can use the user credentials cached by Winbind at logon time. This is very useful e.g. when connecting to a Samba server using Nautilus without re-entering username and password. This feature is enabled by default and can be disabled per application by setting the LIBSMBCLIENT_NO_CCACHE environment variable. The default value of wide links has been changed to no to avoid an insecure default configuration (wide links = yes and unix extensions = yes). For more details, please see http://www.samba.org/samba/news/symlink_attack.html. Protocol changes An EXPERIMENTAL implementation of the SMB2 protocol has been added. SMB2 can be enabled by setting max protocol = smb2. SMB2 is a new implementation of the SMB protocol used by Windows Vista and higher. Printing Changes A new parameter cups encrypt has been added to control whether connections to CUPS servers will be encrypted or not. The default is to use unencrypted connections. Winbind changes === The Winbind daemon has been refactored internally to be asynchronous. The new Winbind will not be blocked by running 'getent group' or 'getent passwd'. VFS modules === A new VFS module scannedonly has been added. This is a filter that talks to an antivirus-engine and stores whether a file is clean or not. Users do only see clean files on their filesystem. ## Changes ### smb.conf changes Parameter Name Description Default -- --- --- create krb5 confNew yes ctdb timeoutNew 0 cups encryptNew no debug hires timestamp Changed Default yes ldap deref New auto ldap follow referralNew auto nmbd bind explicit broadcastNew no wide links Changed Default no New configure options - --enable-external-libtdbEnable external tdb --enable-netapi Turn on netapi support --enable-pthreadpoolEnable pthreads pool helper support --with-cifsumount Include umount.cifs (Linux only) support --with-codepagedir=DIR Where to put codepages Commit Highlights = o Björn Jacke b...@sernet.de * Add support for full Windows timestamp resolution. * Add encryption support for connections to a CUPS server. o Volker Lendecke v...@samba.org * Major internal refactoring of the Winbind daemon. * Make Winbind asynchronous. * Make 'net', 'smbclient' and libsmbclient use the logon credentials cached by Winbind. o Stefan Metzmacher me...@samba.org * Implement the new SMB2 protocol (experimental). Changes since 3.5.0rc3 -- o Günther Deschner g...@samba.org * BUG 7181: Fix 'net ads dns' usage calls. * BUG 7182: Fix uninitialized variable in wkssvc_enumerateusers. o Volker Lendecke v...@samba.org * BUG 7145: Fix duplicate sam and unix accounts. * BUG 7166: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send. o Stefan Metzmacher me...@samba.org * BUG 7160: Keep the the correct negotiate_flags on the cli-dc structure. Changes since 3.5.0rc2 -- o Jeremy Allison j...@samba.org * BUG 6557: Fix vfs_full_audit. * BUG 6876: Fix duplicate initializer in the rmdir
Re: [Samba] [Announce] Samba 3.5.0 Available for Download
On Mon, Mar 01, 2010 at 02:44:29PM +0100, Karolin Seeger wrote: = “Perfection is attained by slow degrees; it requires the hand of time” Voltaire = Release Announcements = This is the first stable release of Samba 3.5. This one was hard Many thanks for enduring this :-) Volker signature.asc Description: Digital signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] [Announce] Samba 3.5.0 Available for Download
On Monday 01 March 2010 8:49:48 am Volker Lendecke wrote: On Mon, Mar 01, 2010 at 02:44:29PM +0100, Karolin Seeger wrote: = “Perfection is attained by slow degrees; it requires the hand of time” Voltaire = Release Announcements = This is the first stable release of Samba 3.5. This one was hard Many thanks for enduring this :-) Volker Rather, thanks to you and the rest of the Samba team for enduring! Dimitri -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba file locking
On Mon, Feb 22, 2010 at 10:18 AM, Janez Kosmrlj postnali...@googlemail.comwrote: On Sun, Feb 21, 2010 at 8:46 PM, Janez Kosmrlj postnali...@googlemail.com wrote: On Fri, Feb 19, 2010 at 9:23 PM, Ernesto Silva erniesi...@gmail.comwrote: Can you try to mount with -o directio? Not sure this will help, but it might be worth a try. Volker Hi, there is also another parameter similar to directio, I don't know the difference but seems more radical, it's forcedirectio. I have been using it on linux clients which mounts a samba share or a w2k share. Best regards, Ernesto. I think we tried -o, but i will check it again. I will also giwe forcedirectio a try. Any other ideas. It looks like forcedirectio is the right way to go. I tried it with the text file tests, that i mentioned before and for now it looks OK. All i have to do now is to test it with real life jar files and java. I will report to this list as soon as i get any results. Hi, Unfortunately forcedirectio is not the solution i hoped it would be. When i preform the above mentioned text file test everything looks OK, but when we try to work with real life .jar files then we get mmap failed for CEN and END part of zip file from the Java application. Is there someone with a better solution. Thanx anyway to Ernesto and Volker for the help. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Error Printing Using Samba
Although I can print locally on a linux machine running samba-3.4.5, cups-1.4.1, hplip-3.9.12 without errors, when any windows machines try to print to a printer connected to the Linux machine, the job prints, but gives the following error: /usr/local/lib/cups/filter/pstoraster failed ..and the job remains in the print queue on both the local and remote machines. This error occurs even when printing the same pdf file that prints without errors on the linux machine Is this something to do with smb.conf? It used to work fine on the same setup with samba-3.4.1, cups-1.3.8 and hplip-3.9.8 Regards John /var/log/samba-log.192.168.1.1 -- [2010/02/28 18:38:38, 1] libsmb/cliconnect.c:2039(cli_start_connection) cli_start_connection: failed to connect to JACK-PC20 (192.168.1.1). Error NT_STATUS_CONNECTION_REFUSED [2010/02/28 18:38:38, 1] libsmb/cliconnect.c:2039(cli_start_connection) cli_start_connection: failed to connect to JACK-PC20 (192.168.1.1). Error NT_STATUS_CONNECTION_REFUSED [2010/02/28 19:02:47, 0] lib/util_sock.c:539(read_fd_with_timeout) [2010/02/28 19:02:47, 0] lib/util_sock.c:1491(get_peer_addr_internal) getpeername failed. Error was Transport endpoint is not connected read_fd_with_timeout: client 0.0.0.0 read error = Connection reset by peer. /var/log/messages -- Feb 28 18:39:20 (none) user.err OfficeJetG85: prnt/hpijs/hpcups.cpp 681: hpcups: returning status 0 from main Feb 28 18:39:29 (none) daemon.err hp[17826]: io/hpmud/mlc.c 135: unexpected MLCCreditRequest: cmd=4, hid=2, pid=2, credit=65535 /var/log/cups/error_log --- I [28/Feb/2010:18:38:06 +0400] Started /usr/local/lib/cups/cgi-bin/jobs.cgi (pid=17820) I [28/Feb/2010:18:38:09 +0400] Started /usr/local/lib/cups/cgi-bin/jobs.cgi (pid=17821) I [28/Feb/2010:18:38:38 +0400] [Job ???] Request file type is application/postscript. I [28/Feb/2010:18:39:08 +0400] Saving job cache file /var/cache/cups/job.cache... I [28/Feb/2010:18:39:20 +0400] Hint: Try setting the LogLevel to debug to find out more. E [28/Feb/2010:18:39:30 +0400] [Job 4] Job stopped due to filter errors; please consult the error_log file for details. D [28/Feb/2010:18:39:30 +0400] [Job 4] The following messages were recorded from 18:39:20 to 18:39:29 ... D [28/Feb/2010:18:39:30 +0400] [Job 4] Error in .trysetparams! D [28/Feb/2010:18:39:30 +0400] [Job 4] /rangecheck D [28/Feb/2010:18:39:30 +0400] [Job 4] /GrayValues D [28/Feb/2010:18:39:30 +0400] [Job 4] -mark- D [28/Feb/2010:18:39:30 +0400] [Job 4] true D [28/Feb/2010:18:39:30 +0400] [Job 4] null D [28/Feb/2010:18:39:30 +0400] [Job 4] -device- D [28/Feb/2010:18:39:30 +0400] [Job 4] null D [28/Feb/2010:18:39:30 +0400] [Job 4] -dict- D [28/Feb/2010:18:39:30 +0400] [Job 4] -save- D [28/Feb/2010:18:39:30 +0400] [Job 4] Putting. D [28/Feb/2010:18:39:30 +0400] [Job 4] GPL Ghostscript 8.70: Unrecoverable error, exit code 1 D [28/Feb/2010:18:39:30 +0400] [Job 4] cups_close(0x9dfe564) D [28/Feb/2010:18:39:30 +0400] [Job 4] prnt/hpijs/hpcups.cpp 681: hpcups: returning status 0 from mainINFO: ready to print D [28/Feb/2010:18:39:30 +0400] [Job 4] End of messages D [28/Feb/2010:18:39:30 +0400] [Job 4] printer-state=3(idle) D [28/Feb/2010:18:39:30 +0400] [Job 4] printer-state-message=/usr/local/lib/cups/filter/pstoraster failed D [28/Feb/2010:18:39:30 +0400] [Job 4] printer-state-reasons=none I [28/Feb/2010:18:39:31 +0400] Started /usr/local/lib/cups/cgi-bin/jobs.cgi (pid=19402) I [28/Feb/2010:18:40:01 +0400] Saving job cache file /var/cache/cups/job.cache... I [28/Feb/2010:18:41:19 +0400] Started /usr/local/lib/cups/cgi-bin/admin.cgi (pid=19409) smb.conf [global] workgroup = WORKGROUP netbios name = DSLKAYAK hosts allow = 192.168.1.* security = share client ntlmv2 auth = no load printers = yes printing = cups printcap = cups path = /mnt/sdb4/dslshare read only = no browseable = yes guest ok = yes [printers] comment = All Printers path = /var/spool/samba browseable = yes public = yes guest ok = yes writable = no printable = yes [print$] comment = Printer Drivers path = /usr/local/share/cups/drivers browseable = yes guest ok = no read only = yes write list = root -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Unable to find Samba Server, Windows Network
Hi, I am having some problems setting permissions to access a Samba share on
my Windows XP box. So what follows is all the information I thought would be
useful to helping me out.
Firstly, neither box has a firewall running. Both computers are able to ping
each other's IPs. When on my XP box, I go to Map Network Drive I am able
to find my Samba computer \\Server in my workgroup MSHOME. I am able to
expand the \\Server to see \\Server\Shared. However when I click finish, it
tells me The network path \\Server\Shared could not be found.
Here is the output of the command net view \\Server from my XP box:
[CODE] Microsoft Windows XP [Version 5.1.2600]
(C) Copyright 1985-2001 Microsoft Corp.
C:\net view \\server
Shared resources at \\server
server server (Samba, Ubuntu)
Share name Type Used as Comment
---
Shared Disk Linux Home Server
The command completed successfully.
C:\
[/CODE]
The line I find peculiar is server server (Samba, Ubuntu) - what is
server server?
I am running Ubuntu 9.04 and Samba 3.*. Now here is my smb.conf file:
[CODE]
#
# Sample configuration file for the Samba suite for Debian GNU/Linux.
#
#
# 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 most of which
# are not shown in this example
#
# Some options that are often worth tuning have been included as
# commented-out examples in this file.
# - When such options are commented with ;, the proposed setting
#differs from the default Samba behaviour
# - When commented with #, the proposed setting is the default
#behaviour of Samba but the option is considered important
#enough to be mentioned here
#
# NOTE: Whenever you modify this file you should run the command
# testparm to check that you have not made any basic syntactic
# errors.
# A well-established practice is to name the original file
# smb.conf.master and create the real config file with
# testparm -s smb.conf.master smb.conf
# This minimizes the size of the really used smb.conf file
# which, according to the Samba Team, impacts performance
# However, use this with caution if your smb.conf file contains nested
# include statements. See Debian bug #483187 for a case
# where using a master file is not a good idea.
#
#=== Global Settings ===
[global]
## Browsing/Identification ###
# Change this to the workgroup/NT-domain name your Samba server will part of
workgroup = MSHOME
# server string is the equivalent of the NT Description field
server string = %h server (Samba, Ubuntu)
# Windows Internet Name Serving Support Section:
# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
# wins support = no
# 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
# This will prevent nmbd to search for NetBIOS names through DNS.
dns proxy = no
# What naming service and in what order should we use to resolve host names
# to IP addresses
; name resolve order = lmhosts host wins bcast
Networking
# The specific set of interfaces / networks to bind to
# This can be either the interface name or an IP address/netmask;
# interface names are normally preferred
; interfaces = 127.0.0.0/8 eth0
# Only bind to the named interfaces and/or networks; you must use the
# 'interfaces' option above to use this.
# It is recommended that you enable this feature if your Samba machine is
# not protected by a firewall or is a firewall itself. However, this
# option cannot handle dynamic or non-broadcast interfaces correctly.
; bind interfaces only = yes
Debugging/Accounting
# This tells Samba to use a separate log file for each machine
# that connects
log file = /var/log/samba/log.%m
# Cap the size of the individual log files (in KiB).
max log size = 1000
# If you want Samba to only log through syslog then set the following
# parameter to 'yes'.
# syslog only = no
# We want Samba to log a minimum amount of information to syslog. Everything
# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
# through syslog you should set the following parameter to something higher.
syslog = 0
# Do something sensible when Samba crashes: mail the admin a backtrace
panic action = /usr/share/samba/panic-action %d
### Authentication ###
# security = user is always a good idea. This will require a Unix account
# in this server for every user accessing the server. See
# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
# in the samba-doc package for details.
security =
Re: [Samba] Standalone PDC XP-Win7 clients can't join domain.
Adrian, I had the same issue with Debian 3.4.3. I eventually found an old post that mentioned adding the -i option (if using ldap) to the add machine script entry like this: add machine script = /usr/sbin/smbldap-useradd -i -w '%u' I don't know which backend you're using, but smbpasswd also supports this option if adding machine accounts manually. I'm unaware of why it is needed or how a non-ldap PDC could use this option with an on-the-fly add machine script entry. I only know that XP and Win7 systems could now join the domain. Dale On 02/28/2010 4:39 AM, Adrian Levi wrote: I have setup a Samba PDC Version 3.4.3 under Debian. I have read the TOSHARG and By Example chapters regarding domain logins as well as anything else I could find. The machines (seem) to join the domain successfully but when the machines requre a domain administrator account privilege escalation fails. The Win7 machine fails with the message The machine trust account failed I suspect the problem lies with the domain setup on the PDC but I am unable to trouble shoot further on my own. Another thing to note is that there is no ADMIN$ IPC share on the server and I am unable to find information regarding when it should be present or not. It is worth noting that the server otherwise works as a workgroup server. Please suggest any information that would be useful to troubleshoot further. Yours humbly, Adrian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] [Announce] Samba 3.5.0 Available for Download
Rather, thanks to you and the rest of the Samba team for enduring! +1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] about [homes] path
Hi, I divide accounts into two groups. One is normal account which $HOME is /home/account. The other is jailed account which real $HOME path is /home/account/jailed. (The $HOME of jailed accounts in /etc/passwd is still /home/account) In [homes] section, if I don't set path, jailed account can't enter his jailed $HOME (/home/account/jailed) directly. Is it possible to let all accounts go to their $HOME path correctly? ie. When normal account access \\samba\username, it map to /home/username. When jailed account access \\samba\username, it map to /home/username/jailed. Thanks. -- Best Regards, - heath -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Working on open office
Hallo all, I have a problem when working using open office(spreadsheet) that placed on samba file server. The problem is time to access/modify file from client(windows xp) takes a long time about 40 second. When the problems happen my solution is restart my samba, but of course break the connection to client(general input/output error). Is there any issue with this problem? i'm using samba 3.2.6-1. Thx Shiddiq -- 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 v3-5-test updated
The branch, v3-5-test has been updated
via fd59fa5... s3: Fix but 7145 -- duplicate sam and unix accounts
from a3e3355... s3:cli_netlogon: keep the the correct negotiate_flags on
the cli-dc structure
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit fd59fa500a30a69ed09265bc3871fa640e232422
Author: Volker Lendecke v...@samba.org
Date: Sun Feb 28 14:38:14 2010 +0100
s3: Fix but 7145 -- duplicate sam and unix accounts
For me this survives the
TESTS=posix_s3 POSIX_SUBTESTS=RPC-SAMR-LARGE-DC LOCAL-NSS-WRAPPER make
test
reproducer. Günther, please check!
Volker
(cherry picked from commit 0e9882a65e91e4ab55dc103c7f6aec4ccd966db0)
---
Summary of changes:
source3/winbindd/wb_next_grent.c | 11 +++
source3/winbindd/wb_next_pwent.c | 11 +++
2 files changed, 22 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index 5f81bca..0e9dbd5 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -59,6 +59,11 @@ struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
state-gstate-domain = state-gstate-domain-next;
}
+ if ((state-gstate-domain != NULL)
+sid_check_is_domain(state-gstate-domain-sid)) {
+ state-gstate-domain = state-gstate-domain-next;
+ }
+
if (state-gstate-domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -109,6 +114,12 @@ static void wb_next_grent_fetch_done(struct tevent_req
*subreq)
if (state-gstate-num_groups == 0) {
state-gstate-domain = state-gstate-domain-next;
+
+ if ((state-gstate-domain != NULL)
+sid_check_is_domain(state-gstate-domain-sid)) {
+ state-gstate-domain = state-gstate-domain-next;
+ }
+
if (state-gstate-domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;
diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 25ab7b3..fbaaa48 100644
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -55,6 +55,11 @@ struct tevent_req *wb_next_pwent_send(TALLOC_CTX *mem_ctx,
state-gstate-domain = state-gstate-domain-next;
}
+ if ((state-gstate-domain != NULL)
+sid_check_is_domain(state-gstate-domain-sid)) {
+ state-gstate-domain = state-gstate-domain-next;
+ }
+
if (state-gstate-domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -101,6 +106,12 @@ static void wb_next_pwent_fetch_done(struct tevent_req
*subreq)
if (state-gstate-num_users == 0) {
state-gstate-domain = state-gstate-domain-next;
+
+ if ((state-gstate-domain != NULL)
+sid_check_is_domain(state-gstate-domain-sid)) {
+ state-gstate-domain = state-gstate-domain-next;
+ }
+
if (state-gstate-domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 19623b2... s3-spoolss: fix fstrings in convert_devicemode() function. from 1ea768b... s3:winbindd: never mark external domains as internal! http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 19623b2cd90cb2e5b028e2154bc3abea49ddcbe9 Author: Günther Deschner g...@samba.org Date: Mon Nov 30 18:10:59 2009 +0100 s3-spoolss: fix fstrings in convert_devicemode() function. Guenther (cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2) Fix bug #7176 (incorrect format of device mode strings). --- Summary of changes: source3/rpc_server/srv_spoolss_nt.c |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index d580754..266b3ae 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1481,8 +1481,11 @@ bool convert_devicemode(const char *printername, return false; } - rpcstr_push(nt_devmode-devicename, devmode-devicename, 31, 0); - rpcstr_push(nt_devmode-formname, devmode-formname, 31, 0); + fstrcpy(nt_devmode-devicename, devmode-devicename); + fstrcpy(nt_devmode-formname, devmode-formname); + + nt_devmode-devicename[31] = '\0'; + nt_devmode-formname[31] = '\0'; nt_devmode-specversion = devmode-specversion; nt_devmode-driverversion = devmode-driverversion; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via bb4a765... s3-rpcclient: fix uninitialized variable in
wkssvc_enumerateusers.
from fd59fa5... s3: Fix but 7145 -- duplicate sam and unix accounts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit bb4a76538bfae593c4a997b10bdb1f6c1666701c
Author: Günther Deschner g...@samba.org
Date: Wed Feb 17 15:15:47 2010 +0100
s3-rpcclient: fix uninitialized variable in wkssvc_enumerateusers.
Guenther
Fix bug #7182.
---
Summary of changes:
source3/rpcclient/cmd_wkssvc.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 34ad576..1475010 100644
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -190,7 +190,7 @@ static WERROR cmd_wkssvc_enumerateusers(struct
rpc_pipe_client *cli,
}
for (i=0; inum_entries; i++) {
- const char *user;
+ const char *user = NULL;
switch (info.level) {
case 0:
user = info.ctr.user0-user0[i].user_name;
@@ -202,7 +202,7 @@ static WERROR cmd_wkssvc_enumerateusers(struct
rpc_pipe_client *cli,
info.ctr.user1-user1[i].user_name);
break;
}
- printf(%s\n, user);
+ printf(%s\n, user ? user : (null));
}
return werr;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 7d5575f... s3-net: fix net ads dns usage calls.
from bb4a765... s3-rpcclient: fix uninitialized variable in
wkssvc_enumerateusers.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 7d5575fefe29a00c757dab0013c9d45b84f0be47
Author: Günther Deschner g...@samba.org
Date: Mon Feb 8 11:53:59 2010 +0100
s3-net: fix net ads dns usage calls.
Bjoern, please check.
Guenther
Fix bug #7181 (buildwarnings in net_ads.c).
---
Summary of changes:
source3/utils/net_ads.c | 11 ---
1 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index eff664f..3cd4fd8 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1432,9 +1432,11 @@ static int net_ads_dns_register(struct net_context *c,
int argc, const char **ar
#endif
if (argc 0 || c-display_usage) {
- d_printf(_(Usage:\n),
+ d_printf( %s\n
net ads dns register\n
- , _(Register hostname with DNS\n));
+ %s\n,
+_(Usage:),
+_(Register hostname with DNS\n));
return -1;
}
@@ -1484,7 +1486,10 @@ static int net_ads_dns_gethostbyname(struct net_context
*c, int argc, const char
#endif
if (argc != 2 || c-display_usage) {
- d_printf(_(Usage:\n),
+ d_printf( %s\n
+ %s\n
+ %s\n,
+_(Usage:),
_(net ads dns gethostbyname server name\n),
_( Look up hostname from the AD\n
server\tName server to use\n
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 5fcab19... WHATSNEW: Update changes since 3.5.0rc3. from 7d5575f... s3-net: fix net ads dns usage calls. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 5fcab1948e6e3347cbe91fa2f27e547db499776b Author: Karolin Seeger ksee...@samba.org Date: Mon Mar 1 12:09:45 2010 +0100 WHATSNEW: Update changes since 3.5.0rc3. Karolin --- Summary of changes: WHATSNEW.txt | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 4b5c64d..caad89d 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -131,6 +131,20 @@ Changes since 3.5.0rc3 -- +o Günther Deschner g...@samba.org +* BUG 7181: Fix 'net ads dns' usage calls. +* BUG 7182: Fix uninitialized variable in wkssvc_enumerateusers. + + +o Volker Lendecke v...@samba.org +* BUG 7145: Fix duplicate sam and unix accounts. +* BUG 7166: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send. + + +o Stefan Metzmacher me...@samba.org +* BUG 7160: Keep the the correct negotiate_flags on the cli-dc structure. + + Changes since 3.5.0rc2 -- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 747a0b4... s3: Remove unused mypid from
count_current_connections() state
from 8448ece... python: Add 'make pylint' convenience rule.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 747a0b440f2a7de390a1a58fe7374c77e65643d0
Author: Volker Lendecke v...@samba.org
Date: Mon Mar 1 12:15:41 2010 +0100
s3: Remove unused mypid from count_current_connections() state
---
Summary of changes:
source3/smbd/connection.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index a54dc8d..e2b01d0 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -48,7 +48,6 @@ bool yield_connection(connection_struct *conn, const char
*name)
}
struct count_stat {
- pid_t mypid;
int curr_connections;
const char *name;
bool Clear;
@@ -99,7 +98,6 @@ int count_current_connections( const char *sharename, bool
clear )
{
struct count_stat cs;
- cs.mypid = sys_getpid();
cs.curr_connections = 0;
cs.name = sharename;
cs.Clear = clear;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via d82b72a... WHATSNEW: Update changes since 3.5.0rc3. via 62bccb6... s3-net: fix net ads dns usage calls. via f678dc0... s3-rpcclient: fix uninitialized variable in wkssvc_enumerateusers. via 6f38dc6... s3: Fix but 7145 -- duplicate sam and unix accounts via 4aa41c7... s3:cli_netlogon: keep the the correct negotiate_flags on the cli-dc structure via ecda733... s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send via 71c4a4f... WHATSNEW: Prepare release notes for Samba 3.5.0. via 0af8d27... VERSION: Raise version number up to 3.5.0. from 69d87ed... WHATSNEW: Update changes since 3.5.0rc2. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit d82b72a5a5d7c1585a39f3a9530ff8861bfda45a Author: Karolin Seeger ksee...@samba.org Date: Mon Mar 1 12:09:45 2010 +0100 WHATSNEW: Update changes since 3.5.0rc3. Karolin (cherry picked from commit 5fcab1948e6e3347cbe91fa2f27e547db499776b) commit 62bccb6f70fb770b7b834769a284aee2c4c097db Author: Günther Deschner g...@samba.org Date: Mon Feb 8 11:53:59 2010 +0100 s3-net: fix net ads dns usage calls. Bjoern, please check. Guenther Fix bug #7181 (buildwarnings in net_ads.c). (cherry picked from commit 7d5575fefe29a00c757dab0013c9d45b84f0be47) commit f678dc0df569f46f9b254d263243d60eaaf93ff3 Author: Günther Deschner g...@samba.org Date: Wed Feb 17 15:15:47 2010 +0100 s3-rpcclient: fix uninitialized variable in wkssvc_enumerateusers. Guenther Fix bug #7182. (cherry picked from commit bb4a76538bfae593c4a997b10bdb1f6c1666701c) commit 6f38dc637faeea64ac6e693cfa649899004f01d8 Author: Volker Lendecke v...@samba.org Date: Sun Feb 28 14:38:14 2010 +0100 s3: Fix but 7145 -- duplicate sam and unix accounts For me this survives the TESTS=posix_s3 POSIX_SUBTESTS=RPC-SAMR-LARGE-DC LOCAL-NSS-WRAPPER make test reproducer. Günther, please check! Volker (cherry picked from commit 0e9882a65e91e4ab55dc103c7f6aec4ccd966db0) (cherry picked from commit fd59fa500a30a69ed09265bc3871fa640e232422) commit 4aa41c7d4a39f33fb4868b27e057d0a169fb97e6 Author: Stefan Metzmacher me...@samba.org Date: Fri Feb 19 23:22:40 2010 +0100 s3:cli_netlogon: keep the the correct negotiate_flags on the cli-dc structure This should fix the rpccli_netlogon_set_trust_password() against DC's without netr_ServerPasswordSet2 support. This fixes bug #7160. metze (cherry picked from commit 1e9df26ef970df41de54142a78606a15374acbac) (cherry picked from commit a3e3355b5ccf74a2ffe5da6cbb2747e74586b1e5) commit ecda733ca608950c8d3c08d1caf82f45de622461 Author: Volker Lendecke v...@samba.org Date: Sun Feb 21 20:39:36 2010 +0100 s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send I hate macros (cherry picked from commit 65914ed8194b141a44516d626e71a1851bccff5f) Fix bug #7166. (cherry picked from commit b7d5b469ef134d60e1f795f66f7e5c3ef23d7971) commit 71c4a4fb1d5fa167416a74ee90a3d4632af63cde Author: Karolin Seeger ksee...@samba.org Date: Mon Feb 22 15:44:34 2010 +0100 WHATSNEW: Prepare release notes for Samba 3.5.0. Karolin (cherry picked from commit 262854d8a2a39df2d151268442772ad92b0ddbcd) commit 0af8d273e413cc6fc5fa47c09702e010536e1acc Author: Karolin Seeger ksee...@samba.org Date: Mon Feb 22 15:40:57 2010 +0100 VERSION: Raise version number up to 3.5.0. Karolin (cherry picked from commit e8979e7edd42ec229cc7d53f636c99a09b97fde4) --- Summary of changes: WHATSNEW.txt | 30 +++--- source3/VERSION |2 +- source3/libsmb/async_smb.c|3 ++- source3/rpc_client/cli_netlogon.c |8 ++-- source3/rpcclient/cmd_wkssvc.c|4 ++-- source3/utils/net_ads.c | 11 --- source3/winbindd/wb_next_grent.c | 11 +++ source3/winbindd/wb_next_pwent.c | 11 +++ 8 files changed, 64 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 1d99e4e..caad89d 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,13 +1,11 @@ + = + Release Notes for Samba 3.5.0 + March 1, 2010 === - Release Notes for Samba 3.5.0rc3 - February 19, 2010 - === -This is the third release candidate of Samba 3.5. This is *not* -intended for production environments and is designed for testing -purposes only. Please report
[SCM] Samba Shared Repository - annotated tag release-3-5-0 created
The annotated tag, release-3-5-0 has been created at cabfd3ee2c62f7cd00f9a5f268741d4ca0a1 (tag) tagging d82b72a5a5d7c1585a39f3a9530ff8861bfda45a (commit) replaces release-3-5-0rc3 tagged by Karolin Seeger on Mon Mar 1 13:05:33 2010 +0100 - Log - tag release-3-5-0 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.12 (GNU/Linux) iD8DBQBLi62ZbzORW2Vot+oRAhICAKCveUQ+pN11PZCZS6ky4aBeFvH9PACeOrq7 tx+akdH9n3klh2pSOvtQCBs= =JR2v -END PGP SIGNATURE- Günther Deschner (2): s3-rpcclient: fix uninitialized variable in wkssvc_enumerateusers. s3-net: fix net ads dns usage calls. Karolin Seeger (3): VERSION: Raise version number up to 3.5.0. WHATSNEW: Prepare release notes for Samba 3.5.0. WHATSNEW: Update changes since 3.5.0rc3. Stefan Metzmacher (1): s3:cli_netlogon: keep the the correct negotiate_flags on the cli-dc structure Volker Lendecke (2): s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send s3: Fix but 7145 -- duplicate sam and unix accounts --- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b73437f... s4/rodc: Implement samdb_rodc with ldb context
via c65abcf... s4/libnet: Fix misleading comment
from 747a0b4... s3: Remove unused mypid from
count_current_connections() state
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b73437fbaa1003f4737e237569489f7b2ba99486
Author: Anatoliy Atanasov anatoliy.atana...@postpath.com
Date: Mon Mar 1 14:16:59 2010 +0200
s4/rodc: Implement samdb_rodc with ldb context
commit c65abcf9d31e346f43c537e18d209b0e4ce04e48
Author: Anatoliy Atanasov anatoliy.atana...@postpath.com
Date: Mon Mar 1 13:10:39 2010 +0200
s4/libnet: Fix misleading comment
---
Summary of changes:
source4/dsdb/common/util.c| 68 ++---
source4/dsdb/repl/drepl_out_helpers.c |2 +-
source4/libnet/libnet_become_dc.c |2 +-
source4/rpc_server/drsuapi/getncchanges.c |2 +-
4 files changed, 64 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index cc75f7f..faa96e6 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -2674,15 +2674,47 @@ int drsuapi_DsReplicaCursor_compare(const struct
drsuapi_DsReplicaCursor *c1,
/*
see if we are a RODC
-
- TODO: This should take a sam_ctx, and lookup the right object (with
- a cache)
*/
-bool samdb_rodc(struct loadparm_context *lp_ctx)
+bool samdb_rodc(struct ldb_context *sam_ctx)
{
- return lp_parm_bool(lp_ctx, NULL, repl, RODC, false);
-}
+ TALLOC_CTX *tmp_ctx;
+ const char *obj_category;
+ struct ldb_dn *obj_category_dn;
+ const struct ldb_val *obj_category_dn_rdn_val;
+
+ tmp_ctx = talloc_new(sam_ctx);
+ if (tmp_ctx == NULL) {
+ DEBUG(1,(samdb_rodc: Failed to talloc new context.\n));
+ goto failed;
+ }
+
+ obj_category = samdb_ntds_object_category(tmp_ctx, sam_ctx);
+ if (!obj_category) {
+ DEBUG(1,(samdb_rodc: Failed to get object category.\n));
+ goto failed;
+ }
+
+ obj_category_dn = ldb_dn_new(tmp_ctx, sam_ctx, obj_category);
+ if (!obj_category_dn) {
+ DEBUG(1,(samdb_rodc: Failed to create object category dn.\n));
+ goto failed;
+ }
+ obj_category_dn_rdn_val = ldb_dn_get_rdn_val(obj_category_dn);
+ if (!obj_category_dn_rdn_val) {
+ DEBUG(1, (samdb_rodc: Failed to get object category dn rdn
value.\n));
+ goto failed;
+ }
+
+ if (strequal((const char*)obj_category_dn_rdn_val-data,
NTDS-DSA-RO)) {
+ talloc_free(tmp_ctx);
+ return true;
+ }
+
+failed:
+ talloc_free(tmp_ctx);
+ return false;
+}
/*
return NTDS options flags. See MS-ADTS 7.1.1.2.2.1.2.1.1
@@ -2717,11 +2749,33 @@ int samdb_ntds_options(struct ldb_context *ldb,
uint32_t *options)
return LDB_SUCCESS;
failed:
- DEBUG(1,(Failed to find our own NTDS Settings objectGUID in the
ldb!\n));
+ DEBUG(1,(Failed to find our own NTDS Settings options in the ldb!\n));
talloc_free(tmp_ctx);
return LDB_ERR_NO_SUCH_OBJECT;
}
+const char* samdb_ntds_object_category(TALLOC_CTX *tmp_ctx, struct ldb_context
*ldb)
+{
+ const char *attrs[] = { objectCategory, NULL };
+ int ret;
+ struct ldb_result *res;
+
+ ret = ldb_search(ldb, tmp_ctx, res, samdb_ntds_settings_dn(ldb),
LDB_SCOPE_BASE, attrs, NULL);
+ if (ret) {
+ goto failed;
+ }
+
+ if (res-count != 1) {
+ goto failed;
+ }
+
+ return samdb_result_string(res-msgs[0], objectCategory, NULL);
+
+failed:
+ DEBUG(1,(Failed to find our own NTDS Settings objectCategory in the
ldb!\n));
+ return NULL;
+}
+
/*
* Function which generates a lDAPDisplayName attribute from a CN one.
* Algorithm implemented according to MS-ADTS 3.1.1.2.3.4
diff --git a/source4/dsdb/repl/drepl_out_helpers.c
b/source4/dsdb/repl/drepl_out_helpers.c
index 7b819ac..4226170 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -548,7 +548,7 @@ static void dreplsrv_update_refs_trigger(struct tevent_req
*req)
r-in.req.req1.dest_dsa_dns_name = ntds_dns_name;
r-in.req.req1.dest_dsa_guid = service-ntds_guid;
r-in.req.req1.options= DRSUAPI_DRS_ADD_REF |
DRSUAPI_DRS_DEL_REF;
- if (!samdb_rodc(service-task-lp_ctx)) {
+ if (!samdb_rodc(service-samdb)) {
r-in.req.req1.options |= DRSUAPI_DRS_WRIT_REP;
}
diff --git a/source4/libnet/libnet_become_dc.c
b/source4/libnet/libnet_become_dc.c
index 101896f..0852373 100644
--- a/source4/libnet/libnet_become_dc.c
+++
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f79ff95... selftest/gdb_backtrace: call info locals too
from b73437f... s4/rodc: Implement samdb_rodc with ldb context
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f79ff9582f3c5e1c1d756ef3b3dc0379fdb9912d
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 1 12:22:23 2010 +0100
selftest/gdb_backtrace: call info locals too
metze
---
Summary of changes:
selftest/gdb_backtrace |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/gdb_backtrace b/selftest/gdb_backtrace
index 826381e..1d8249b 100755
--- a/selftest/gdb_backtrace
+++ b/selftest/gdb_backtrace
@@ -79,6 +79,7 @@ EOF
cat EOF ${BATCHFILE_MAIN}
set height 1000
bt full
+info locals
quit
EOF
${DB_BIN} -x ${BATCHFILE_MAIN} ${BINARY} ${PID}
--
Samba Shared Repository
svn commit: samba-web r1405 - in trunk: . devel history
Author: kseeger Date: 2010-03-01 05:51:20 -0700 (Mon, 01 Mar 2010) New Revision: 1405 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1405 Log: Announce Samba 3.5.0 Karolin Added: trunk/history/samba-3.5.0.html Modified: trunk/devel/index.html trunk/header_columns.html trunk/history/header_history.html trunk/index.html Changeset: Sorry, the patch is too large (599 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1405
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c571ecd... s3: Make connections_forall open connections.tdb r/w
from f79ff95... selftest/gdb_backtrace: call info locals too
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c571ecdfc4eae8aa4bfffefacb9eb9306cbc6389
Author: Volker Lendecke v...@samba.org
Date: Mon Mar 1 13:57:36 2010 +0100
s3: Make connections_forall open connections.tdb r/w
connections_forall is called from count_current_connections() which
potentially
deletes dead records. This needs r/w access to connections.tdb.
connections_traverse says it does not provide this. Does not really matter
in
the smbd case, because we have opened it before r/w, so this is just
cleanup.
---
Summary of changes:
source3/lib/conn_tdb.c |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index a10734b..90e455a 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -112,12 +112,18 @@ int connections_forall(int (*fn)(struct db_record *rec,
void *private_data),
void *private_data)
{
+ struct db_context *ctx;
struct conn_traverse_state state;
+ ctx = connections_db_ctx(true);
+ if (ctx == NULL) {
+ return -1;
+ }
+
state.fn = fn;
state.private_data = private_data;
- return connections_traverse(conn_traverse_fn, (void *)state);
+ return ctx-traverse(ctx, conn_traverse_fn, (void *)state);
}
bool connections_init(bool rw)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3deba63... s3: Make the difference between r/o and r/w in
connections_db_ctx more obvious
from c571ecd... s3: Make connections_forall open connections.tdb r/w
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3deba6349ca751d669e2af817ec7e2c7eb6195b3
Author: Volker Lendecke v...@samba.org
Date: Thu Feb 25 16:31:12 2010 +0100
s3: Make the difference between r/o and r/w in connections_db_ctx more
obvious
---
Summary of changes:
source3/lib/conn_tdb.c | 13 -
1 files changed, 4 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index 90e455a..e95ada4 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -22,21 +22,16 @@
static struct db_context *connections_db_ctx(bool rw)
{
static struct db_context *db_ctx;
+ int open_flags;
if (db_ctx != NULL) {
return db_ctx;
}
- if (rw) {
- db_ctx = db_open(NULL, lock_path(connections.tdb), 0,
-TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
-O_RDWR | O_CREAT, 0644);
- }
- else {
- db_ctx = db_open(NULL, lock_path(connections.tdb), 0,
-TDB_CLEAR_IF_FIRST|TDB_DEFAULT, O_RDONLY, 0);
- }
+ open_flags = rw ? (O_RDWR|O_CREAT) : O_RDONLY;
+ db_ctx = db_open(NULL, lock_path(connections.tdb), 0,
+TDB_CLEAR_IF_FIRST|TDB_DEFAULT, open_flags, 0644);
return db_ctx;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8bebb38... s3: Add connections_forall_read()
from 3deba63... s3: Make the difference between r/o and r/w in
connections_db_ctx more obvious
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8bebb380e8b581b41f3057c128d73094c1bde332
Author: Volker Lendecke v...@samba.org
Date: Mon Mar 1 14:28:22 2010 +0100
s3: Add connections_forall_read()
In a cluster, this makes a large difference: For r/w traverse, we have to
do a
fetch_locked on every record which for most users of connections_forall is
just
overkill.
---
Summary of changes:
source3/include/proto.h|4
source3/lib/conn_tdb.c | 42 ++
source3/smbd/sesssetup.c |5 ++---
source3/utils/net_status.c |5 ++---
source3/utils/smbcontrol.c |5 ++---
source3/utils/status.c |5 ++---
source3/web/statuspage.c | 15 ++-
7 files changed, 60 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 18e60ca..39aca5f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -431,6 +431,10 @@ int connections_forall(int (*fn)(struct db_record *rec,
const struct connections_data *data,
void *private_data),
void *private_data);
+int connections_forall_read(int (*fn)(const struct connections_key *key,
+ const struct connections_data *data,
+ void *private_data),
+ void *private_data);
bool connections_init(bool rw);
/* The following definitions come from lib/dbwrap_util.c */
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index e95ada4..0770f66 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -121,6 +121,48 @@ int connections_forall(int (*fn)(struct db_record *rec,
return ctx-traverse(ctx, conn_traverse_fn, (void *)state);
}
+struct conn_traverse_read_state {
+ int (*fn)(const struct connections_key *key,
+ const struct connections_data *data,
+ void *private_data);
+ void *private_data;
+};
+
+static int connections_forall_read_fn(struct db_record *rec,
+ void *private_data)
+{
+ struct conn_traverse_read_state *state =
+ (struct conn_traverse_read_state *)private_data;
+
+ if ((rec-key.dsize != sizeof(struct connections_key))
+ || (rec-value.dsize != sizeof(struct connections_data))) {
+ return 0;
+ }
+ return state-fn((const struct connections_key *)rec-key.dptr,
+(const struct connections_data *)rec-value.dptr,
+state-private_data);
+}
+
+int connections_forall_read(int (*fn)(const struct connections_key *key,
+ const struct connections_data *data,
+ void *private_data),
+ void *private_data)
+{
+ struct db_context *ctx;
+ struct conn_traverse_read_state state;
+
+ ctx = connections_db_ctx(false);
+ if (ctx == NULL) {
+ return -1;
+ }
+
+ state.fn = fn;
+ state.private_data = private_data;
+
+ return ctx-traverse_read(ctx, connections_forall_read_fn,
+ (void *)state);
+}
+
bool connections_init(bool rw)
{
return (connections_db_ctx(rw) != NULL);
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 289055c..cad2dd3 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -1356,8 +1356,7 @@ static void reply_sesssetup_and_X_spnego(struct
smb_request *req)
a new session setup with VC==0 is ignored.
/
-static int shutdown_other_smbds(struct db_record *rec,
- const struct connections_key *key,
+static int shutdown_other_smbds(const struct connections_key *key,
const struct connections_data *crec,
void *private_data)
{
@@ -1394,7 +1393,7 @@ static void setup_new_vc_session(void)
invalidate_all_vuids();
#endif
if (lp_reset_on_zero_vc()) {
- connections_forall(shutdown_other_smbds,
+ connections_forall_read(shutdown_other_smbds,
CONST_DISCARD(void *,
client_addr(get_client_fd(),addr,sizeof(addr;
}
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index ce7dbca..47860cb 100644
--- a/source3/utils/net_status.c
+++
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 0410c8b... VERSION: Raise version number up to 3.5.1. from 5fcab19... WHATSNEW: Update changes since 3.5.0rc3. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 0410c8bca22c61318bf71c845fca523614bef73a Author: Karolin Seeger ksee...@samba.org Date: Mon Mar 1 15:03:03 2010 +0100 VERSION: Raise version number up to 3.5.1. Karolin --- Summary of changes: source3/VERSION |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/VERSION b/source3/VERSION index dbf57df..b737b32 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=5 -SAMBA_VERSION_RELEASE=0 +SAMBA_VERSION_RELEASE=1 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1a64d3c... s4-smbtorture: add stricter SetPrinterDataEx tests to
spoolss tests.
via 4f6634e... s4-smbtorture: add test_SetPrinterDataEx to
RPC-SPOOLSS-PRINTER.
via 74c7c1c... s4-smbtorture: return needed size pointer from
test_GetPrinterDataEx.
via e76b8a0... s4-smbtorture: test at least three different regtypes in
test_SetPrinterDataEx.
from 8bebb38... s3: Add connections_forall_read()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1a64d3cbc65b70df1f1b3f473cdbfdce5c8f2ae9
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 14:35:59 2010 +0100
s4-smbtorture: add stricter SetPrinterDataEx tests to spoolss tests.
Guenther
commit 4f6634e56dde97552fec69c99cbf63f80609f9f4
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 14:27:43 2010 +0100
s4-smbtorture: add test_SetPrinterDataEx to RPC-SPOOLSS-PRINTER.
Guenther
commit 74c7c1cc7fcaed83a86ef0708c0faf4735bc5737
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 14:26:30 2010 +0100
s4-smbtorture: return needed size pointer from test_GetPrinterDataEx.
Guenther
commit e76b8a07002dc3d01d5f4624c8cae25e75020099
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 12:53:11 2010 +0100
s4-smbtorture: test at least three different regtypes in
test_SetPrinterDataEx.
Guenther
---
Summary of changes:
source4/torture/rpc/spoolss.c | 132 +
1 files changed, 108 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index b76ae6f..2b4d948 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -30,6 +30,7 @@
#include libcli/security/security.h
#include torture/rpc/rpc.h
#include param/param.h
+#include lib/registry/registry.h
#define TORTURE_WELLKNOWN_PRINTER torture_wkn_printer
#define TORTURE_PRINTERtorture_printer
@@ -2893,7 +2894,8 @@ static bool test_GetPrinterDataEx(struct torture_context
*tctx,
const char *key_name,
const char *value_name,
enum winreg_Type *type_p,
- union spoolss_PrinterData *data_p)
+ union spoolss_PrinterData *data_p,
+ uint32_t *needed_p)
{
NTSTATUS status;
struct spoolss_GetPrinterDataEx r;
@@ -2940,6 +2942,10 @@ static bool test_GetPrinterDataEx(struct torture_context
*tctx,
*data_p = data;
}
+ if (needed_p) {
+ *needed_p = needed;
+ }
+
return true;
}
@@ -2970,7 +2976,7 @@ static bool test_GetPrinterData_list(struct
torture_context *tctx,
torture_assert(tctx, test_GetPrinterData(tctx, p, handle,
list[i], type, data),
talloc_asprintf(tctx, GetPrinterData failed on %s\n,
list[i]));
- torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle,
random_string, list[i], type_ex, data_ex),
+ torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle,
random_string, list[i], type_ex, data_ex, NULL),
talloc_asprintf(tctx, GetPrinterDataEx failed on
%s\n, list[i]));
torture_assert_int_equal(tctx, type, type_ex, type mismatch);
switch (type) {
@@ -3041,7 +3047,7 @@ static bool test_EnumPrinterData(struct torture_context
*tctx, struct dcerpc_pip
torture_assert(tctx, test_GetPrinterData(tctx, p, handle,
r.out.value_name, NULL, NULL),
talloc_asprintf(tctx, failed to call GetPrinterData
for %s\n, r.out.value_name));
- torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle,
PrinterDriverData, r.out.value_name, NULL, NULL),
+ torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle,
PrinterDriverData, r.out.value_name, NULL, NULL, NULL),
talloc_asprintf(tctx, failed to call GetPrinterDataEx
on PrinterDriverData for %s\n, r.out.value_name));
r.in.enum_index++;
@@ -3222,10 +3228,38 @@ static bool test_EnumPrinterKey(struct torture_context
*tctx,
static bool test_SetPrinterDataEx(struct torture_context *tctx,
struct dcerpc_pipe *p,
- struct policy_handle *handle)
+ struct policy_handle *handle,
+ const char *key_name,
+ const char *value_name,
+ enum winreg_Type type,
+ union spoolss_PrinterData
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 719cecb... s4:RPC-NETLOGON: remove useless rpc callback via 22b1e0b... s4:RPC-ECHO: don't look at the internals of 'struct rpc_request' via 56b9700... s4:libnet_become_dc: don't look at the internals of 'struct rpc_request' via 0547af2... s4:drepl_out_helpers: don't look at the internals of 'struct rpc_request' via 1955cde... s4:drepl_notify: don't look at the internals of 'struct rpc_request' via 8ba2128... s4:librpc/rpc: make use of explicit dcerpc_*_recv functions via c84b4b2... s4:torture/rpc: make use of explicit dcerpc_*_recv functions via 598cf9f... s4:winbind: make use of explicit dcerpc_*_recv functions via c4e72ad... s4:dsdb/repl: make use of explicit dcerpc_*_recv functions via f995e59... s4:libnet: make use of explicit dcerpc_*_recv functions via 5d33c6d... s4:libnet_become_dc: make use of explicit dcerpc_*_recv functions via 20980eb... pidl:NDR/Client.pm: generate explicit _recv functions from 1a64d3c... s4-smbtorture: add stricter SetPrinterDataEx tests to spoolss tests. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 719cecba848b3e446ea3bc06f14cf90e9cddab9e Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:02:40 2010 +0100 s4:RPC-NETLOGON: remove useless rpc callback If we got a failure from one request we bail out early. metze commit 22b1e0bf324113db12e40567cc1cb9d645049681 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:01:50 2010 +0100 s4:RPC-ECHO: don't look at the internals of 'struct rpc_request' metze commit 56b97000bd7842d3b861656880b68ad333594d71 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:00:42 2010 +0100 s4:libnet_become_dc: don't look at the internals of 'struct rpc_request' metze commit 0547af244a46e5647eb7dfc9b4a92924d15ab15d Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 09:46:30 2010 +0100 s4:drepl_out_helpers: don't look at the internals of 'struct rpc_request' metze commit 1955cde46c33409da85617dfe058a9a965e4b4f7 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 09:43:21 2010 +0100 s4:drepl_notify: don't look at the internals of 'struct rpc_request' metze commit 8ba2128e1e4b242bba582b4c8b419c3dc5cd4016 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:59:14 2010 +0100 s4:librpc/rpc: make use of explicit dcerpc_*_recv functions metze commit c84b4b23c8b7f7c32ce0a17b5dfb526dbda66f6a Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:59:14 2010 +0100 s4:torture/rpc: make use of explicit dcerpc_*_recv functions metze commit 598cf9f5097aafac95c9e9b420b849ad6090c30e Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:59:14 2010 +0100 s4:winbind: make use of explicit dcerpc_*_recv functions metze commit c4e72add67c05ce502e448a49094a3e3006d6384 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:59:14 2010 +0100 s4:dsdb/repl: make use of explicit dcerpc_*_recv functions metze commit f995e596bbc0e1b44335b10bf23458ac7328188b Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:59:14 2010 +0100 s4:libnet: make use of explicit dcerpc_*_recv functions metze commit 5d33c6d4f9719e36a3ed0f6b54c4365324ff352c Author: Stefan Metzmacher me...@samba.org Date: Mon Mar 1 13:56:01 2010 +0100 s4:libnet_become_dc: make use of explicit dcerpc_*_recv functions metze commit 20980eb7870cf3478d9e8e78fb412c5bd299cca5 Author: Stefan Metzmacher me...@samba.org Date: Sat Feb 27 10:34:04 2010 +0100 pidl:NDR/Client.pm: generate explicit _recv functions metze --- Summary of changes: pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 32 + source4/dsdb/repl/drepl_notify.c | 12 +++- source4/dsdb/repl/drepl_out_helpers.c| 21 +-- source4/libnet/groupinfo.c |8 +- source4/libnet/groupman.c|8 +- source4/libnet/libnet_become_dc.c| 108 - source4/libnet/libnet_domain.c | 20 +++--- source4/libnet/libnet_group.c|5 +- source4/libnet/libnet_lookup.c |2 +- source4/libnet/libnet_rpc.c |6 +- source4/libnet/libnet_unbecome_dc.c |4 +- source4/libnet/libnet_user.c |4 +- source4/libnet/userinfo.c|8 +- source4/libnet/userman.c | 16 ++-- source4/librpc/rpc/dcerpc_schannel.c |4 +- source4/librpc/rpc/dcerpc_util.c |2 +- source4/torture/rpc/echo.c | 24 +-- source4/torture/rpc/lsa.c|2 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 24d52dc... Fix the build, add filtered subunit runner. via 4e4e341... Add testrepository configuration. via 86e2b25... More formatting fixes, pointed out by pylint. from 719cecb... s4:RPC-NETLOGON: remove useless rpc callback http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 24d52dc362210328e16545830835361ac82432c4 Author: Jelmer Vernooij jel...@samba.org Date: Mon Mar 1 16:24:29 2010 +0100 Fix the build, add filtered subunit runner. commit 4e4e341c68473d92516a3e3c612153a792017bb9 Author: Jelmer Vernooij jel...@samba.org Date: Mon Mar 1 14:42:38 2010 +0100 Add testrepository configuration. commit 86e2b251861055d770327639808fddc84cdb0b56 Author: Jelmer Vernooij jel...@samba.org Date: Mon Mar 1 05:04:23 2010 +0100 More formatting fixes, pointed out by pylint. --- Summary of changes: .gitignore |1 + source4/.testr.conf|3 + source4/scripting/python/samba/__init__.py | 52 +++ source4/scripting/python/samba/misc.py | 12 ++-- source4/scripting/python/samba/ntacls.py | 10 ++-- source4/scripting/python/samba/provision.py|6 +- source4/scripting/python/samba/provisionbackend.py | 11 ++-- source4/scripting/python/samba/samdb.py|2 +- source4/scripting/python/samba/tests/provision.py |1 + source4/scripting/python/samba/upgradehelpers.py |1 - source4/selftest/config.mk |4 ++ 11 files changed, 59 insertions(+), 44 deletions(-) create mode 100644 source4/.testr.conf Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index b40c794..7f1a9be 100644 --- a/.gitignore +++ b/.gitignore @@ -412,3 +412,4 @@ docs-xml/Samba3-HOWTO/images/idmap-uid2sid.png docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png docs-xml/Samba3-HOWTO/images/pdftosocket.png docs-xml/Samba3-HOWTO/images/trusts1.png +source4/.testrepository diff --git a/source4/.testr.conf b/source4/.testr.conf new file mode 100644 index 000..0ddb369 --- /dev/null +++ b/source4/.testr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_command=make test-subunit-filtered TESTS=$IDLIST +test_id_list_default= diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 776c274..9cc224b 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -145,17 +145,20 @@ class Ldb(ldb.Ldb): try: res = self.search(base=dn, scope=ldb.SCOPE_SUBTREE, attrs=[], expression=(|(objectclass=user)(objectclass=computer))) -except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _): -# Ignore no such object errors -return -pass +except ldb.LdbError, (errno, _): +if errno == ldb.ERR_NO_SUCH_OBJECT: +# Ignore no such object errors +return +else: +raise try: for msg in res: self.delete(msg.dn) -except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _): -# Ignore no such object errors -return +except ldb.LdbError, (errno, _): +if errno != ldb.ERR_NO_SUCH_OBJECT: +# Ignore no such object errors +raise def erase_except_schema_controlled(self): Erase this ldb, removing all records, except those that are controlled by Samba4's schema. @@ -171,9 +174,10 @@ class Ldb(ldb.Ldb): [], controls=[show_deleted:0]): try: self.delete(msg.dn) -except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _): -# Ignore no such object errors -pass +except ldb.LdbError, (errno, _): +if errno != ldb.ERR_NO_SUCH_OBJECT: +# Ignore no such object errors +raise res = self.search(basedn, ldb.SCOPE_SUBTREE, ((|(objectclass=*)(distinguishedName=*))(!(distinguishedna...@baseinfo))), @@ -185,9 +189,10 @@ class Ldb(ldb.Ldb): @OPTIONS, @PARTITION, @KLUDGEACL]: try: self.delete(attr) -except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _): -# Ignore missing dn errors -pass +except ldb.LdbError, (errno, _): +if errno != ldb.ERR_NO_SUCH_OBJECT: +# Ignore missing dn errors +raise def erase(self): Erase this ldb, removing all records. @@ -198,9 +203,10 @@ class Ldb(ldb.Ldb): for attr in [@INDEXLIST, @ATTRIBUTES]:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c103fbc... s4:LDB - cosmetic fix for a for loop
from 24d52dc... Fix the build, add filtered subunit runner.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c103fbc919d0f5df24fbfefd5153683ab938b779
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Mon Mar 1 16:48:03 2010 +0100
s4:LDB - cosmetic fix for a for loop
---
Summary of changes:
source4/lib/ldb/common/ldb_dn.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 04e769f..eb7d122 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -1718,7 +1718,7 @@ static char *ldb_dn_canonical(void *mem_ctx, struct
ldb_dn *dn, int ex_format) {
tmpctx = talloc_new(mem_ctx);
/* Walk backwards down the DN, grabbing 'dc' components at first */
- for (i = dn-comp_num - 1 ; i = 0; i--) {
+ for (i = dn-comp_num - 1; i = 0; i--) {
if (ldb_attr_cmp(dn-components[i].name, dc) != 0) {
break;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d6a6872... s3: Abstract access to sessionid.tdb, similar to
conn_tdb.c
from c103fbc... s4:LDB - cosmetic fix for a for loop
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d6a687250625b62242efc8be0aa50ffc448a503a
Author: Volker Lendecke v...@samba.org
Date: Mon Mar 1 16:18:23 2010 +0100
s3: Abstract access to sessionid.tdb, similar to conn_tdb.c
---
Summary of changes:
source3/Makefile.in |1 +
source3/include/proto.h | 13
source3/lib/sessionid_tdb.c | 138 +++
source3/smbd/globals.c |2 -
source3/smbd/globals.h |2 -
source3/smbd/server.c |3 +-
source3/smbd/session.c | 83 +-
source3/utils/net_status.c | 63 +--
source3/utils/status.c | 50 ++--
9 files changed, 206 insertions(+), 149 deletions(-)
create mode 100644 source3/lib/sessionid_tdb.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6e40f83..323da3c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -406,6 +406,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
libsmb/clisigning.o libsmb/smb_signing.o \
lib/iconv.o lib/pam_errors.o intl/lang_tdb.o \
lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
+ lib/sessionid_tdb.o \
lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
lib/ldap_escape.o @CHARSET_STATIC@ \
lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 39aca5f..93156f8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7007,6 +7007,19 @@ bool session_claim(user_struct *vuser);
void session_yield(user_struct *vuser);
int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list);
+/* The following definitions come from lib/sessionid_tdb.c */
+
+bool sessionid_init(void);
+struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key);
+int sessionid_traverse(int (*fn)(struct db_record *rec, const char *key,
+struct sessionid *session,
+void *private_data),
+ void *private_data);
+int sessionid_traverse_read(int (*fn)(const char *key,
+ struct sessionid *session,
+ void *private_data),
+ void *private_data);
+
/* The following definitions come from smbd/sesssetup.c */
NTSTATUS parse_spnego_mechanisms(DATA_BLOB blob_in,
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
new file mode 100644
index 000..6efbafd
--- /dev/null
+++ b/source3/lib/sessionid_tdb.c
@@ -0,0 +1,138 @@
+/*
+ Unix SMB/CIFS implementation.
+ Low-level sessionid.tdb access functions
+ Copyright (C) Volker Lendecke 2010
+
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+
+static struct db_context *session_db_ctx(void)
+{
+ static struct db_context *session_db_ctx_ptr;
+
+ if (session_db_ctx_ptr != NULL) {
+ return session_db_ctx_ptr;
+ }
+
+ session_db_ctx_ptr = db_open(NULL, lock_path(sessionid.tdb), 0,
+TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
+O_RDWR | O_CREAT, 0644);
+ return session_db_ctx_ptr;
+}
+
+bool sessionid_init(void)
+{
+ if (session_db_ctx() == NULL) {
+ DEBUG(1,(session_init: failed to open sessionid tdb\n));
+ return False;
+ }
+
+ return True;
+}
+
+struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key)
+{
+ struct db_context *db;
+
+ db = session_db_ctx();
+ if (db == NULL) {
+ return NULL;
+ }
+ return db-fetch_locked(db, mem_ctx, string_term_tdb_data(key));
+}
+
+struct sessionid_traverse_state {
+ int (*fn)(struct db_record *rec, const char *key,
+ struct sessionid *session, void *private_data);
+ void *private_data;
+};
+
+static int
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 522e4f3... s4:RPC-ECHO: don't ignore errors in the Sleep test now
that we support async rpc over ncacn_np
via 340bcf6... s4:rpc_server/remote: do async calls
via ff17d8a... s4:srvsvc RPC - make this one signed-safe
via b963741... s4:unixinfo RPC - make this one signed-safe
via 932a986... s4:spoolss RPC - make this one signed-safe
via 246742b... s4:remote RPC - make this one signed-safe
via c953b26... s4:epmapper RPC - make this one signed-safe
from d6a6872... s3: Abstract access to sessionid.tdb, similar to
conn_tdb.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 522e4f3d2bcd260f7037fbafd4340a9a4513c89d
Author: Stefan Metzmacher me...@samba.org
Date: Sat Feb 27 10:16:56 2010 +0100
s4:RPC-ECHO: don't ignore errors in the Sleep test now that we support
async rpc over ncacn_np
metze
commit 340bcf646baf0a01ca55f66e787d1d49ddea6086
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 1 15:20:19 2010 +0100
s4:rpc_server/remote: do async calls
metze
commit ff17d8ab1ee809e1c464b9c8cb088f2e8fbf3cb3
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Nov 21 19:08:42 2009 +0100
s4:srvsvc RPC - make this one signed-safe
commit b963741aae82b721655e36e8c62b678acff2e210
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Nov 21 19:03:59 2009 +0100
s4:unixinfo RPC - make this one signed-safe
commit 932a986a4f3122555654d36d838996a90b1e69a7
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Nov 21 19:03:18 2009 +0100
s4:spoolss RPC - make this one signed-safe
commit 246742b30eb90da4d2c314e7b60bfc62ef0275ec
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Nov 21 19:01:53 2009 +0100
s4:remote RPC - make this one signed-safe
commit c953b262419b8f67a7976b1f82d14e76893a7ec2
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Nov 21 18:59:30 2009 +0100
s4:epmapper RPC - make this one signed-safe
---
Summary of changes:
source4/rpc_server/epmapper/rpc_epmapper.c|4 +-
source4/rpc_server/remote/dcesrv_remote.c | 52 +
source4/rpc_server/spoolss/dcesrv_spoolss.c |2 +-
source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 39 +-
source4/rpc_server/unixinfo/dcesrv_unixinfo.c |2 +-
source4/torture/rpc/echo.c|6 +-
6 files changed, 71 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c
b/source4/rpc_server/epmapper/rpc_epmapper.c
index ade8b69..87bfee6 100644
--- a/source4/rpc_server/epmapper/rpc_epmapper.c
+++ b/source4/rpc_server/epmapper/rpc_epmapper.c
@@ -103,7 +103,7 @@ static error_status_t dcesrv_epm_Lookup(struct
dcesrv_call_state *dce_call, TALL
struct dcesrv_ep_iface *e;
} *eps;
uint32_t num_ents;
- int i;
+ unsigned int i;
DCESRV_PULL_HANDLE_FAULT(h, r-in.entry_handle, HTYPE_LOOKUP);
@@ -168,7 +168,7 @@ static error_status_t dcesrv_epm_Map(struct
dcesrv_call_state *dce_call, TALLOC_
struct epm_Map *r)
{
uint32_t count;
- int i;
+ unsigned int i;
struct dcesrv_ep_iface *eps;
struct epm_floor *floors;
enum dcerpc_transport_t transport;
diff --git a/source4/rpc_server/remote/dcesrv_remote.c
b/source4/rpc_server/remote/dcesrv_remote.c
index 45944bc..0521603 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -186,6 +186,8 @@ static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state
*dce_call, TALLOC_CT
return NT_STATUS_OK;
}
+static void remote_op_dispatch_done(struct rpc_request *rreq);
+
static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx, void *r)
{
struct dcesrv_remote_private *priv = dce_call-context-private_data;
@@ -193,6 +195,7 @@ static NTSTATUS remote_op_dispatch(struct dcesrv_call_state
*dce_call, TALLOC_CT
const struct ndr_interface_table *table =
dce_call-context-iface-private_data;
const struct ndr_interface_call *call;
const char *name;
+ struct rpc_request *rreq;
name = table-calls[opnum].name;
call = table-calls[opnum];
@@ -204,20 +207,53 @@ static NTSTATUS remote_op_dispatch(struct
dcesrv_call_state *dce_call, TALLOC_CT
priv-c_pipe-conn-flags |= DCERPC_NDR_REF_ALLOC;
/* we didn't use the return code of this function as we only check the
last_fault_code */
- dcerpc_ndr_request(priv-c_pipe, NULL, table, opnum, mem_ctx,r);
+ rreq = dcerpc_ndr_request_send(priv-c_pipe, NULL, table, opnum, true,
mem_ctx, r);
+ if
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via cf12d45... testprogs: better usage text.
via 36d3aa6... testprogs: add very basic PrinterData test for printers.
via 0d0d778... testprogs: rename test_PrinterData to
test_PrinterData_Server.
via d44dd10... testprogs: add SetPrinterDataEx test.
via b797481... testprogs: add DeletePrinterKey test.
via 1b6f1e8... testprogs: add DeletePrinterDataEx test.
via 61568cf... testprogs: allow to test a single printer when given on
the cmdline.
via 32371e9... testprogs: add RPC_X_NULL_REF_POINTER error code
from 522e4f3... s4:RPC-ECHO: don't ignore errors in the Sleep test now
that we support async rpc over ncacn_np
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cf12d4556a12edb032eaef51a60bfc815f38be61
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 21:12:49 2010 +0100
testprogs: better usage text.
Guenther
commit 36d3aa69f1a090ac4054f06883a2fae85070f202
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 21:00:20 2010 +0100
testprogs: add very basic PrinterData test for printers.
This very basically tests SetPrinterDataEx, GetPrinterDataEx and
DeletePrinterDataEx.
Guenther
commit 0d0d778b212a5409a2632745c842b4270341c8b8
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 20:58:41 2010 +0100
testprogs: rename test_PrinterData to test_PrinterData_Server.
Guenther
commit d44dd1005bad8e95ea3c35376488083ebe9261d7
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 20:57:52 2010 +0100
testprogs: add SetPrinterDataEx test.
Guenther
commit b797481b8dd99a6e67c69ea5ce4b1c6739c45666
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 20:56:36 2010 +0100
testprogs: add DeletePrinterKey test.
Guenther
commit 1b6f1e8c30808c50485b8fecf47e12b45a3ac31f
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 17:42:19 2010 +0100
testprogs: add DeletePrinterDataEx test.
Guenther
commit 61568cf4c8f12148390435cba7845acf0b00e941
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 20:15:51 2010 +0100
testprogs: allow to test a single printer when given on the cmdline.
commit 32371e9ba6b93e6a235054a2db7a34838443e86c
Author: Günther Deschner g...@samba.org
Date: Mon Mar 1 18:01:42 2010 +0100
testprogs: add RPC_X_NULL_REF_POINTER error code
---
Summary of changes:
testprogs/win32/spoolss/error.c |2 +
testprogs/win32/spoolss/spoolss.c | 142 +++--
2 files changed, 138 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testprogs/win32/spoolss/error.c b/testprogs/win32/spoolss/error.c
index 2665856..a74312a 100644
--- a/testprogs/win32/spoolss/error.c
+++ b/testprogs/win32/spoolss/error.c
@@ -115,6 +115,8 @@ const char *errstr(DWORD error)
return ERROR_CANCELLED;
case ERROR_NOACCESS:
return ERROR_NOACCESS;
+ case RPC_X_NULL_REF_POINTER:
+ return RPC_X_NULL_REF_POINTER;
case RPC_S_PROCNUM_OUT_OF_RANGE:
return RPC_S_PROCNUM_OUT_OF_RANGE;
case RPC_S_SERVER_UNAVAILABLE:
diff --git a/testprogs/win32/spoolss/spoolss.c
b/testprogs/win32/spoolss/spoolss.c
index 38eb7ed..acdbb13 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/spoolss.c
@@ -984,6 +984,7 @@ static BOOL test_OnePrinter(struct torture_context *tctx,
ret = test_EnumPrinterKey(tctx, printername, handle,
PrinterDriverData);
ret = test_EnumPrinterDataEx(tctx, printername, PrinterDriverData,
handle, NULL, NULL);
ret = test_DeviceModes(tctx, printername, handle);
+ ret = test_PrinterData(tctx, printername, handle);
ret = test_ClosePrinter(tctx, handle);
return ret;
@@ -1243,9 +1244,83 @@ static BOOL test_GetPrinterDataEx(struct torture_context
*tctx,
/
/
-static BOOL test_PrinterData(struct torture_context *tctx,
-LPSTR servername,
-HANDLE handle)
+static BOOL test_DeletePrinterDataEx(struct torture_context *tctx,
+LPSTR servername,
+LPSTR keyname,
+LPSTR valuename,
+HANDLE handle)
+{
+ DWORD err = 0;
+ char tmp[1024];
+
+ torture_comment(tctx, Testing DeletePrinterDataEx(%s - %s), keyname,
valuename);
+
+ err = DeletePrinterDataEx(handle, keyname, valuename);
+ if (err) {
+ sprintf(tmp, DeletePrinterDataEx(%s - %s) failed on [%s],
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 05bd8c1... s4:srvsvc RPC - revert one unsigned integer i back to signed from cf12d45... testprogs: better usage text. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 05bd8c17be83057b9bcfe405fb29d27a794b9b40 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Mon Mar 1 21:11:39 2010 +0100 s4:srvsvc RPC - revert one unsigned integer i back to signed This is needed since this particular i counts until count which itself is signed. count is set through a signed integer variable parameter from the share_list_all call. --- Summary of changes: source4/rpc_server/srvsvc/dcesrv_srvsvc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c index 90edadb..d1e3f53 100644 --- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c +++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c @@ -1384,7 +1384,7 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA char *device; const char **names; int count; - unsigned int i; + int i; *r-out.type = 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via be026a6... s3:groupmap revert to tdb storage
from 05bd8c1... s4:srvsvc RPC - revert one unsigned integer i back to
signed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit be026a6fd89b44ba7e6bdf5bef049959b242c61e
Author: Simo Sorce i...@samba.org
Date: Fri Feb 26 15:16:23 2010 -0500
s3:groupmap revert to tdb storage
Group mapping needs to be cluster aware, and this means using the tdb
backend.
Remove ldb group mapping as this is not cluster aware.
---
Summary of changes:
source3/Makefile.in |2 +-
source3/groupdb/mapping.c | 20 +--
source3/groupdb/mapping_ldb.c | 701 -
source3/groupdb/mapping_tdb.c | 279 -
4 files changed, 269 insertions(+), 733 deletions(-)
delete mode 100644 source3/groupdb/mapping_ldb.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 323da3c..325984c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -680,7 +680,7 @@ CP850_OBJ = modules/CP850.o
CP437_OBJ = modules/CP437.o
CHARSET_MACOSXFS_OBJ = modules/charset_macosxfs.o
-GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o groupdb/mapping_ldb.o
+GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o
PROFILE_OBJ = profile/profile.o
PROFILES_OBJ = utils/profiles.o \
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 579486b..b648c58 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -30,30 +30,12 @@ static const struct mapping_backend *backend;
*/
static bool init_group_mapping(void)
{
- const char *backend_string;
-
if (backend != NULL) {
/* already initialised */
return True;
}
- /*
-* default to using the ldb backend. This parameter should
-* disappear in future versions of Samba3.
-*
-* But it's needed for cluster setups, because it's
-* not yet possible to distribute a ldb inside a cluster.
-*/
- backend_string = lp_parm_const_string(-1, groupdb, backend, ldb);
-
- if (strcmp(backend_string, ldb) == 0) {
- backend = groupdb_ldb_init();
- } else if (strcmp(backend_string, tdb) == 0) {
- backend = groupdb_tdb_init();
- } else {
- DEBUG(0,(Unknown groupdb backend '%s'\n, backend_string));
- smb_panic(Unknown groupdb backend);
- }
+backend = groupdb_tdb_init();
return backend != NULL;
}
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
deleted file mode 100644
index 89966e1..000
--- a/source3/groupdb/mapping_ldb.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- *
- * group mapping code on top of ldb
- *
- * Copyright (C) Andrew Tridgell 2006
- *
- * based on tdb group mapping code from groupdb/mapping.c
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see http://www.gnu.org/licenses/.
- */
-
-#include includes.h
-#include groupdb/mapping.h
-#include lib/ldb/include/ldb.h
-#include lib/ldb/include/ldb_errors.h
-
-static struct ldb_context *ldb;
-
-static bool mapping_upgrade(const char *tdb_path);
-
-/*
- connect to the group mapping ldb
-*/
-static bool init_group_mapping(void)
-{
- bool existed;
- const char *init_ldif[] =
- { dn: @ATTRIBUTES\n \
- ntName: CASE_INSENSITIVE\n \
- \n,
- dn: @INDEXLIST\n \
- @IDXATTR: gidNumber\n \
- @IDXATTR: ntName\n \
- @IDXATTR: member\n };
- const char *db_path, *tdb_path;
- int ret;
- int flags = 0;
-
- if (ldb != NULL) {
- return True;
- }
-
- /* this is needed as Samba3 doesn't have this globally yet */
- ldb_global_init();
-
- db_path = state_path(group_mapping.ldb);
-
- ldb = ldb_init(NULL, NULL);
- if (ldb == NULL) goto failed;
-
- /* Ensure this db is created read/write for root only. */
- ldb_set_create_perms(ldb, 0600);
-
- existed = file_exist(db_path);
-
- if (lp_parm_bool(-1,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c54699f... s4:provision - Moved default FDS SASL mappings deletion
from post_setup() to init().
via 7ad931d... s4:provision - Moved setup_db_config() into
OpenLDAPBackend class.
via fc6d9e7... s4:provision - Moved backend-specific variables into
backend class.
via 02533c9... s4:provision - Use netbios name for FDS instance name.
via 07669b0... s4-libcli: Added NULL handlers for
DSDB_CONTROL_DN_STORAGE_FORMAT_OID and LDB_CONTROL_AS_SYSTEM_OID
from be026a6... s3:groupmap revert to tdb storage
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c54699faf2796e1e8acbb2215fab835a6d86318e
Author: Endi S. Dewata edew...@redhat.com
Date: Fri Jan 29 16:05:22 2010 -0600
s4:provision - Moved default FDS SASL mappings deletion from post_setup()
to init().
Signed-off-by: Andrew Bartlett abart...@samba.org
commit 7ad931dda929e230b90d6ce3f35db7480321d6b0
Author: Endi S. Dewata edew...@redhat.com
Date: Fri Jan 29 03:24:20 2010 -0600
s4:provision - Moved setup_db_config() into OpenLDAPBackend class.
Signed-off-by: Andrew Bartlett abart...@samba.org
commit fc6d9e7b4f191ec7efea4c87fdeb461f8ed43bba
Author: Endi S. Dewata edew...@redhat.com
Date: Thu Jan 28 19:51:11 2010 -0600
s4:provision - Moved backend-specific variables into backend class.
Signed-off-by: Andrew Bartlett abart...@samba.org
commit 02533c9f1ba9434aabc92fac06995a858874c002
Author: Endi S. Dewata edew...@redhat.com
Date: Thu Jan 28 19:35:29 2010 -0600
s4:provision - Use netbios name for FDS instance name.
Signed-off-by: Andrew Bartlett abart...@samba.org
commit 07669b0704eac9db46e241e681c92b09ee5a4c2e
Author: Endi S. Dewata edew...@redhat.com
Date: Mon Jan 18 20:57:01 2010 -0600
s4-libcli: Added NULL handlers for DSDB_CONTROL_DN_STORAGE_FORMAT_OID and
LDB_CONTROL_AS_SYSTEM_OID
Signed-off-by: Andrew Bartlett abart...@samba.org
---
Summary of changes:
selftest/target/Samba4.pm | 21 ++--
source4/libcli/ldap/ldap_controls.c|4 +
source4/scripting/python/samba/provision.py| 33 +-
source4/scripting/python/samba/provisionbackend.py | 137 ++-
source4/setup/fedorads-sasl.ldif | 11 ++
source4/setup/fedorads.inf | 24 ++--
6 files changed, 114 insertions(+), 116 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9a808d3..7a65847 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -67,7 +67,7 @@ sub slapd_stop($$)
{
my ($self, $envvars) = @_;
if ($self-{ldap} eq fedora-ds) {
- system($envvars-{LDAPDIR}/slapd-samba4/stop-slapd);
+
system($envvars-{LDAPDIR}/slapd-$envvars-{LDAP_INSTANCE}/stop-slapd);
} elsif ($self-{ldap} eq openldap) {
open(IN, $envvars-{OPENLDAP_PIDFILE}) or
die(unable to open slapd pid file:
$envvars-{OPENLDAP_PIDFILE});
@@ -211,22 +211,22 @@ type: 0x3
sub mk_fedora_ds($$)
{
- my ($self, $ldapdir) = @_;
+ my ($self, $ctx) = @_;
#Make the subdirectory be as fedora DS would expect
- my $fedora_ds_dir = $ldapdir/slapd-samba4;
+ my $fedora_ds_dir = $ctx-{ldapdir}/slapd-$ctx-{ldap_instance};
- my $pidfile = $fedora_ds_dir/logs/slapd-samba4.pid;
+ my $pidfile = $fedora_ds_dir/logs/slapd-$ctx-{ldap_instance}.pid;
return ($fedora_ds_dir, $pidfile);
}
sub mk_openldap($$)
{
- my ($self, $ldapdir) = @_;
+ my ($self, $ctx) = @_;
- my $slapd_conf_d = $ldapdir/slapd.d;
- my $pidfile = $ldapdir/slapd.pid;
+ my $slapd_conf_d = $ctx-{ldapdir}/slapd.d;
+ my $pidfile = $ctx-{ldapdir}/slapd.pid;
return ($slapd_conf_d, $pidfile);
}
@@ -683,6 +683,7 @@ nogroup:x:65534:nobody
REALM = $ctx-{realm},
PASSWORD = $ctx-{password},
LDAPDIR = $ctx-{ldapdir},
+ LDAP_INSTANCE = $ctx-{ldap_instance},
WINBINDD_SOCKET_DIR = $ctx-{winbindd_socket_dir},
NCALRPCDIR = $ctx-{ncalrpcdir},
LOCKDIR = $ctx-{lockdir},
@@ -792,6 +793,8 @@ sub provision($$$)
if ($self-{ldap} eq fedora-ds) {
$ctx-{sid_generator} = backend;
}
+
+ $ctx-{ldap_instance} = lc($ctx-{netbiosname});
}
my $ret = $self-provision_raw_step1($ctx);
@@ -801,12 +804,12 @@ sub provision($$$)
push (@{$ctx-{provision_options}}, --ldap-backend-type= .
$self-{ldap});
if ($self-{ldap} eq openldap) {
push
svn commit: samba-web r1406 - in trunk/support: .
Author: jht Date: 2010-03-01 23:05:57 -0700 (Mon, 01 Mar 2010) New Revision: 1406 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1406 Log: Added Cybersource - Australia. Modified: trunk/support/australia.html Changeset: Modified: trunk/support/australia.html === --- trunk/support/australia.html2010-03-01 12:51:20 UTC (rev 1405) +++ trunk/support/australia.html2010-03-02 06:05:57 UTC (rev 1406) @@ -4,6 +4,24 @@ !--#include virtual=header_support.html -- h2 align=centerCommercial Support - Australia/h2 +!-- Added JHT 20100301 -- +hr / +h3Cybersource Pty. Ltd./h3 +presmall +Cybersource Pty. Ltd. +Level 1, 130-132 Stawell Street +Richmond, Victoria + +a href=http://cybersource.com.au;http://cybersource.com.au/a ++61 3 9428 6922 +a href=mailto:i...@cybersource.com.au;i...@cybersource.com.au/a +Con Zymaris +/pre/small +p +Cybersource has 15+ years of experience of deploying and supporting Samba in heteregenous networked environments, in corporate, governement and commercial sectors. +/p + + !-- Added JHT 20100222 -- hr / h3Loftus IT/h3
Build status as of Tue Mar 2 07:00:07 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-03-01 00:00:07.0 -0700 +++ /home/build/master/cache/broken_results.txt 2010-03-02 00:00:38.0 -0700 @@ -1,4 +1,4 @@ -Build status as of Mon Mar 1 07:00:05 2010 +Build status as of Tue Mar 2 07:00:07 2010 Build counts: Tree Total Broken Panic @@ -13,9 +13,9 @@ samba-docs 0 0 0 samba-web0 0 0 samba_3_current 33 32 2 -samba_3_master 33 31 3 -samba_3_next 29 29 4 -samba_4_0_test 35 32 0 +samba_3_master 33 32 3 +samba_3_next 29 28 4 +samba_4_0_test 35 32 1 talloc 35 11 0 tdb 33 22 0
