Re: [Samba] winbind and group permissions
In my environment, I also support NFS services so keeping uid/gid's consistent between machines for both unix/nfs and samba/winbind users is key. If a windows user jsmith connected to a samba server, unix permissions for jsmith were enforced appropriately (samba would match up the name), and I could manage permissions with unix tools. However, if I tried settings permissions via windows, samba would try to set permissions for the Windows jsmith you would have a UID from the winbind range and not the correct unix uid.Windows jsmith and unix jsmith were not treated as the same user. Obviously not an issue for you. Initially my samba PDC was 3.0.x I used winbind to support domain trust with a Windows 2003 PDC-based domain.I eventually switched to an LDAP backend for winbind to keep allocations consistent across all samba servers (DC's and member servers.) Even with LDAP backend, there is some local caching in TBD files. And tdbdump is a useful tool to diagnose the process. What I found was that wbinfo -u and wbinfo -g would work, and when I ran getent passwd and getent group both the idmap table (in ldap in my case, prob winbind_idmap tdb file in your case) would get populated and a local idmap cache file would also get populated. However, this seemd to be a one time thing. Once the cache timeout expired, the local cache would not be repopulated. I would have to delete the idmap entries in ldap and the appropriate tdb files. When I upgraded to samba 3.4.x, the cache timeout issue went away. However, what I found was that NEW idmap entries would not be created. Since user list in the trusted domain almost never changes this didn't really matter- if I added an account in the trusted domain I could manually use my ldap editor to add the corresponding idmap entry in ldap. (A lot easier than editing and TBD file.) If you look at the man page for wbinfo, you will see there is an option to allocate uid's and gid's, and to manually set a uid-to-sid or gid-to-sid mapping. You may want to manually try creating a gid-to-sid mapping for one group and seeing if that group shows up in getent group. It is not really a solution but it may provide some additional insight. -Original Message- From: Bob Miller [mailto:b...@computerisms.ca] Sent: Monday, January 03, 2011 10:51 PM To: gaiseric.van...@gmail.com Cc: samba@lists.samba.org Subject: Re: [Samba] winbind and group permissions Gaiseric, thank you sooo much for the reply I will make comments inline: On Mon, 2011-01-03 at 20:06 -0500, Gaiseric Vandal wrote: Winbind is used for allowing unix things like file system access, getent passwd and getent group to handle windows users (windows users and groups get unix uid's and gid's allocated.) To say this another way; getent maps users/groups and their respective uids/gids/sids, winbind is what determines if those uids/gids have permission to do what is being requested? I don't use winbind to login to a unix system as a windows user but I do use it to allow the unix file system on a samba server to handle file perms for windows users. Winbind would have nothing to do with subnet issues. So wbinfo commands are not affected by working across a vpn... WINS (Windows Internet Naming Service, or something like that) is really useful for having a windows client (e.g. an XP machine) find a Windows server (a Samba server or a real Windows server)- this is really useful when subnet issues are involved, and actually a WINS server should be a standard item even on a local network. Understood and agreed, I always enable wins server even on the simplest samba installs. Depending on your VPN, your remote client may have a virtual NIC on the office LAN. The VPN is an openswan site-to-site tunnel. I have just spent the last hour or two checking, double-checking, re-double-checking, triple-checking, and re-triple-checking that everything is in order. All traffic from several different protocols are travelling in both directions without restriction. I never say never with networks and computers, but I am quite certain this is not the problem. The big problem I found with Samba member servers and winbind was that the Windows user on a member server might have a unix uid or gid that is not consistent with the PDC or other member servers. But this doesn't seem to be your problem. As I understand it, having a map be consistent across multiple samba servers is required in the case of BDCs and PDCs, where a BDC may be required to authorize a user on behalf of the PDC. In that case, the BDC must have the same info as the PDC else a user may end up with different access to different files depending on which member server it connects too. I also understand it to be that using ldap will nicely work around this problem. In my case, there is only one PDC, and my member server is purely a client that is not going to share
Re: [Samba] Samba crashes floods logfiles: smbd/notify_inotify.c:244(inotify_handler) - No data on inotify fd?!
Hello Andrew, thank you for your time, too!! 3. Did I do anything wrong, or is this a problem with the standard kernel included in openSUSE 11.2? Is there anything I can do about it? This problem has been around for several years on RHEL as well - I suspect it is a kernel-samba issue. How come this affects only some users and not all? http://forum.soft32.com/linux/Samba-Samba-logs-fill-disk-inotify-errors- smbd-100-CPU-ftopict479508.html Every box I build now has that setting turned on. I occasionally turn it off to see if there are still issues, and every time it comes back - so it's still an issue AFAIK. Andrew, Volker Lendecke answered to my problem in this thread, too, but with a different solution. Which one should I prefer by your opinion in terms of the most solid server configuration possible? Thank you for your time!! Best regards Tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba crashes floods logfiles: smbd/notify_inotify.c:244(inotify_handler) - No data on inotify fd?!
Hello Volker! Thank you very much for your time that you spent to help me! 1a). Is it correct that kernel change notify is a per share setting and not in the [global] section, so that I will have to put It's a global setting, putting it into [global] once is enough. Ok! 2. Is it correct that if I do insert kernel change notify = No to my shares, that I won't be able to see changes in the folders from my Windows Clients, but I will have to manually trigger a refresh (F5) each time I want to see if changes have occured? E.g. if many users save files to a share, I won't see those new files until I trigger a refresh manually? Or is it only concerning the changes that a linux-process might have performed, e.g. a cronjob that copied a file into a share? It's the latter. If other cifs clients change something, it should still work. I see. 3. Did I do anything wrong, or is this a problem with the standard kernel included in openSUSE 11.2? Is there anything I can do about it? Not sure here. Very likely not your fault, but I would need to see a box where this happens myself to be 100% sure. Is this a common problem? I mean: why do I suffer from this and others not? Volker, Andrew Masterson answered in this thread, that he has the same problem, as me and that he places notify:inotify = false in [global] to avoid the spamming in /var/log/messages. If I understand correctly, with your solution I turn the problem off, but suffer from some compromise in functionality, while in Andrew's solution I actually do not turn the problem off, but just do not log it anymore. What solution should I prefer by your opinion, in terms of a rocksolid server configuration? Thank you for your help! Best regards Tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba crashes floods logfiles: smbd/notify_inotify.c:244(inotify_handler) - No data on inotify fd?!
On Tue, Jan 04, 2011 at 02:56:27PM +0200, Tom H. Lautenbacher wrote: Hello Andrew, thank you for your time, too!! 3. Did I do anything wrong, or is this a problem with the standard kernel included in openSUSE 11.2? Is there anything I can do about it? This problem has been around for several years on RHEL as well - I suspect it is a kernel-samba issue. How come this affects only some users and not all? http://forum.soft32.com/linux/Samba-Samba-logs-fill-disk-inotify-errors- smbd-100-CPU-ftopict479508.html Every box I build now has that setting turned on. I occasionally turn it off to see if there are still issues, and every time it comes back - so it's still an issue AFAIK. Andrew, Volker Lendecke answered to my problem in this thread, too, but with a different solution. Which one should I prefer by your opinion in terms of the most solid server configuration possible? Both kernel change notify = no and notify:inotify=false are equivalent. They both disable the use of inotify. With best regards, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba crashes floods logfiles: smbd/notify_inotify.c:244(inotify_handler) - No data on inotify fd?!
On Tue, Jan 04, 2011 at 03:00:28PM +0200, Tom H. Lautenbacher wrote: If I understand correctly, with your solution I turn the problem off, but suffer from some compromise in functionality, while in Andrew's solution I actually do not turn the problem off, but just do not log it anymore. notify:inotify=false also disables the functionality. What solution should I prefer by your opinion, in terms of a rocksolid server configuration? Either. With best regards, Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] %N 3.0.28 on centos/rhel 4.7 (wanting to split up the profile shares to multiple servers)
What version of Samba do you use? What passdb (such as smbpasswd, tdbsam, ldapsam, ...) do you use? Indeed %N is effective only in old passdb such as smbpasswd or ldapsam_compat. 2011/1/4 Jason Pyeron jpye...@pdinc.us: I am having a hard time finding documentation on the %N construct. I have /etc/auto.master loading /etc/auto.smb and in /etc/auto.smb it reads username -fstype-smb,username=accountant ://otherhost/username In the log file I get: '/home/username' does not exist or ... Error was No such file or directory I am trying to move certain users' profiles to another server for load distribution. I am I going about this wrong or where do I get more information on making %N work for me. -Jason -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba 3.5.6 and AIO on Linux
On Mon, Jan 03, 2011 at 11:13:32AM +0200, Ofer H wrote: I have been trying to enable AIO on ARMv5 Samba built with kernel headers 2.6.31.8, the configure indicated that AIO is supported via kernel headers and all went smooth (regarding the build process). Once I added the smb.conf 'aio write size=1' and tried to perform a file copy to the Samba share I noticed that 32K of the file (of the 1GB file) have been copied to the share but the file copy stalled and did not finish. I had to restart Samba to see that share since it was stuck, I have experienced the same fenomenon with XPsp2 and W7 clients. I also noticed that the Samba daemon that was forked as root (not as nobody as it usually does) and stayed blocked on some FUTEX taken. Can anyone confirm that AIO actually works on Linux, I have seen xBSD related mail claiming that it does work and brings nice performance improvement. Yes, I've used that many times. To be honest, this smells like a problem in glibc on your system. You might want to try vfs objects = aio_fork With best regards, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba crashes floods logfiles: smbd/notify_inotify.c:244(inotify_handler) - No data on inotify fd?!
notify:inotify=false also disables the functionality. What solution should I prefer by your opinion, in terms of a rocksolid server configuration? Either. Ok! Thank you very much, Volker! Best regards from Greece Tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] authentication using both ADS and smbpasswd
2011/1/4 Smith, Cathy cathy.sm...@pnl.gov: My Samba configuration uses ADS for user authentication. I have a request to grant users access who are not members of ADS. Is it possible to set up both smbpasswd and ADS authentication? If you specify a user like Samba-Server\User style, then the user will be authenticated by the Samba server itself. After Samba 3.4.0, if you specify a user like (simple) User style, the user will be authenticated by Samba server itself. Before Samba 3.3.X, auth methods = guest sam winbind:ntdomain sam_ignoredomain or auth method = guest sam_ignoredomain winbind:ntdomain may help you. Former means that 1st Guest authentication works. 2nd the user is specified with Samba-Server\User style, then he is authenticated by Samba Server, 3rd the user is authenticated by Windows domain as DOMAIN\User, regardless of the user's domain part. 4th the user is authenticated by Samba Server as Samba-Server\User, regardless of the user's domain part. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Killed HP LJ4000 envelope feeder upgrading Ubuntu 9.04 -- 10.04 LTS
Greetings, Already when the server was on Ubuntu 9.04, my Ubuntu workstation was having difficulties printing to the printer via a Samba connection. For example, Mozilla Thunderbird could print, but Firefox print jobs got lost to lala land. I found how to do a direct CUPS on the workstation to CUPS on the server connection, and that cleared all of the trouble up. So I thought to see if I could to the same from Windows XP. Turns out MS calls that Internet Printing. So after the sample of my printer connection form my Linux machine, I made three connection to the CUPS queues, used the same drivers I recently re-published to Samba, and the Envelope Feeder again works properly. This is very disappointing that, well I have been working with Samba since 3.0.2 and printing works better in that ancient version than current versions. I would think that Samba merely acts as a Spooler for Windows clients. Obviously not! At least we have a cumbersome work-around to be able to get work done. Sincerely, -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba 3.5.6 and AIO on Linux
2011/1/4 Volker Lendecke volker.lende...@sernet.de: Can anyone confirm that AIO actually works on Linux, I have seen xBSD related mail claiming that it does work and brings nice performance improvement. Yes, I've used that many times. To be honest, this smells like a problem in glibc on your system. You might want to try vfs objects = aio_fork With best regards, Volker Lendecke Is there any documents mentioned about aio_fork? As far as I looked at the source, enabling aio_fork, aio will execute in forked processes simultaneously? And is it on the production level? --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Killed HP LJ4000 envelope feeder upgrading Ubuntu 9.04 -- 10.04 LTS
Michael Lueck wrote: So I thought to see if I could to the same from Windows XP. Turns out MS calls that Internet Printing... And I have taken the time to blog this solution here: HOW-TO: Connect Windows to a CUPS Network Printer http://www.lueckdatasystems.com/HOW-TO_Connect_Windows_to_a_CUPS_Network_Printer -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba 3.5.6 and AIO on Linux
On Tue, Jan 04, 2011 at 11:02:46PM +0900, TAKAHASHI Motonobu wrote: 2011/1/4 Volker Lendecke volker.lende...@sernet.de: Can anyone confirm that AIO actually works on Linux, I have seen xBSD related mail claiming that it does work and brings nice performance improvement. Yes, I've used that many times. To be honest, this smells like a problem in glibc on your system. You might want to try vfs objects = aio_fork With best regards, Volker Lendecke Is there any documents mentioned about aio_fork? Not sure. Probably not, sorry. As far as I looked at the source, enabling aio_fork, aio will execute in forked processes simultaneously? And is it on the production level? It does fork for the async requests, it uses shared memory for the data transfer and it passes the file descriptors via a unix domain socket. Production level? Well, I've used it in some pretty large installations already with no problems attributed to it. That does not mean it's bug-free though. With best regards, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Accessing files via symlink, does client see a difference?
Set log level parameter higher (10 is recommended) value and check the logs whether there are some differences or not both in successed case and failed case. 2011/1/3 Samba user samba.99.spamm...@spamgourmet.com: I have an ancient device, several actually, called an Audiotron that I use Samba for to access media files. Now, I realize these are old and finicky devices. For ease of management, I keep my media files separated into 4.5GB directories (easy to burn to DVD) and then I have a script that goes into each of those directories and creates one big directory full of symlinks pointing into each individual directory. I'm sure my configuration is correct (follow symlinks = yes, wide links = yes in my services) as modern programs such as WinAmp and VLC have no problems accessing the directory full of symlinks (about 2500 links). However, the Audiotron has issues. If I try and play a file, sometimes it play, sometimes it won't. If I try and play it again immediately, sometimes it will go, sometimes I'll have to select play several times before it'll play. If I create individual services for each of my media directories and have the Audiotron catalog them individually, they all work fine. So, my question is, does the client see any difference in accessing a file via SAMBA (3.5.6) if it's a symlink vs a real file? I wouldn't think it would be able to, but the Audiotron certainly doesn't like them very well, yet Winamp has no issues. Thanks for any thoughts. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] winbind and group permissions
On 4 January 2011 05:50, Bob Miller b...@computerisms.ca wrote: Gaiseric, thank you sooo much for the reply I will make comments inline: On Mon, 2011-01-03 at 20:06 -0500, Gaiseric Vandal wrote: Winbind is used for allowing unix things like file system access, getent passwd and getent group to handle windows users (windows users and groups get unix uid's and gid's allocated.) To say this another way; getent maps users/groups and their respective uids/gids/sids, winbind is what determines if those uids/gids have permission to do what is being requested? That is not how I understand it at all. getent passwd and getent group are basically front-ends to winbind (when you have winbind specified in your nsswitch.conf.) So winbind does the talking to a Windows (or Samba) server and maps the uids/gids to/from sids. i.e. winbind maps uids/gids to/from sids/names. getent passwd/group maps between uids/gids and names (via winbind). It's the local filesystem permissions/acls or your smb.conf that determine whether a particular user/group has access to something. I have never used winbind, but that's basically my understanding of it. I don't use winbind to login to a unix system as a windows user but I do use it to allow the unix file system on a samba server to handle file perms for windows users. Winbind would have nothing to do with subnet issues. So wbinfo commands are not affected by working across a vpn... I suppose if winbind can talk to the Windows (or Samba) server where it gets its information, it should not matter if that server is on the other end of a VPN link. -- Michael Wood esiot...@gmail.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Pdbedit problem
On Tue, Jan 4, 2011 at 9:30 AM, Michel, Loubert lmic...@astoriafederal.com wrote: I think I am using passdb backend = smbpasswd. How do I change it to passdb backend = tdbsam in Solaris10? I am unable to find the passdb command even whithin Samba. See the official docs: http://samba.org/samba/docs/man/Samba-HOWTO-Collection/passdb.html#acctmgmttools -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Pdbedit problem
testparm -v should show you the backend in use. The pdbedit command has options for exporting and importing between formats. On 01/04/2011 10:50 AM, Chris Smith wrote: On Tue, Jan 4, 2011 at 9:30 AM, Michel, Loubert lmic...@astoriafederal.com wrote: I think I am using passdb backend = smbpasswd. How do I change it to passdb backend = tdbsam in Solaris10? I am unable to find the passdb command even whithin Samba. See the official docs: http://samba.org/samba/docs/man/Samba-HOWTO-Collection/passdb.html#acctmgmttools -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] winbind and group permissions
That sounds like a pretty good description of winbind and nsswitch. The tricky party, depending on your configuration, is that one real user can end up with two uid's- one from the unix account (e.g. /etc/passwd, nis or ldap) and one from winbind.Your DC's should not be using winbind for the local samba domain if the users already have unix accounts that are also being used for things like nfs or ssh. On 01/04/2011 09:45 AM, Michael Wood wrote: On 4 January 2011 05:50, Bob Millerb...@computerisms.ca wrote: Gaiseric, thank you sooo much for the reply I will make comments inline: On Mon, 2011-01-03 at 20:06 -0500, Gaiseric Vandal wrote: Winbind is used for allowing unix things like file system access, getent passwd and getent group to handle windows users (windows users and groups get unix uid's and gid's allocated.) To say this another way; getent maps users/groups and their respective uids/gids/sids, winbind is what determines if those uids/gids have permission to do what is being requested? That is not how I understand it at all. getent passwd and getent group are basically front-ends to winbind (when you have winbind specified in your nsswitch.conf.) So winbind does the talking to a Windows (or Samba) server and maps the uids/gids to/from sids. i.e. winbind maps uids/gids to/from sids/names. getent passwd/group maps between uids/gids and names (via winbind). It's the local filesystem permissions/acls or your smb.conf that determine whether a particular user/group has access to something. I have never used winbind, but that's basically my understanding of it. I don't use winbind to login to a unix system as a windows user but I do use it to allow the unix file system on a samba server to handle file perms for windows users. Winbind would have nothing to do with subnet issues. So wbinfo commands are not affected by working across a vpn... I suppose if winbind can talk to the Windows (or Samba) server where it gets its information, it should not matter if that server is on the other end of a VPN link. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] problem connecting DFS-share with winXP - successful with Vista 7
Anyone? I am seeing the same behavior - DFS shares visible in Vista and 7, but not XP - though I have not spotted the same detail at session setup. No problem with XP until recently when we applied a domain wide group policy update and latest windows updates. Can't go backwards on the policy. samba-3.5.4 security = ads Thanks. djm On Dec 20, 2010, at 4:19 AM, Steffen Frömer wrote: Hi, i have problems connecting to DFS-Share from Client WindowsXP. Same configuration works fine for Windows Vista and 7. On Windows 7 the LMCompatibility Level is 3. the striking point I see in logfile is following 2010/12/20 10:30:17, 1] smbd/service.c:make_connection_snum(1119) 10.184.144.171 (10.184.144.171) signed connect to service applbin initially as user useracc (uid=45110, gid=45110) (pid 20312) [2010/12/20 10:30:17, 3] smbd/sec_ctx.c:set_sec_ctx(324) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2010/12/20 10:30:17, 2] smbd/reply.c:reply_tcon_and_X(789) Serving applbin as a Dfs root [2010/12/20 10:30:17, 3] smbd/reply.c:reply_tcon_and_X(794) tconX service=APPLBIN [2010/12/20 10:30:17, 3] smbd/process.c:process_smb(1576) Transaction 3 of length 1404 (0 toread) [2010/12/20 10:30:17, 3] smbd/process.c:switch_message(1393) switch message SMBsesssetupX (pid 20312) conn 0x0 [2010/12/20 10:30:17, 3] smbd/sec_ctx.c:set_sec_ctx(324) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2010/12/20 10:30:17, 3] smbd/sesssetup.c:reply_sesssetup_and_X(1412) wct=12 flg2=0xc807 [2010/12/20 10:30:17, 3] smbd/ sesssetup.c:reply_sesssetup_and_X_spnego(1175) Doing spnego session setup [2010/12/20 10:30:17, 3] smbd/ sesssetup.c:reply_sesssetup_and_X_spnego(1210) NativeOS=[Windows 2002 Service Pack 3 2600] NativeLanMan=[Windows 2002 5.1] PrimaryDomain=[] [2010/12/20 10:30:17, 3] smbd/sesssetup.c:reply_spnego_negotiate(802) reply_spnego_negotiate: Got secblob of size 1172 [2010/12/20 10:30:17, 3] libads/authdata.c:decode_pac_data(301) Found account name from PAC: CLIENTXP$ [] [2010/12/20 10:30:17, 3] smbd/sesssetup.c:reply_spnego_kerberos(356) Ticket name is [client...@domain.local] [2010/12/20 10:30:17, 1] smbd/sesssetup.c:reply_spnego_kerberos(474) Username DOMAIN00\CLIENTXP$ is invalid on this system [2010/12/20 10:30:17, 3] smbd/error.c:error_packet_set(61) error packet at smbd/sesssetup.c(480) cmd=115 (SMBsesssetupX) NT_STATUS_LOGON_FAILURE On Windows Vista the Same Section in logfile shows different account- name: Doing spnego session setup [2010/12/20 09:12:29, 3] smbd/ sesssetup.c:reply_sesssetup_and_X_spnego(1210) NativeOS=[] NativeLanMan=[] PrimaryDomain=[] [2010/12/20 09:12:29, 3] smbd/sesssetup.c:reply_spnego_negotiate(802) reply_spnego_negotiate: Got secblob of size 6566 [2010/12/20 09:12:29, 3] libads/authdata.c:decode_pac_data(301) Found account name from PAC: USERACC [Nachname, Vorname] [2010/12/20 09:12:29, 3] smbd/sesssetup.c:reply_spnego_kerberos(356) Ticket name is [user...@domain.local] The difference i see, is that on windows XP the system don't take the username of connecting account, although it is grabbed in start of session-log. [2010/12/20 10:30:17, 3] libads/authdata.c:decode_pac_data(301) Found account name from PAC: USERACC [Nachname, Vorname] [2010/12/20 10:30:17, 3] smbd/sesssetup.c:reply_spnego_kerberos(356) Ticket name is [efro...@domain.local] Has someone an idea, how i can fix this problem. This problem only occurs, if i connect via DFS Master. If i connect directly to the Share, all is successful. [complete Logfile]: http://paste.ubuntu.com/545870/ [config DFS-master]: http://paste.ubuntu.com/545874/ [config client]: http://paste.ubuntu.com/545873/ Regards, Steffen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] cant login with my samba password only with my linux password
On Sat, Dec 25, 2010 at 5:32 PM, Hartmut freeml...@googlemail.com wrote: Hello, I have a strange problem with my samba server. When I try to connect with my (Windows)client and samba ask for the password, it's only accepting my linux-user password, not my samba-user password (set with smbpasswd and as root with smbpasswd user). And now the strange about it. When i change my sambapassword with smbpasswd, and try to login from my client, then the samba-user password is accepted. But after a reboot of my samba server, the server accepts only the linux-user password. I have to (re)set the samba-user password again with smbpasswd and only after that, I can login with the samba-user password. Is there something wrong with my smb.conf (see below)? Or what else could be the problem? - smb.conf: [global] # debuglevel = 1 workgroup = Gruppe server string = Datastring wins support = no dns proxy = no interfaces = 192.168.1.0/24 127.0.0.1/8 bind interfaces only = yes log file = /var/log/samba/log.%m max log size = 1000 syslog = 0 security = user encrypt passwords = true passdb backend = tdbsam obey pam restrictions = yes unix password sync = no pam password change = no map to guest = bad user domain logons = no load printers = no domain master = no usershare allow guests = no vfs objects = recycle recycle: repository = .trash.bin recycle: keeptree = Yes recycle:versions = Yes [lager] comment = Lager path = /media/lager_hdd public = no valid users = user1 read only = no browseable = no - Greetings Hartmut The problem still exist. Has no one a clue? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] What PAM service is used when compiled --with-pam ?
What PAM 'service' is used when using --with-pam? For example, sshd with PAM support uses the 'sshd' PAM service/configuration in /etc/ pam.d/sshd (Linux). I can't find mention of it anywhere. Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] cant login with my samba password only with my linux password
After you change the samba password for the 2nd time, does it stick? When you change the password, does the /etc/samba/smbpasswd change? I can't imagine it matters, but why are you using passwd: compat instead of passwd: files in nsswitch.conf ? What happens if you run smbpasswd as root to change a user's password? On 12/27/2010 12:30 PM, Hartmut wrote: On Mon, Dec 27, 2010 at 2:16 AM, Gaiseric Vandal gaiseric.van...@gmail.com wrote: I can't see any way that, with your configuration, samba could be using your linux password as a samba password. You would have to be using plain text passwords in windows have samba authenticate it against your linux password.Is it really using your linux password, or at some point was your samba password the same as your linux password? The samba and linux passwords was always different. Or did you configure pam or nsswitch.conf to have linux authenticate against windows passwords? No. I use ubuntu 10.10 and the default configuration. See below my nsswitch.conf, but i think it's the default and does not matter. Did you try running testparm -v in case there are some parameters with unexpected defaults? Did this, see output below. But i can't find a wrong or unexpected paramter. Did you try disabling obey pam restrictions? Maybe that is preventing the password change? Yes, i tried this. The same result :( On Sat, Dec 25, 2010 at 11:32 AM, Hartmutfreeml...@googlemail.com wrote: Hello, I have a strange problem with my samba server. When I try to connect with my (Windows)client and samba ask for the password, it's only accepting my linux-user password, not my samba-user password (set with smbpasswd and as root with smbpasswduser). And now the strange about it. When i change my sambapassword with smbpasswd, and try to login from my client, then the samba-user password is accepted. But after a reboot of my samba server, the server accepts only the linux-user password. I have to (re)set the samba-user password again with smbpasswd and only after that, I can login with the samba-user password. Is there something wrong with my smb.conf (see below)? Or what else could be the problem? - smb.conf: [global] # debuglevel = 1 workgroup = Gruppe server string = Datastring wins support = no dns proxy = no interfaces = 192.168.1.0/24 127.0.0.1/8 bind interfaces only = yes log file = /var/log/samba/log.%m max log size = 1000 syslog = 0 security = user encrypt passwords = true passdb backend = tdbsam obey pam restrictions = yes unix password sync = no pam password change = no map to guest = bad user domain logons = no load printers = no domain master = no usershare allow guests = no vfs objects = recycle recycle: repository = .trash.bin recycle: keeptree = Yes recycle:versions = Yes [lager] comment = Lager path = /media/lager_hdd public = no valid users = user1 read only = no browseable = no - Greetings Hartmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- Load smb config files from /etc/samba/smb.conf rlimit_max: rlimit_max (1024) below minimum Windows limit (16384) Processing section [lager] Loaded services file OK. Server role: ROLE_STANDALONE Press enter to see a dump of your service definitions [global] dos charset = CP850 unix charset = UTF-8 display charset = LOCALE workgroup = Gruppe realm = netbios name = SERVER1 netbios aliases = netbios scope = server string = Datastring interfaces = 192.168.1.0/24, 127.0.0.1/8 bind interfaces only = Yes security = USER auth methods = encrypt passwords = Yes update encrypted = No client schannel = Auto server schannel = Auto allow trusted domains = Yes map to guest = Bad User null passwords = No obey pam restrictions = Yes password server = * smb passwd file = /etc/samba/smbpasswd private dir = /etc/samba passdb backend = tdbsam algorithmic rid base = 1000 root directory = guest account = nobody enable privileges = Yes pam password change = No passwd program = passwd chat = *new*password* %n\n *new*password* %n\n *changed* passwd chat debug = No passwd chat timeout = 2 check password script = username map = password level = 0
[Samba] Samba 3.5.6 with Win7 failure (XP works)
Hi all, We're testing 3.5.6 as an upgrade to our old 3.0.x instance. Our XP boxes can see our Samba 3.5.6 shares fine. Our Win7 boxes cannot. The specified network name is no longer available. Relevant config portion is as follows: log level = 20 workgroup = OURCOMP security = ads encrypt passwords = yes realm = OURCOMP.ORG password server = DC1.OURCOMP.ORG client signing = mandatory I've also tried client signing = auto to no avail. Thanks for ANY advice! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.5.6 with Win7 failure (XP works)
this may be of help http://wiki.samba.org/index.php/Windows7 On 01/04/2011 04:32 PM, Jeff Blaine wrote: Hi all, We're testing 3.5.6 as an upgrade to our old 3.0.x instance. Our XP boxes can see our Samba 3.5.6 shares fine. Our Win7 boxes cannot. The specified network name is no longer available. Relevant config portion is as follows: log level = 20 workgroup = OURCOMP security = ads encrypt passwords = yes realm = OURCOMP.ORG password server = DC1.OURCOMP.ORG client signing = mandatory I've also tried client signing = auto to no avail. Thanks for ANY advice! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] cant login with my samba password only with my linux password
What about, unix password sync = yes instead of no Did you try smbclient? On some OS you need: obey pam restrictions = no!? How did you add your users? First linux? Then samba? did you: smbpasswd user -e Good luck Daniel On Tue, 4 Jan 2011 21:16:08 +0100, Hartmut freeml...@googlemail.com wrote: On Sat, Dec 25, 2010 at 5:32 PM, Hartmut freeml...@googlemail.com wrote: Hello, I have a strange problem with my samba server. When I try to connect with my (Windows)client and samba ask for the password, it's only accepting my linux-user password, not my samba-user password (set with smbpasswd and as root with smbpasswd user). And now the strange about it. When i change my sambapassword with smbpasswd, and try to login from my client, then the samba-user password is accepted. But after a reboot of my samba server, the server accepts only the linux-user password. I have to (re)set the samba-user password again with smbpasswd and only after that, I can login with the samba-user password. Is there something wrong with my smb.conf (see below)? Or what else could be the problem? - smb.conf: [global] # debuglevel = 1 workgroup = Gruppe server string = Datastring wins support = no dns proxy = no interfaces = 192.168.1.0/24 127.0.0.1/8 bind interfaces only = yes log file = /var/log/samba/log.%m max log size = 1000 syslog = 0 security = user encrypt passwords = true passdb backend = tdbsam obey pam restrictions = yes unix password sync = no pam password change = no map to guest = bad user domain logons = no load printers = no domain master = no usershare allow guests = no vfs objects = recycle recycle: repository = .trash.bin recycle: keeptree = Yes recycle:versions = Yes [lager] comment = Lager path = /media/lager_hdd public = no valid users = user1 read only = no browseable = no - Greetings Hartmut The problem still exist. Has no one a clue? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] What PAM service is used when compiled --with-pam ?
On Tue, Jan 04, 2011 at 03:45:14PM -0500, Jeff Blaine wrote: What PAM 'service' is used when using --with-pam? For example, sshd with PAM support uses the 'sshd' PAM service/configuration in /etc/ pam.d/sshd (Linux). samba Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.5.6 with Win7 failure (XP works)
On 1/4/2011 4:35 PM, Gaiseric Vandal wrote: this may be of help http://wiki.samba.org/index.php/Windows7 Thanks Gaiseric. FWIW, I *did* look at the wiki first, but completely ignored the Developer section where this is linked from. IMO, it is not in the right section :) At any rate, my problem isn't related to joining a Win7 box to a Samba-served domain, as far as I can tell. I am having trouble accessing a Samba share from Windows 7. I tried the recommended registry modifications from the wiki and rebooted. No luck. However ... I can get things to work if I disable Communications Signing on the win7 box. This is not acceptable to our corporate information security folks though. That at least pinpoints the problem. Now I just need to get Samba to accept communications signing from the client. I don't see that I am doing anything wrong. client signing = mandatory On 01/04/2011 04:32 PM, Jeff Blaine wrote: Hi all, We're testing 3.5.6 as an upgrade to our old 3.0.x instance. Our XP boxes can see our Samba 3.5.6 shares fine. Our Win7 boxes cannot. The specified network name is no longer available. Relevant config portion is as follows: log level = 20 workgroup = OURCOMP security = ads encrypt passwords = yes realm = OURCOMP.ORG password server = DC1.OURCOMP.ORG client signing = mandatory I've also tried client signing = auto to no avail. Thanks for ANY advice! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] log level = 20 not showing auth, etc...
Samba 3.5.6 I must be really misunderstanding 'log level' somehow. I have tried all of the following and cannot get my logs to show anything related to authentication or share accesses at all: log level = 20 log level = all:20 log lovel = 3 auth:20 If I access one of the server's shares successfully, not a single thing shows up in the log. Yes, I am looking at the right log, and yes other things do get written to the log from smbd :) Any help would be very welcome. Jeff Blaine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] log level = 20 not showing auth, etc...
I believe that the max log level is 10 (e.g. you are setting an invalid value). Someone will correct me if I'm wrong, I'm sure. -- Tony Hoover, Network Administrator KSU - Salina, College of Technology and Aviation (785) 826-2660 Don't Blend in... -- -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Jeff Blaine Sent: Tuesday, January 04, 2011 4:04 PM To: samba@lists.samba.org Subject: [Samba] log level = 20 not showing auth, etc... Samba 3.5.6 I must be really misunderstanding 'log level' somehow. I have tried all of the following and cannot get my logs to show anything related to authentication or share accesses at all: log level = 20 log level = all:20 log lovel = 3 auth:20 If I access one of the server's shares successfully, not a single thing shows up in the log. Yes, I am looking at the right log, and yes other things do get written to the log from smbd :) Any help would be very welcome. Jeff Blaine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] log level = 20 not showing auth, etc...
It was worth a try, but I've just changed it to 10 and restarted the service. Same thing. I get the initial daemon startup messages and then nothing additional while I try the shares from Windows boxes, use them, etc. I even tried one of the examples from the man page: log level = 3 passdb:5 auth:10 winbind:2 On 1/4/2011 5:30 PM, Hoover, Tony wrote: I believe that the max log level is 10 (e.g. you are setting an invalid value). Someone will correct me if I'm wrong, I'm sure. -- Tony Hoover, Network Administrator KSU - Salina, College of Technology and Aviation (785) 826-2660 Don't Blend in... -- -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Jeff Blaine Sent: Tuesday, January 04, 2011 4:04 PM To: samba@lists.samba.org Subject: [Samba] log level = 20 not showing auth, etc... Samba 3.5.6 I must be really misunderstanding 'log level' somehow. I have tried all of the following and cannot get my logs to show anything related to authentication or share accesses at all: log level = 20 log level = all:20 log lovel = 3 auth:20 If I access one of the server's shares successfully, not a single thing shows up in the log. Yes, I am looking at the right log, and yes other things do get written to the log from smbd :) Any help would be very welcome. Jeff Blaine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] log level = 20 not showing auth, etc...
On Tue, Jan 04, 2011 at 05:42:34PM -0500, Jeff Blaine wrote: It was worth a try, but I've just changed it to 10 and restarted the service. Same thing. I get the initial daemon startup messages and then nothing additional while I try the shares from Windows boxes, use them, etc. I even tried one of the examples from the man page: log level = 3 passdb:5 auth:10 winbind:2 Is it possible that you have log file = /var/log/samba/log.%m or something equivalent with a %-macro in you smb.conf? In that case, the relevant logs will show up in different files. With best regards, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] log level = 20 not showing auth, etc...
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Where are your logs supposed to go? On 01/04/2011 05:42 PM, Jeff Blaine wrote: It was worth a try, but I've just changed it to 10 and restarted the service. Same thing. I get the initial daemon startup messages and then nothing additional while I try the shares from Windows boxes, use them, etc. I even tried one of the examples from the man page: log level = 3 passdb:5 auth:10 winbind:2 On 1/4/2011 5:30 PM, Hoover, Tony wrote: I believe that the max log level is 10 (e.g. you are setting an invalid value). Someone will correct me if I'm wrong, I'm sure. -- Tony Hoover, Network Administrator KSU - Salina, College of Technology and Aviation (785) 826-2660 Don't Blend in... -- -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Jeff Blaine Sent: Tuesday, January 04, 2011 4:04 PM To: samba@lists.samba.org Subject: [Samba] log level = 20 not showing auth, etc... Samba 3.5.6 I must be really misunderstanding 'log level' somehow. I have tried all of the following and cannot get my logs to show anything related to authentication or share accesses at all: log level = 20 log level = all:20 log lovel = 3 auth:20 If I access one of the server's shares successfully, not a single thing shows up in the log. Yes, I am looking at the right log, and yes other things do get written to the log from smbd :) Any help would be very welcome. Jeff Blaine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba - -- - _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Sr. Systems Programmer |$| |__| | | |__/ | \| _| |novos...@umdnj.edu - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/CST-Academic Svcs. - ADMC 450, Newark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk0jpAQACgkQmb+gadEcsb73PwCaAhIp86N2DWxwGc/ac8JPebWH VaAAn12oZUyGt+kiMkU41aJNA4iCqGhm =bDxf -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] log level = 20 not showing auth, etc...
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I am fairly certain you are correct. A quick man 5 smb.conf ought to answer it. I don't know what happens if the value is set wrong. On 01/04/2011 05:30 PM, Hoover, Tony wrote: I believe that the max log level is 10 (e.g. you are setting an invalid value). Someone will correct me if I'm wrong, I'm sure. -- Tony Hoover, Network Administrator KSU - Salina, College of Technology and Aviation (785) 826-2660 Don't Blend in... -- -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Jeff Blaine Sent: Tuesday, January 04, 2011 4:04 PM To: samba@lists.samba.org Subject: [Samba] log level = 20 not showing auth, etc... Samba 3.5.6 I must be really misunderstanding 'log level' somehow. I have tried all of the following and cannot get my logs to show anything related to authentication or share accesses at all: log level = 20 log level = all:20 log lovel = 3 auth:20 If I access one of the server's shares successfully, not a single thing shows up in the log. Yes, I am looking at the right log, and yes other things do get written to the log from smbd :) Any help would be very welcome. Jeff Blaine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba - -- - _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Sr. Systems Programmer |$| |__| | | |__/ | \| _| |novos...@umdnj.edu - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/CST-Academic Svcs. - ADMC 450, Newark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk0joaUACgkQmb+gadEcsb7/HACgh2wP5KMiytLQiMMeCS0UHWXX SNcAoLe/595LOhp3saYfpqrjMOxNsuY/ =sl8Y -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Problem with psexec (which is using the SMB2 protocol)
Hi, I tried writing to this list a couple of times before but got no responses - am I posting in the wrong place? I'm here because the errors I'm seeing seem to be happening in the SMB2 protocol exchanges (see the Wireshark dumps). I've tried the psexec forums with no success... Anyway - this is the problem : http://http://bowsy.dontexist.net/PsExec_Problem/ Any help very gratefully received. David Durant -- Twitter : @cholten99 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.5.6 with Win7 failure (XP works)
Figured it out. server signing = auto I can get things to work if I disable Communications Signing on the win7 box. This is not acceptable to our corporate information security folks though. That at least pinpoints the problem. Now I just need to get Samba to accept communications signing from the client. I don't see that I am doing anything wrong. client signing = mandatory ^ doesn't help a Windows 7 box with mandatory signing connect to this Samba server :) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] e-pub or downloadable xhtml of the manuals?
http://samba.org/samba/docs/man/Samba-HOWTO-Collection/ This document has provided more information to me than I can adequately express, and as masochistic as it sounds, I'd kinda like to pop a copy on my nook and devour it. along with any of the other docs hosted on the samba website. has anyone prepared epubs of the documentation? if not epubs, than at least xhtml files in a zip suitable for use in converting to an epub? If anyone has any of this or knows where I can download it, lemme know, I'll be muchly greatful! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b79c0e1 Revert nsswitch Add talloc depencency for nsstest
via ce113ea nsswitch: remove includes.h dependency from nsstest.c
from 263642b dynconfig: Add extern to header, try to unbreak imini
buildfarm host.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b79c0e1adbe8ad591157d92b36106484c2c18313
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 08:43:16 2011 +0100
Revert nsswitch Add talloc depencency for nsstest
This reverts commit 640028d158583825ea5ffd1266f099cf8776db5d.
This is not needed anymore.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Jan 4 09:38:57 CET 2011 on sn-devel-104
commit ce113ea02980563133c547bb0693864951ce16a5
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 08:42:16 2011 +0100
nsswitch: remove includes.h dependency from nsstest.c
metze
---
Summary of changes:
nsswitch/nsstest.c | 25 +
nsswitch/wscript_build |2 +-
2 files changed, 10 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c
index 8742b32..d84e028 100644
--- a/nsswitch/nsstest.c
+++ b/nsswitch/nsstest.c
@@ -18,16 +18,9 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
-#include includes.h
+#include replace.h
#include nsswitch/nsstest.h
-#ifdef malloc
-#undef malloc
-#endif
-#ifdef realloc
-#undef realloc
-#endif
-
static const char *so_path = /lib/libnss_winbind.so;
static const char *nss_name = winbind;
static int nss_errno;
@@ -55,10 +48,10 @@ static void *find_fn(const char *name)
if (!res) {
printf(Can't find function %s\n, s);
total_errors++;
- SAFE_FREE(s);
+ free(s);
return NULL;
}
- SAFE_FREE(s);
+ free(s);
return res;
}
@@ -201,12 +194,12 @@ again:
goto again;
}
if (status == NSS_STATUS_NOTFOUND) {
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
if (status != NSS_STATUS_SUCCESS) {
report_nss_error(getgrent, status);
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
return grp;
@@ -239,12 +232,12 @@ again:
goto again;
}
if (status == NSS_STATUS_NOTFOUND) {
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
if (status != NSS_STATUS_SUCCESS) {
report_nss_error(getgrnam, status);
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
return grp;
@@ -278,12 +271,12 @@ again:
goto again;
}
if (status == NSS_STATUS_NOTFOUND) {
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
if (status != NSS_STATUS_SUCCESS) {
report_nss_error(getgrgid, status);
- SAFE_FREE(buf);
+ free(buf);
return NULL;
}
return grp;
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index d40e143..a9881bd 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('winbind-client',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
- deps='replace talloc'
+ deps='replace'
)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 5ea1dd5 s3-waf: fix the build.
from 710b083 lib/crypto: add aes_cfb8_encrypt()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 5ea1dd5e79633a7d91e5c43f93446c3bc8a84e91
Author: Günther Deschner g...@samba.org
Date: Mon Jan 3 16:53:00 2011 +0100
s3-waf: fix the build.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Mon Jan 3 18:19:01 CET 2011 on sn-devel-104
(cherry picked from commit 4316895bc7eafde146541ee522ec4d575402d67d)
---
Summary of changes:
source3/wscript_build |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index f9f2466..77dda39 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -184,7 +184,8 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c
libsmb/clifile.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c
libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
libsmb/smb_seal.c libsmb/async_smb.c
- libsmb/cli_np_tstream.c'''
+ libsmb/cli_np_tstream.c
+ libsmb/smbsock_connect.c'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
@@ -615,7 +616,8 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c
torture/scanner.c torture/
torture/denytest.c torture/mangle_test.c
torture/nbench.c
torture/test_async_echo.c
-torture/test_posix_append.c'''
+torture/test_posix_append.c
+torture/test_smbsock_any_connect.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
torture/wbc_async.c
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0279422 s4-smbtorture: check driver_version equality as well.
via 6457610 s4-smbtorture: always setup full driver level 8 in
test_add_driver_arg().
via 69174fe s4-smbtorture: in test_GetDriverInfo_winreg() always test
level 6 for samba3 as well.
via 19a295d s4-smbtorture: setup help and dependent files in spoolss
driver unc path tests.
via 8fc2881 s4-smbtorture: fix DriverDate and DriverVersion comparison
checks against w2k3.
via 9c46370 s4-smbtorture: add more tests for driver_dates.
from b79c0e1 Revert nsswitch Add talloc depencency for nsstest
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0279422c83e42a6c903e82a069a5236dd01a0f21
Author: Günther Deschner g...@samba.org
Date: Fri Dec 24 01:55:08 2010 +0100
s4-smbtorture: check driver_version equality as well.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Jan 4 11:22:09 CET 2011 on sn-devel-104
commit 64576106b10b8cde8970d82301fba66c0ee1995e
Author: Günther Deschner g...@samba.org
Date: Fri Dec 24 01:25:49 2010 +0100
s4-smbtorture: always setup full driver level 8 in test_add_driver_arg().
Guenther
commit 69174fea5b2c580356693d33b2ab980a44a34259
Author: Günther Deschner g...@samba.org
Date: Fri Dec 24 01:25:04 2010 +0100
s4-smbtorture: in test_GetDriverInfo_winreg() always test level 6 for
samba3 as
well.
Guenther
commit 19a295dee8b9b9b9844c564fb5b856c7268f650a
Author: Günther Deschner g...@samba.org
Date: Fri Dec 24 01:22:24 2010 +0100
s4-smbtorture: setup help and dependent files in spoolss driver unc path
tests.
Guenther
commit 8fc28818b974042712b5c11776de0562755ed59d
Author: Günther Deschner g...@samba.org
Date: Fri Dec 24 01:14:49 2010 +0100
s4-smbtorture: fix DriverDate and DriverVersion comparison checks against
w2k3.
Guenther
commit 9c46370e915d8b32f0307eb0a491aeacd2b617b9
Author: Günther Deschner g...@samba.org
Date: Thu Dec 23 23:50:23 2010 +0100
s4-smbtorture: add more tests for driver_dates.
Guenther
---
Summary of changes:
source4/torture/rpc/spoolss.c | 79 ++---
1 files changed, 66 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6ff2414..2dd7164 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -48,6 +48,7 @@
#define TORTURE_DRIVER_ADOBE torture_driver_adobe
#define TORTURE_DRIVER_EX_ADOBEtorture_driver_ex_adobe
#define TORTURE_DRIVER_ADOBE_CUPSADDSMB
torture_driver_adobe_cupsaddsmb
+#define TORTURE_DRIVER_TIMESTAMPS torture_driver_timestamps
#define TOP_LEVEL_PRINT_KEY SOFTWARE\\Microsoft\\Windows
NT\\CurrentVersion\\Print
#define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY \\Printers
@@ -4653,11 +4654,8 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
test_winreg_OpenKey(tctx, winreg_handle, hive_handle,
driver_key, key_handle),
failed to open driver key);
- if (torture_setting_bool(tctx, samba3, false)) {
- goto try_level3;
- }
-
- if (torture_setting_bool(tctx, w2k3, false)) {
+ if (torture_setting_bool(tctx, samba3, false) ||
+ torture_setting_bool(tctx, w2k3, false)) {
goto try_level6;
}
@@ -4741,7 +4739,9 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
test_sz(Driver, driver_path);
if (torture_setting_bool(tctx, w2k3, false)) {
DATA_BLOB blob = data_blob_talloc_zero(tctx, 8);
+ push_nttime(blob.data, 0, info.info6.driver_date);
test_binary(DriverDate, blob);
+ SBVAL(blob.data, 0, info.info6.driver_version);
test_binary(DriverVersion,blob);
} else {
test_sz(DriverDate, driver_date);
@@ -4759,8 +4759,6 @@ static bool test_GetDriverInfo_winreg(struct
torture_context *tctx,
test_dword(Version, info.info6.version);
/* test_dword(TempDir, ?); */
- try_level3:
-
if (handle) {
torture_assert(tctx,
test_GetPrinterDriver2_level(tctx, b, handle,
driver_name, environment, 3, version, 0, info, result),
@@ -8452,6 +8450,7 @@ static bool test_AddPrinterDriver_args_level_6(struct
torture_context *tctx,
}
torture_assert_nttime_equal(tctx, info.info6.driver_date,
info6.driver_date, driverdate mismatch);
+ torture_assert_u64_equal(tctx, info.info6.driver_version,
info6.driver_version,
talloc dep for talloc.h
On Tue, 2011-01-04 at 09:55 +0100, Jelmer Vernooij wrote: On Tue, 2011-01-04 at 05:40 +0100, Andrew Bartlett wrote: commit 640028d158583825ea5ffd1266f099cf8776db5d Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 4 14:41:38 2011 +1100 nsswitch Add talloc depencency for nsstest nsstest does not use talloc, but it includes talloc.h via includes.h, and so without this it cannot find the right internal header. This wasn't noticed before, as most linux developer boxes have a talloc.h. The issue was reported by Adam Tauno Williams awilliam at whitemice.org I'm a bit puzzled by this, as e.g. sn doesn't have talloc.h installed either and neither have most of the build farm hosts. Perhaps it happens if talloc.h is installed but not in /usr/include ? That is odd, but I reproduced it locally, by removing libtalloc-devel from my Fedora 12 laptop. I've tested it before and after this commit (including a waf configure). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Cisco Inc.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d2e93cc s3-waf: Fixed the static rpc service build. via d4f5bf0 s3-smbd: Call the rpc service shutdown functions. via 8ece780 s3-build: Remove broken RPC modules support. via 9aa8763 s3-smbd: Call all the rpc services in the right order. from 0279422 s4-smbtorture: check driver_version equality as well. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d2e93cce88b69bdf489984f34376ca30934684ad Author: Andreas Schneider a...@samba.org Date: Mon Dec 20 14:29:34 2010 +0100 s3-waf: Fixed the static rpc service build. Autobuild-User: Andreas Schneider a...@samba.org Autobuild-Date: Tue Jan 4 12:09:48 CET 2011 on sn-devel-104 commit d4f5bf0c36e3d5a0a13d1a03e7c6fac956dbf954 Author: Andreas Schneider a...@samba.org Date: Mon Dec 20 11:42:17 2010 +0100 s3-smbd: Call the rpc service shutdown functions. commit 8ece780d1b90125514a1afb3e145a413cc342b98 Author: Andreas Schneider a...@samba.org Date: Mon Dec 20 11:24:07 2010 +0100 s3-build: Remove broken RPC modules support. With the current module support for rpc we're not able to call the init functions with the rpc callback structure. So init functions and shutdown functions aren't called. These init functions are needed to setup pre requirements like migrating the printer databases and register at the endpoint mapper. The shutdown functions cleanup memory and deregister from the endpoint mapper. commit 9aa876397601554df5f6b6e4b690755ed0eb405e Author: Andreas Schneider a...@samba.org Date: Mon Dec 20 11:00:45 2010 +0100 s3-smbd: Call all the rpc services in the right order. --- Summary of changes: source3/Makefile.in | 14 ++-- source3/configure.in | 17 source3/m4/aclocal.m4|8 -- source3/rpc_server/wscript_build | 185 ++ source3/smbd/server.c| 46 +- source3/smbd/server_exit.c | 34 +++ source3/wscript | 30 ++ source3/wscript_build|4 +- 8 files changed, 163 insertions(+), 175 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 3e49869..cd0f376 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -249,13 +249,12 @@ SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb VFS_MODULES = @VFS_MODULES@ PERFCOUNT_MODULES = @PERFCOUNT_MODULES@ PDB_MODULES = @PDB_MODULES@ -RPC_MODULES = @RPC_MODULES@ IDMAP_MODULES = @IDMAP_MODULES@ CHARSET_MODULES = @CHARSET_MODULES@ AUTH_MODULES = @AUTH_MODULES@ NSS_INFO_MODULES = @NSS_INFO_MODULES@ GPEXT_MODULES = @GPEXT_MODULES@ -MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \ +MODULES = $(VFS_MODULES) $(PDB_MODULES) $(IDMAP_MODULES) \ $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \ $(GPEXT_MODULES) $(PERFCOUNT_MODULES) @@ -729,8 +728,13 @@ RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \ RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o -RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \ - $(LIBCLI_SPOOLSS_OBJ) \ +RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \ +$(RPC_DSSETUP_OBJ) $(RPC_WKSSVC_OBJ) $(RPC_SVCCTL_OBJ) \ +$(RPC_NTSVCS_OBJ) $(RPC_NETLOGON_OBJ) $(RPC_NETDFS_OBJ) \ +$(RPC_SRVSVC_OBJ) $(RPC_SPOOLSS_OBJ) $(RPC_EVENTLOG_OBJ) \ +$(RPC_SAMR_OBJ) $(RPC_RPCECHO_OBJ) \ +$(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \ +$(LIBCLI_SPOOLSS_OBJ) \ $(LIBCLI_WINREG_OBJ) \ $(LIBCLI_SRVSVC_OBJ) \ $(LIBCLI_LSA_OBJ) \ @@ -3164,7 +3168,6 @@ installbin:: all installdirs installmodules:: modules installdirs @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES) @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES) @@ -3252,7 +3255,6 @@ uninstallbin:: uninstallmodules:: @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4ebf2f9 s3-waf: convert SAMBA_VERSION into a subsystem.
via 589d1bf s3-waf: convert PASSCHANGE into a subsystem.
via 3459649 s3-waf: add UTIL_TDB subsystem.
from d2e93cc s3-waf: Fixed the static rpc service build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4ebf2f97459b4214748255aa1f40015f8dc511cc
Author: Günther Deschner g...@samba.org
Date: Tue Jan 4 13:11:35 2011 +0100
s3-waf: convert SAMBA_VERSION into a subsystem.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Jan 4 15:10:52 CET 2011 on sn-devel-104
commit 589d1bf57eb8f561de3cf2a05990a5d2edf69095
Author: Günther Deschner g...@samba.org
Date: Tue Jan 4 13:05:51 2011 +0100
s3-waf: convert PASSCHANGE into a subsystem.
Guenther
commit 34596493bada8ce9fb00fd7d4d60ac245a71d5e6
Author: Günther Deschner g...@samba.org
Date: Tue Jan 4 12:56:29 2011 +0100
s3-waf: add UTIL_TDB subsystem.
Guenther
---
Summary of changes:
source3/wscript_build | 39 ++-
1 files changed, 26 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 21da069..d670ecb 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,7 @@
from samba_utils import *
import samba_version
-TDB_LIB_SRC = '''../lib/util/util_tdb.c
+TDB_LIB_SRC = '''
lib/dbwrap.c lib/dbwrap_tdb.c
lib/dbwrap_ctdb.c
lib/g_lock.c
@@ -87,7 +87,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
lib/serverid.c
lib/util_transfer_file.c
${TDB_LIB_SRC}
- ${VERSION_SRC} lib/debug.c lib/fault.c
+ lib/debug.c lib/fault.c
lib/interface.c lib/pidfile.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
@@ -476,8 +476,7 @@ NMBD_SRC = '${NMBD_SRC1}'
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
-SWAT_SRC = '''${SWAT_SRC1}
- ${PASSCHANGE_SRC}'''
+SWAT_SRC = '''${SWAT_SRC1}'''
STATUS_SRC = '''utils/status.c utils/status_profile.c'''
@@ -493,7 +492,7 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}'''
+SMBPASSWD_SRC = '''utils/smbpasswd.c'''
PDBEDIT_SRC = '''utils/pdbedit.c'''
@@ -673,9 +672,7 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
libsmb/clikrb5.c libads/kerberos.c'''
-VLP_SRC = '''printing/tests/vlp.c
- ../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}'''
+VLP_SRC = '''printing/tests/vlp.c'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -866,7 +863,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
-deps='LIBCRYPTO ndr security NDR_SECURITY charset
NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET',
+deps='LIBCRYPTO ndr security NDR_SECURITY charset
NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -981,6 +978,12 @@ bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
source=FNAME_UTIL_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+ source='../lib/util/util_tdb.c',
+ local_include=False,
+ public_deps='tdb talloc'
+ )
+
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
@@ -1019,6 +1022,15 @@ bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
deps='pam',
vars=locals())
+bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+source=PASSCHANGE_SRC,
+deps='LIBCLI_SAMR',
+vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+source=VERSION_SRC,
+vars=locals())
+
bld.SAMBA_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
vars=locals())
@@ -1219,7 +1231,7 @@ bld.SAMBA_BINARY('web/swat',
deps='''talloc tevent cap LIBS LIBSMB wbclient PARAM
LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE
PRINTING FNAME_UTIL
- LIBCLI_SAMR INIT_LSA''',
+ LIBCLI_SAMR INIT_LSA PASSCHANGE''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
@@ -1304,7 +1316,7 @@ bld.SAMBA_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
deps='''talloc
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1cbce84 s4/ldapcmp: Fix the parsing of the second set of credentials from 4ebf2f9 s3-waf: convert SAMBA_VERSION into a subsystem. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1cbce84683ef4fa49b85d87988c5e8db7057530a Author: Anatoliy Atanasov anatoliy.atana...@postpath.com Date: Tue Jan 4 16:50:03 2011 +0200 s4/ldapcmp: Fix the parsing of the second set of credentials We need this second set of credentials so we can do comparison between DCs in two different domains. Autobuild-User: Anatoliy Atanasov anatoliy.atana...@postpath.com Autobuild-Date: Tue Jan 4 16:36:06 CET 2011 on sn-devel-104 --- Summary of changes: source4/scripting/python/samba/netcmd/ldapcmp.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py index 1318457..1ecbda7 100755 --- a/source4/scripting/python/samba/netcmd/ldapcmp.py +++ b/source4/scripting/python/samba/netcmd/ldapcmp.py @@ -771,7 +771,7 @@ class cmd_ldapcmp(Command): credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp, fallback_machine=True) -creds2 = credopts.get_credentials2(lp, False) +creds2 = credopts.get_credentials2(lp) if creds2.is_anonymous(): creds2 = creds if not creds.authentication_requested(): -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e1e8693 s3:build: don't use cli_ntsvcs.c any more.
via d99e9c3 s3:rpcclient: use dcerpc_binding_handle client stubs in
cmd_ntsvcs.c
via fbcbeab s3:build: don't use cli_wbint.c any more
from 1cbce84 s4/ldapcmp: Fix the parsing of the second set of credentials
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e1e869352565b8e1d7865a2338f8f0f3ef154519
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 10:55:48 2011 +0100
s3:build: don't use cli_ntsvcs.c any more.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Jan 4 17:23:17 CET 2011 on sn-devel-104
commit d99e9c389b6c0d8ed84a7b36ccadd8b43e3b19f2
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 10:52:14 2011 +0100
s3:rpcclient: use dcerpc_binding_handle client stubs in cmd_ntsvcs.c
metze
commit fbcbeabd655029309ee42627a0bb75d6a5820f50
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:58:25 2011 +0100
s3:build: don't use cli_wbint.c any more
metze
---
Summary of changes:
source3/Makefile.in|4 +---
source3/librpc/wscript_build |5 -
source3/rpcclient/cmd_ntsvcs.c | 21 ++---
source3/wscript_build |8 ++--
4 files changed, 17 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index cd0f376..968e2eb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -349,8 +349,7 @@ LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/cli_eventlog.o \
LIBCLI_WINREG_OBJ = librpc/gen_ndr/cli_winreg.o \
librpc/gen_ndr/ndr_winreg_c.o
-LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/cli_ntsvcs.o \
- librpc/gen_ndr/ndr_ntsvcs_c.o
+LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/ndr_ntsvcs_c.o
LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/cli_drsuapi.o \
librpc/gen_ndr/ndr_drsuapi_c.o
@@ -1328,7 +1327,6 @@ WINBINDD_OBJ1 = \
winbindd/winbindd_dual.o \
winbindd/winbindd_dual_ndr.o \
winbindd/winbindd_dual_srv.o \
- librpc/gen_ndr/cli_wbint.o \
librpc/gen_ndr/ndr_wbint_c.o \
librpc/gen_ndr/srv_wbint.o \
librpc/gen_ndr/ndr_wbint.o \
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 0bb7322..5b30507 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -45,11 +45,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT',
public_deps='dcerpc NDR_WBINT'
)
-bld.SAMBA_SUBSYSTEM('RPCCLI_NDR_WBINT',
- source='../librpc/gen_ndr/cli_wbint.c',
- public_deps='RPC_NDR_WBINT'
- )
-
bld.SAMBA_SUBSYSTEM('SRV_NDR_WBINT',
source='../librpc/gen_ndr/srv_wbint.c',
public_deps='NDR_WBINT'
diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index 95b905a..68135d5 100644
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -27,11 +27,12 @@ static WERROR cmd_ntsvcs_get_version(struct rpc_pipe_client
*cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli-binding_handle;
NTSTATUS status;
WERROR werr;
uint16_t version;
- status = rpccli_PNP_GetVersion(cli, mem_ctx,
+ status = dcerpc_PNP_GetVersion(b, mem_ctx,
version, werr);
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
@@ -49,6 +50,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli-binding_handle;
NTSTATUS status;
WERROR werr;
const char *devicepath = NULL;
@@ -65,7 +67,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct
rpc_pipe_client *cli,
flags = atoi(argv[2]);
}
- status = rpccli_PNP_ValidateDeviceInstance(cli, mem_ctx,
+ status = dcerpc_PNP_ValidateDeviceInstance(b, mem_ctx,
devicepath,
flags,
werr);
@@ -81,6 +83,7 @@ static WERROR cmd_ntsvcs_hw_prof_flags(struct rpc_pipe_client
*cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli-binding_handle;
NTSTATUS status;
WERROR werr;
const char *devicepath = NULL;
@@ -96,7 +99,7 @@ static WERROR
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f8275ba s4/ldapcmp: Check if creds2 is actualy set by the command line from e1e8693 s3:build: don't use cli_ntsvcs.c any more. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f8275bae5d7b471967be7222170d049c18b8882f Author: Anatoliy Atanasov anatoliy.atana...@postpath.com Date: Tue Jan 4 17:45:16 2011 +0200 s4/ldapcmp: Check if creds2 is actualy set by the command line When parsing the command line for the second set of credentials the parser returns wrong user if the second set of parameters isn't set. So check if the password is set instead. Autobuild-User: Anatoliy Atanasov anatoliy.atana...@postpath.com Autobuild-Date: Tue Jan 4 18:11:26 CET 2011 on sn-devel-104 --- Summary of changes: source4/scripting/python/samba/netcmd/ldapcmp.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py index 1ecbda7..76f7d95 100755 --- a/source4/scripting/python/samba/netcmd/ldapcmp.py +++ b/source4/scripting/python/samba/netcmd/ldapcmp.py @@ -772,7 +772,7 @@ class cmd_ldapcmp(Command): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp, fallback_machine=True) creds2 = credopts.get_credentials2(lp) -if creds2.is_anonymous(): +if credopts.no_pass2: creds2 = creds if not creds.authentication_requested(): raise CommandError(You must supply at least one username/password pair) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8925b03 s3-rpcecho: Only register rpcecho in the developer build.
from f8275ba s4/ldapcmp: Check if creds2 is actualy set by the command
line
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8925b03b5997d9e4fff604a2417eb1f4d8958e86
Author: Andreas Schneider a...@samba.org
Date: Tue Jan 4 16:53:33 2011 +0100
s3-rpcecho: Only register rpcecho in the developer build.
Autobuild-User: Andreas Schneider a...@samba.org
Autobuild-Date: Tue Jan 4 18:56:38 CET 2011 on sn-devel-104
---
Summary of changes:
source3/rpc_server/srv_echo_nt.c |4
source3/smbd/server.c|2 ++
source3/smbd/server_exit.c |2 ++
3 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c
index 87b2491..ef6204f 100644
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/srv_echo_nt.c
@@ -24,8 +24,6 @@
#include includes.h
#include ../librpc/gen_ndr/srv_echo.h
-#ifdef DEVELOPER
-
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
@@ -121,5 +119,3 @@ uint16 _echo_TestDoublePointer(struct pipes_struct *p,
struct echo_TestDoublePoi
p-rng_fault_state = True;
return 0;
}
-
-#endif /* DEVELOPER */
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1b06851..1b9e793 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1225,9 +1225,11 @@ extern void build_options(bool screen);
if (!NT_STATUS_IS_OK(rpc_netdfs_init(NULL))) {
exit(1);
}
+#ifdef DEVELOPER
if (!NT_STATUS_IS_OK(rpc_rpcecho_init(NULL))) {
exit(1);
}
+#endif
if (!NT_STATUS_IS_OK(rpc_dssetup_init(NULL))) {
exit(1);
}
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 65151a1..ca906fa 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -131,7 +131,9 @@ static void exit_server_common(enum server_exit_reason how,
if (am_parent) {
rpc_wkssvc_shutdown();
rpc_dssetup_shutdown();
+#ifdef DEVELOPER
rpc_rpcecho_shutdown();
+#endif
rpc_netdfs_shutdown();
rpc_initshutdown_shutdown();
rpc_eventlog_shutdown();
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 899adca s3:build: don't use cli_dssetup.c any more
via 4c37257 s3:net_utils: use
dcerpc_dssetup_DsRoleGetPrimaryDomainInformation()
via f016e4d s3:winbindd: use
dcerpc_dssetup_DsRoleGetPrimaryDomainInformation()
via c6aedc9 s3:rpcclient: use dcerpc_binding_handle based client stubs
in cmd_dssetup.c
via 62aa019 s3:build: don't use cli_epmapper.c anymore
via 6dd5ccd s3:rpcclient: improve epmmap output
via 697d4ea s3:rpcclient: use dcerpc_binding_handle bases client stubs
in cmd_epmapper.c
via fba2fdf s3:rpc_client: use dcerpc_epm_Map() and don't ignore
'result' anymore.
from 8925b03 s3-rpcecho: Only register rpcecho in the developer build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 899adcaec97f5f8781507a221d0ffcbe73e59b0c
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:56:05 2011 +0100
s3:build: don't use cli_dssetup.c any more
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Jan 4 22:21:48 CET 2011 on sn-devel-104
commit 4c37257f16cf2b34550a993f5423ee772254870f
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 17:18:22 2011 +0100
s3:net_utils: use dcerpc_dssetup_DsRoleGetPrimaryDomainInformation()
metze
commit f016e4d4bd86d34a39822e9fdc0f83dbf67442b7
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:55:15 2011 +0100
s3:winbindd: use dcerpc_dssetup_DsRoleGetPrimaryDomainInformation()
metze
commit c6aedc9750aff42a6d201addf0d4ed745743b9a2
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:51:34 2011 +0100
s3:rpcclient: use dcerpc_binding_handle based client stubs in cmd_dssetup.c
metze
commit 62aa019a1b5b0ec17e0b4494de44e80ffc793fdd
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:36:24 2011 +0100
s3:build: don't use cli_epmapper.c anymore
metze
commit 6dd5ccd04130a7d33bebca1a2340d339ab7b34c9
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 21:24:17 2011 +0100
s3:rpcclient: improve epmmap output
metze
commit 697d4ea8fff6fbc48aa59b17fa0ecc91bf1d233d
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:33:46 2011 +0100
s3:rpcclient: use dcerpc_binding_handle bases client stubs in cmd_epmapper.c
metze
commit fba2fdf2651bd4ffaabb41d5e0506cbf3bcb0699
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 4 13:32:28 2011 +0100
s3:rpc_client: use dcerpc_epm_Map() and don't ignore 'result' anymore.
metze
---
Summary of changes:
source3/Makefile.in |6 +--
source3/rpc_client/cli_pipe.c| 13 ++-
source3/rpcclient/cmd_dssetup.c |3 +-
source3/rpcclient/cmd_epmapper.c | 72 +++---
source3/utils/net_util.c | 10 -
source3/winbindd/winbindd_cm.c |5 ++-
source3/wscript_build| 16 ++--
7 files changed, 90 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 968e2eb..cfcadce 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -363,8 +363,7 @@ LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \
librpc/gen_ndr/ndr_initshutdown_c.o
-LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \
-librpc/gen_ndr/ndr_dssetup_c.o
+LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/ndr_dssetup_c.o
LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/cli_svcctl.o \
librpc/gen_ndr/ndr_svcctl_c.o
@@ -388,8 +387,7 @@ LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/cli_netlogon.o \
librpc/gen_ndr/ndr_netlogon_c.o \
rpc_client/cli_netlogon.o
-LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/cli_epmapper.o \
- librpc/gen_ndr/ndr_epmapper_c.o
+LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/ndr_epmapper_c.o
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index b59e9db..d7320c1 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2464,6 +2464,7 @@ static NTSTATUS rpc_pipe_get_tcp_port(const char *host,
{
NTSTATUS status;
struct rpc_pipe_client *epm_pipe = NULL;
+ struct dcerpc_binding_handle *epm_handle = NULL;
struct pipe_auth_data *auth = NULL;
struct dcerpc_binding *map_binding = NULL;
struct dcerpc_binding *res_binding = NULL;
@@ -2474,6 +2475,7 @@ static NTSTATUS rpc_pipe_get_tcp_port(const char *host,
uint32_t max_towers = 1;
struct epm_twr_p_t towers;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e80b322 s4-python: Allow setting TEST_DEBUG_LEVEL to override debug
level for tests.
via 733bc1c talloc: Clarify error message on access after free.
from 899adca s3:build: don't use cli_dssetup.c any more
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e80b322077d132c8973e85d25ef40c956e8f5b54
Author: Jelmer Vernooij jel...@samba.org
Date: Wed Jan 5 01:09:25 2011 +0100
s4-python: Allow setting TEST_DEBUG_LEVEL to override debug level for tests.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Wed Jan 5 01:58:44 CET 2011 on sn-devel-104
commit 733bc1c1ca31df2b61d86f5ee8783ee9c3867faa
Author: Jelmer Vernooij jel...@samba.org
Date: Wed Jan 5 01:01:28 2011 +0100
talloc: Clarify error message on access after free.
---
Summary of changes:
lib/talloc/talloc.c |8
source4/scripting/python/samba/tests/__init__.py | 10 ++
2 files changed, 14 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index ec67a46..d6115af 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -224,9 +224,9 @@ static void talloc_abort_magic(unsigned magic)
talloc_abort(Bad talloc magic value - wrong talloc version
used/mixed);
}
-static void talloc_abort_double_free(void)
+static void talloc_abort_access_after_free(void)
{
- talloc_abort(Bad talloc magic value - double free);
+ talloc_abort(Bad talloc magic value - access after free);
}
static void talloc_abort_unknown_value(void)
@@ -246,8 +246,8 @@ static inline struct talloc_chunk
*talloc_chunk_from_ptr(const void *ptr)
}
if (tc-flags TALLOC_FLAG_FREE) {
- talloc_log(talloc: double free error - first free may
be at %s\n, tc-name);
- talloc_abort_double_free();
+ talloc_log(talloc: access after free error - first
free may be at %s\n, tc-name);
+ talloc_abort_access_after_free();
return NULL;
} else {
talloc_abort_unknown_value();
diff --git a/source4/scripting/python/samba/tests/__init__.py
b/source4/scripting/python/samba/tests/__init__.py
index 10826ab..d0362ef 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -36,6 +36,16 @@ from testtools.testcase import (
class TestCase(TesttoolsTestCase):
+A Samba test case.
+
+def setUp(self):
+super(TestCase, self).setUp()
+test_debug_level = os.getenv(TEST_DEBUG_LEVEL)
+if test_debug_level is not None:
+test_debug_level = int(test_debug_level)
+self._old_debug_level = samba.get_debug_level()
+samba.set_debug_level(test_debug_level)
+self.addCleanup(samba.set_debug_level, test_debug_level)
def get_loadparm(self):
return env_loadparm()
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 26c8a52 upgradeprovision: Fix use of dict.get(). from e80b322 s4-python: Allow setting TEST_DEBUG_LEVEL to override debug level for tests. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 26c8a520f3284391820424df2bf4158b276dd32b Author: Jelmer Vernooij jel...@samba.org Date: Wed Jan 5 02:48:03 2011 +0100 upgradeprovision: Fix use of dict.get(). Avoid modifying list while iterating over it. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Wed Jan 5 03:37:35 CET 2011 on sn-devel-104 --- Summary of changes: source4/scripting/bin/upgradeprovision | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 27e142b..36c99ee 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -855,19 +855,13 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns, invocationid): isFirst = 0 txt = -for att in delta: +for att in list(delta): if usns is not None: # We have updated by provision usn information so let's exploit # replMetadataProperties if att in forwardlinked: -if current[0].get(): -curval = current[0][att] -else: -curval = () -if reference[0].get(): -refval = reference[0][att] -else: -refval = () +curval = current[0].get(att, ()) +refval = reference[0].get(att, ()) handle_links(samdb, att, basedn, current[0][dn], curval, refval, delta) continue @@ -1696,8 +1690,8 @@ if __name__ == '__main__': for att in deltaattr: if att.lower() == dn: continue -if deltaattr.get(att) is not None \ -and deltaattr.get(att).flags() != FLAG_MOD_ADD: +if (deltaattr.get(att) is not None +and deltaattr.get(att).flags() != FLAG_MOD_ADD): doit = False elif deltaattr.get(att) is None: doit = False -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6f51a1f talloc: fixed a use after free error
via 66db49e talloc: added a test for the use after free Rusty found
from 26c8a52 upgradeprovision: Fix use of dict.get().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6f51a1f45bf4de062cce7a562477e8140630a53d
Author: Andrew Tridgell tri...@samba.org
Date: Wed Jan 5 16:33:13 2011 +1100
talloc: fixed a use after free error
this is the minimal fix for the problem Rusty found. I previously
thought that the best fix would be to change tc-parent to be valid
for all pointers, but that is expensive for realloc with large numbers
of child pointers, which is much more commmon than I expected it to
be.
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Jan 5 07:22:27 CET 2011 on sn-devel-104
commit 66db49e35f87f0e0a9d82cfa661d2cc604758406
Author: Andrew Tridgell tri...@samba.org
Date: Wed Dec 22 15:29:37 2010 +1100
talloc: added a test for the use after free Rusty found
---
Summary of changes:
lib/talloc/talloc.c| 17 -
lib/talloc/testsuite.c | 17 +
2 files changed, 33 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index d6115af..c616f34 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -645,13 +645,28 @@ static inline int _talloc_free_internal(void *ptr, const
char *location)
final choice is the null context. */
void *child = TC_PTR_FROM_CHUNK(tc-child);
const void *new_parent = null_context;
+ struct talloc_chunk *old_parent = NULL;
if (unlikely(tc-child-refs)) {
struct talloc_chunk *p =
talloc_parent_chunk(tc-child-refs);
if (p) new_parent = TC_PTR_FROM_CHUNK(p);
}
+ /* finding the parent here is potentially quite
+ expensive, but the alternative, which is to change
+ talloc to always have a valid tc-parent pointer,
+ makes realloc more expensive where there are a
+ large number of children.
+
+ The reason we need the parent pointer here is that
+ if _talloc_free_internal() fails due to references
+ or a failing destructor we need to re-parent, but
+ the free call can invalidate the prev pointer.
+ */
+ if (new_parent == null_context (tc-child-refs ||
tc-child-destructor)) {
+ old_parent = talloc_parent_chunk(ptr);
+ }
if (unlikely(_talloc_free_internal(child, location) == -1)) {
if (new_parent == null_context) {
- struct talloc_chunk *p =
talloc_parent_chunk(ptr);
+ struct talloc_chunk *p = old_parent;
if (p) new_parent = TC_PTR_FROM_CHUNK(p);
}
_talloc_steal_internal(new_parent, child);
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 0026931..ee6256b 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -1167,6 +1167,21 @@ static bool test_free_ref_null_context(void)
return true;
}
+static bool test_rusty(void)
+{
+ void *root;
+ const char *p1;
+
+ talloc_enable_null_tracking();
+ root = talloc_new(NULL);
+ p1 = talloc_strdup(root, foo);
+ talloc_increase_ref_count(p1);
+ talloc_report_full(root, stdout);
+ talloc_free(root);
+ return true;
+}
+
+
static void test_reset(void)
{
talloc_set_log_fn(test_log_stdout);
@@ -1221,6 +1236,8 @@ bool torture_local_talloc(struct torture_context *tctx)
ret = test_pool();
test_reset();
ret = test_free_ref_null_context();
+ test_reset();
+ ret = test_rusty();
if (ret) {
test_reset();
--
Samba Shared Repository
