Re: [Samba] Group quotas on shares
Many thanks, the 'valid users' option is exactly what was missing. Regards, Simon Pat Riehecky [EMAIL PROTECTED] wrote: Hey, We have a similar setup here. I have all the users of a share in a secondary group together. chown whomever:sharegroup on the share directory chmod 2770 on the share directory Here is the relevant bit of my smb.conf [IT] comment = IT Test Share path = /home/it valid users = @it force group = it read only = No create mask = 0770 directory mask = 0770 strict allocate = Yes use sendfile = Yes preserve case = No hide special files = Yes hide unreadable = Yes browseable = No fstype = FAT wide links = No For maintainability I would recommend reading up on the copy option of smb.conf for shares. I have 20+ shares which are all setup identically and have but one place to make changes to all of them. As a side note for a shortcut I suspect you are looking for the valid users option of smb.conf. Pat On Mon, 2008-05-12 at 11:24 +0100, [EMAIL PROTECTED] wrote: Hello, Samba 3.0.23d PDC on CentOS 4.4, smbpasswd backend, Windows XP clients. I recently took over the administration of a small LAN (~35 hosts). The shared drives had been implemented in a hurry and the configuration had never been revisited. Linux groups had been enabled for different shares, but this had never been enforced on the file server. I have implemented linux group quotas on the file system that contains our shared folders, but it has not worked according to my expectations. I changed the group ownership of each share and its contents according to the relevant role and appropriate access level, and set the group sticky on each share and its subfolders. I also added the default create modes for each share into smb.conf: force create mode = 0770 force directory mode = 0770 After this I enabled quotas on the filesystem for the specific group that owns each share. However, in Windows every folder shows with the same usage and quota regardless of the assigned quota, and that quota seems to be the quota assigned to the primary group that each user belongs to i.e. users. If I remove the quota on the users group then the full filesystem space is displayed in Windows Explorer for every share. If I add the option: force group = +sales to the sales share, for example, the correct quota for sales is visible in explorer, however any user can then access the sales folder regardless of the groups that they belong to. Is there a way I can enable group quotas that are displayed correctly in Explorer and also limit access to only the members of the appropriate groups for each share? Best regards, Simon Barrett - Find the home of your dreams with eircom net property Sign up for email alerts now http://www.eircom.net/propertyalerts -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does samba modify print queues?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jack Downes wrote: So somewhere in the line of windowsXPclient - samba -cups -Win2k3printserver - printer, we are changing the output. smbd does not modify any bits in the print job itself. My guess is that the Windows drivers are operating differently when using RAW vs. EMF printing modes. cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software - http://www.likewisesoftware.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIKaTpIR7qMdg1EfYRAlGzAJwOsF7M18gdb3VL6hLd+t2FTUf1MACgvhup r2ayevYCF9SwZjHEG5dRIh8= =QdLw -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Can't get 3.0.23d from SuSE RPM to be a member in an NT4 domain
On Mon, May 12, 2008 at 10:49 AM, Jay R. Ashworth [EMAIL PROTECTED] wrote: A week ago, May 06, 2008 at 11:22:24AM -0400, I wrote: I followed (I think) the instructions on how to do this in TOSHARG (which are about as disjointed as the book, which I took back), but I continue to be unable to get the box, running winbind, to reliably authenticate users off the PDC, which is running NT4 (and I'm not sure which SP, if it matters) and Exchange 5.5, which precludes me from simply vampiring it and decommissioning it... unless there's no solution on the Samba front. [ ... ] I'll be happy to supply smb.conf and any other information that seems warranted, but hopefully this is enough to provide a start to some helpful person... :-) This seems to be a question that is much-asked and little-answered, based on all my googling... No help on this at all, huh? Is Samba 3 as a member server in an NT domain not a supported configuration, then? Which version of opensuse you are running. I had similar problems with 10.2, but with 10.3 and samba 3.0.26a-3.5 everything is OK. -- Svetoslav Milenov (Sunny) Even the most advanced equipment in the hands of the ignorant is just a pile of scrap. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba as nonroot
Hi, Im trying to run samba as a non-root user and I was wondering if this is even possible, and if not what is preventing it from being ran as a normal user?? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] creating a master share
I am trying to create a master share that contains all the other shares. I created a group that needs read+write permission to all the other shares. However, rather than adding this group in each share configuration, I was wondering if there is a way to overwrite the permission. I tried this but gave read-only access. Also in the linux level, I don't have this master group as the owner. Any idea? [master share] comment = All of WWW read/write access path = /www valid users = @DOMAIN\My master group write list = @DOMAIN\My master group force group = My Master group read only = No create mask = 0775 directory mask = 0775 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Can't get 3.0.23d from SuSE RPM to be a member in an NT4 domain
On Tue, May 13, 2008 at 09:40:07AM -0500, Sunny wrote: Which version of opensuse you are running. I had similar problems with 10.2, but with 10.3 and samba 3.0.26a-3.5 everything is OK. I am, in fact, using 10.2 and 3.0.23. I'll upgrade the machine after we get the hardware problems sorted, and see if it plays. Thanks. Cheers, -- jra -- Jay R. Ashworth Baylink [EMAIL PROTECTED] Designer The Things I Think RFC 2100 Ashworth Associates http://baylink.pitas.com '87 e24 St Petersburg FL USA http://photo.imageinc.us +1 727 647 1274 Those who cast the vote decide nothing. Those who count the vote decide everything. -- (Joseph Stalin) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba segs when serving files from a windows partition on OpenBSD-4.2
On Tue, Apr 29, Jeremy Allison wrote: On Mon, Apr 28, 2008 at 09:05:29PM +0100, Edd Barrett wrote: I am sure that the OpenBSD team will be interested in fixing these bugs if they still exist, as they take pride making good quality code. I can't speak for NetBSD or FreeBSD. As for the directory name cache size = 0 it does not work for me. On OpenBSD. I used this configuration: [global] workgroup = MYGROUP server string = Samba Server security = share log file = /var/log/smbd.%m directory name cache size = 0 [public] comment = Public Stuff path = /mnt/hot/sd0i public = yes writable = yes printable = no I tested this with samba-latest.tgz from your web-page. If I change the path to someplace else on a UFS slice, all is well. Did you remove the lib/replace/repdir_getdirentries.c code as well ? The aborts will still trigger even with directory name cache size = 0 if that code is in place. As a data point, I'm getting crashes on NetBSD 3.1 and samba 3.0.28a on a FFSv2 partition. Removing the lib/replace/repdir_getdirentries.c gets it working (even without directory name cache size = 0). I'm not sure of the canonical way to remove it, the patch at https://bugzilla.samba.org/attachment.cgi?id=2905 does not work, nor does removing repdir.m4 entirely. I ended up editing source/Makefile and removing the .o files from LIBREPLACE_OBJ. I note the changes in OpenBSD and NetBSD to fix the seekdir() problem, but they didn't seem to help me. -- Dr. Stephen Borrill -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba segs when serving files from a windows partition on OpenBSD-4.2
On Tue, May 13, 2008 at 05:56:56PM +0100, Stephen Borrill wrote: As a data point, I'm getting crashes on NetBSD 3.1 and samba 3.0.28a on a FFSv2 partition. Removing the lib/replace/repdir_getdirentries.c gets it working (even without directory name cache size = 0). I'm not sure of the canonical way to remove it, the patch at https://bugzilla.samba.org/attachment.cgi?id=2905 does not work, nor does removing repdir.m4 entirely. I ended up editing source/Makefile and removing the .o files from LIBREPLACE_OBJ. We'll remove lib/replace/repdir_getdirentries.c for 3.0.29 and 3.2 final. Thanks. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does samba modify print queues?
Dang... apparently I was not specific enough. I'm not using RAW drivers on the windows clients - ONLY in cups. My intention is for the users to change nothing and to just have the samba/cups combo do routing. It would seem easy, however everyone I've tried to talk with has given some linux-centric answer or whatever. Okay, well, guess I'll just do this without samba as it's the culprit. without samba, all works fine, with samba things go wrong. I'm not sure how you came to the conclusion that it must be the windows client. Poor writing on my part I must presume. Well thanks for the effort. On Tue, 13 May 2008 09:25:45 -0500, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jack Downes wrote: So somewhere in the line of windowsXPclient - samba -cups -Win2k3printserver - printer, we are changing the output. smbd does not modify any bits in the print job itself. My guess is that the Windows drivers are operating differently when using RAW vs. EMF printing modes. cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does samba modify print queues?
On Tue, May 13, 2008 at 12:26 PM, [EMAIL PROTECTED] wrote: Dang... apparently I was not specific enough. I'm not using RAW drivers on the windows clients - ONLY in cups. My intention is for the users to change nothing and to just have the samba/cups combo do routing. It would seem easy, however everyone I've tried to talk with has given some linux-centric answer or whatever. Okay, well, guess I'll just do this without samba as it's the culprit. without samba, all works fine, with samba things go wrong. I'm not sure how you came to the conclusion that it must be the windows client. Poor writing on my part I must presume. Well thanks for the effort. Doesn't samba/cups printing happens this way? So from winxp (pcl6 or pcl5 or ps) - to samba (cups) - to printer using PPD to raw? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does samba modify print queues?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jax, Dang... apparently I was not specific enough. I'm not using RAW drivers on the windows clients - ONLY in cups. My intention is for the users to change nothing and to just have the samba/cups combo do routing. It would seem easy, however everyone I've tried to talk with has given some linux-centric answer or whatever. Okay, well, guess I'll just do this without samba as it's the culprit. without samba, all works fine, with samba things go wrong. I'm not sure how you came to the conclusion that it must be the windows client. Poor writing on my part I must presume. Well thanks for the effort. Understand there are two different ways to generate print jobs on Windows clients. Raw (client side rebdered) and EMF which is basically encapsulated GDI calls (server side rendered). When using EMF it is possible that certain Windows print drivers do not pass the job through the local Win32 print processor for that driver and hence generate different output. That is what I was referring to when I said RAW vs. EMF printing. Has nothing to do with cups. cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software - http://www.likewisesoftware.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIKdmdIR7qMdg1EfYRAtfeAKDZysCLk/WAgYmeHRGwBDBfgg0/6gCfZwu3 pCJzeGY1zC/j8roHfSI7bYA= =zXFx -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] User invalid SID with home directory - Bueller?
So even though I see this popping up in tons of posts, no one has encountered it and successfully solved the problem or can illuminate the issue? Here's what I did not knowing what else to do: 1. Deleted the account. (smbldap-userdel) 2. Recreated the account (smbldap-useradd) 3. Searched for any files owned by the old user, and chown'd them to the new user It is not an elegant solution, but it is the only one I have now. So far I haven't gotten any accounts that have had the problem reoccur. But I'm waiting to see. Wes Wes Modes wrote: I'm having the problem in which users can access their group shares, but not their home shares. These two shares are defined thusly in smb.conf: [seref] comment = Science Engineering Reference Section path = /data/group/seref valid users = @seref, @seref-read, @admin read list = @seref-read write list = @seref, @admin force group = seref create mask = 0664 directory mask = 0770 [home] comment = %u's Personal Share Directory path = /data/home/%U valid users = %U, @admin write list = %U, @admin create mask = 0600 directory mask = 0700 browseable = No It seems that the %U variable, causes Samba to do a lookup_global_sam_name which fails. [EMAIL PROTECTED] smbclient -Ujoeblow '\\edgar.library.ucsc.edu\home' tree connect failed: NT_STATUS_ACCESS_DENIED Here's the relevant section of the log: passdb/pdb_ldap.c:init_sam_from_ldap(545) init_sam_from_ldap: Entry found for user: joeblow passdb/pdb_ldap.c:init_group_from_ldap(2158) init_group_from_ldap: Entry found for group: 30023 passdb/passdb.c:lookup_global_sam_name(596) User joeblow with invalid SID S-1-5-21-2642364908-3785178431-1037763545-61756 in passdb passdb/pdb_ldap.c:init_group_from_ldap(2158) init_group_from_ldap: Entry found for group: 1001 smbd/service.c:make_connection_snum(616) user 'joeblow' (from session setup) not permitted to access this share (home) Please note that I am not using the ADS security model, nor do I care to at the moment. Here's the significant part of my smb.conf: ### Basic information for server workgroup = MCHSTAFF netbios name = EDGAR server string = Library Samba Server hosts allow = 169.233. hosts allow = 128.114. enable privileges = yes security = user encrypt passwords = yes preferred master = yes domain master = yes domain logons = yes local master = yes username map = /etc/samba/smbusers logon path = wins support = yes dns proxy = no So why I am I getting the failure User joeblow with invalid SID? Wes -- Wes Modes Server Administrator Programmer Analyst McHenry Library Computing Network Services Information and Technology Services 459-5208 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does samba modify print queues?
Oddly enough I wrote back once to this list, but it's not yet shown up. Now I'm here to say I was wrong, and that Jerry is right... Setting the print driver on the windows XP client side to NT EMF enables perfect prints. thanks for the patient assistance! you rock. On Tue, 13 May 2008 13:10:37 -0500, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jax, Dang... apparently I was not specific enough. I'm not using RAW drivers on the windows clients - ONLY in cups. My intention is for the users to change nothing and to just have the samba/cups combo do routing. It would seem easy, however everyone I've tried to talk with has given some linux-centric answer or whatever. Okay, well, guess I'll just do this without samba as it's the culprit. without samba, all works fine, with samba things go wrong. I'm not sure how you came to the conclusion that it must be the windows client. Poor writing on my part I must presume. Well thanks for the effort. Understand there are two different ways to generate print jobs on Windows clients. Raw (client side rebdered) and EMF which is basically encapsulated GDI calls (server side rendered). When using EMF it is possible that certain Windows print drivers do not pass the job through the local Win32 print processor for that driver and hence generate different output. That is what I was referring to when I said RAW vs. EMF printing. Has nothing to do with cups. cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] is there a bandwidth limit per file?
Hello! Sorry for late answer but, i was on travel until sunday. I tried with Ubuntu Live CD but still with similiar limit. So, I decided to upgrade to Gigabit Interface (Switch NICs). Here, the results for the case someone is curious. Now I get around 160MBit on average from and to the server. This does not change when copying several files in parallel. With NETIO around 250MBit (linx-win) and 500MBit (win-win) are possible. I guess 20MB/s is what i can get with this slow computer and Samba. Thank you, Jeremy for the fast and good support, Michael Jeremy Allison schrieb: On Fri, Apr 25, 2008 at 12:20:19AM +0200, Michael wrote: Hello Everybody! I set up a fileserver: - Pentium II, 350 Mhz, - 256MB RAM, - Intel Fast Ethernet PCI - VIA-SATA Controller - 2x500GB SATA HDD RAID 1 - Debian 4, Samba 3 - Samba set up in user shares mode without special options, but with the suggested optimizations Clients: - Windows XP Prof SP2 So far it works fine. I can read and write files without problem. But my bandwith seems to be limited somehow. When i copy one file i get a nearly constant transfer rate of about 6.8 MB/s (read and write). Do i copy two files in parallel i get a total transfer rate of about 10MB/s (again for read and write) with 3 files it is even around 11MB/s. Why i can't reach this transfer rate with just one file? It is the same from both windows pc. I benchmarked my network around 11.5MB/s are reached using netio (Win-Win,Win-Debian). The HDDs are reaching 60MB/s with hdparm -t /dev/sd? I search for such an issue, but didn't find something useful. I looked into the documentation, but didn't find some hints for that issue. How can i find the bootleneck in the system? I'd guess the problem is the Windows redirector only allowing one outstanding 64k read/write request on the wire at a time. This is a known problem with XP. To test is this is the case, try using smbclient from another Linux box to write a file and see if the throughput rises. We allow up to max mux (protocol limit) outstanding requests on the wire. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba segs when serving files from a windows partition on OpenBSD-4.2
On Tue, May 13, 2008 at 10:20:47AM -0700, Jeremy Allison wrote: https://bugzilla.samba.org/attachment.cgi?id=2905 does not work, nor does removing repdir.m4 entirely. I ended up editing source/Makefile and removing the .o files from LIBREPLACE_OBJ. We'll remove lib/replace/repdir_getdirentries.c for 3.0.29 and 3.2 final. Thanks. Certain? I think mbalmer wanted to send a Samba-patch for systems without his bugfix (i.e. all bsd systems in production right now). Or did I miss that patch? Volker pgpD5HF5OLqPU.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba segs when serving files from a windows partition on OpenBSD-4.2
On Tue, May 13, 2008 at 09:44:03PM +0200, Volker Lendecke wrote: On Tue, May 13, 2008 at 10:20:47AM -0700, Jeremy Allison wrote: https://bugzilla.samba.org/attachment.cgi?id=2905 does not work, nor does removing repdir.m4 entirely. I ended up editing source/Makefile and removing the .o files from LIBREPLACE_OBJ. We'll remove lib/replace/repdir_getdirentries.c for 3.0.29 and 3.2 final. Thanks. Certain? I think mbalmer wanted to send a Samba-patch for systems without his bugfix (i.e. all bsd systems in production right now). Or did I miss that patch? I thouhgt the patch he wanted was removing that code, but I could be mistaken. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with UID
Hello! I have two linux-based server (eg. server1 and server2) that are members of Windows-2000-domain TEST. On Server1 there's folder EXCHANGE with ACL permission shared through samba-3.0.10: drwxr-xr-- TEST\user TEST\domain users EXCHANGE it works OK for domain users and the owner (TEST\user) can control permissions. Now I want to copy the data from this folder (EXCHANGE) to Server2 with the same ACL-permissions for domain users. For this I've done: 1. Server2 joined to domain TEST (net rpc join -S PDC -U admin) wbinfo -g -- OK wbinfo -u -- OK 2. mount //server1/EXCHANGE to server2 to folder /mountExchange BUT! mounted folder has permission like this: #drwxr-xr-- 15878 TEST\domain users /mountExchange So, when I copy the data from mounted folder to local folder (cp -rpa fromdir todir), files are also copied with unrecognized UID: #drwxr-xr-- 15892 TEST\domain users /mount/Exchange/soft # cd ./soft #rwxr-xr-- 15892 TEST\domain users /mountExchange/soft/README.txt as you can see UID doesn't match on servers. some conf files: Server1 smb.conf (samba-3.0.14) [global] workgroup = TEST server string = security = DOMAIN log file = /var/log/samba/%m.log max log size = 50 acl compatibility = win2k socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 dns proxy = No idmap uid = 15000-2 idmap gid = 15000-2 map acl inherit = Yes [exchange] path = /public/exchange valid users = TEST\domain users admin users = TEST\admin read only = No vfs objects = recycle, extd_audit recycle:touch = yes recycle:keeptree = yes recycle:repository = Trash/%U Server2 smb.conf (samba-3.0.25b) [global] workgroup = TEST server string = security = DOMAIN log file = /var/log/samba/%m.log max log size = 50 acl compatibility = win2k idmap uid = 15000-2 idmap gid = 15000-2 map acl inherit = Yes SID of domain users are the same on both servers: Server1 #wbinfo -n TEST\user #wbinfo -S S-1-5-21-4219080837-1407974555-4163626113-1379 15342 Server2 #wbinfo -n TEST\user #wbinfo -S S-1-5-21-4219080837-1407974555-4163626113-1379 15002 Does anybody know why UID doesn't migrate from one server to another? Thanks for any idea! Igor -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba segs when serving files from a windows partition on OpenBSD-4.2
On Tue, May 13, 2008 at 01:10:29PM -0700, Jeremy Allison wrote: Certain? I think mbalmer wanted to send a Samba-patch for systems without his bugfix (i.e. all bsd systems in production right now). Or did I miss that patch? I thouhgt the patch he wanted was removing that code, but I could be mistaken. Right now I've got a little chat with mbalmer on irc. It seems that we can indeed remove that code completely. Volker pgpu2IcNNWm2W.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] User invalid SID with home directory - Bueller?
If you do a net getlocalsid at your shell prompt on the samba server that hosts the share, does the preamble of the SID returned match that of the SID you see in your error messages? I'm betting not... --Charlie On Tue, May 13, 2008 at 2:39 PM, Wes Modes [EMAIL PROTECTED] wrote: So even though I see this popping up in tons of posts, no one has encountered it and successfully solved the problem or can illuminate the issue? Here's what I did not knowing what else to do: 1. Deleted the account. (smbldap-userdel) 2. Recreated the account (smbldap-useradd) 3. Searched for any files owned by the old user, and chown'd them to the new user It is not an elegant solution, but it is the only one I have now. So far I haven't gotten any accounts that have had the problem reoccur. But I'm waiting to see. Wes Wes Modes wrote: I'm having the problem in which users can access their group shares, but not their home shares. These two shares are defined thusly in smb.conf: [seref] comment = Science Engineering Reference Section path = /data/group/seref valid users = @seref, @seref-read, @admin read list = @seref-read write list = @seref, @admin force group = seref create mask = 0664 directory mask = 0770 [home] comment = %u's Personal Share Directory path = /data/home/%U valid users = %U, @admin write list = %U, @admin create mask = 0600 directory mask = 0700 browseable = No It seems that the %U variable, causes Samba to do a lookup_global_sam_name which fails. [EMAIL PROTECTED] smbclient -Ujoeblow '\\edgar.library.ucsc.edu\home' tree connect failed: NT_STATUS_ACCESS_DENIED Here's the relevant section of the log: passdb/pdb_ldap.c:init_sam_from_ldap(545) init_sam_from_ldap: Entry found for user: joeblow passdb/pdb_ldap.c:init_group_from_ldap(2158) init_group_from_ldap: Entry found for group: 30023 passdb/passdb.c:lookup_global_sam_name(596) User joeblow with invalid SID S-1-5-21-2642364908-3785178431-1037763545-61756 in passdb passdb/pdb_ldap.c:init_group_from_ldap(2158) init_group_from_ldap: Entry found for group: 1001 smbd/service.c:make_connection_snum(616) user 'joeblow' (from session setup) not permitted to access this share (home) Please note that I am not using the ADS security model, nor do I care to at the moment. Here's the significant part of my smb.conf: ### Basic information for server workgroup = MCHSTAFF netbios name = EDGAR server string = Library Samba Server hosts allow = 169.233. hosts allow = 128.114. enable privileges = yes security = user encrypt passwords = yes preferred master = yes domain master = yes domain logons = yes local master = yes username map = /etc/samba/smbusers logon path = wins support = yes dns proxy = no So why I am I getting the failure User joeblow with invalid SID? Wes -- Wes Modes Server Administrator Programmer Analyst McHenry Library Computing Network Services Information and Technology Services 459-5208 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba as nonroot
[EMAIL PROTECTED] wrote: Hi, Im trying to run samba as a non-root user and I was wondering if this is even possible No, it's not. and if not what is preventing it from being ran as a normal user?? You couldn't bind to privileged ports would be the big one. You might be able to modify the source so it runs on different ports (although that would mean windows systems couldn't connect, you might be able to coax another samba machine into it), you would then have issues with permissions (you couldn't suid/sgid to the connecting user). *Michael Heydon - IT Administratorr * [EMAIL PROTECTED] mailto:[EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] creating a master share
sharif islam wrote: snip I tried this but gave read-only access. Also in the linux level, I don't have this master group as the owner. Any idea? If the users don't have write access at the unix level, they won't get write access through samba. You can use ACLs to grant them write access. [master share] comment = All of WWW read/write access path = /www valid users = @DOMAIN\My master group write list = @DOMAIN\My master group force group = My Master group Or you can use the above force group option to access the files as a group that does have access. read only = No create mask = 0775 directory mask = 0775 *Michael Heydon - IT Administratorr * [EMAIL PROTECTED] mailto:[EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] ntlm_auth authentication to two different domains
Hi, I'm wondering if it is possible to use NTLM authentication in squid for users in two different Windows domains. So basically, I would need that ntlm_auth --username=user_in_domain1 --domain=domain1 and ntlm_auth --username=user_in_domain2 --domain=domain2 work at the same time. Is that possible ? What would one need to configure to make this work ? Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-71-gfb691ba
The branch, v3-2-stable has been updated
via fb691bab6b66c8b1f5535d6bfb5884a43fa38f4c (commit)
via b85b7d85c20551a2bf53fc541b3de5cae3f37521 (commit)
from 03521136ccb4d4a52c9c0373beed7df2485397a9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit fb691bab6b66c8b1f5535d6bfb5884a43fa38f4c
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri May 9 14:54:06 2008 -0700
Fix replacement getpass. If we ^C at the prompt echo was left off.
Fix bug #5456. Karolin please pull for 3.2-stable.
Jeremy.
(cherry picked from commit 726d9d168d5b4bca86b478c34204eacb97907443)
commit b85b7d85c20551a2bf53fc541b3de5cae3f37521
Author: coffeedude [EMAIL PROTECTED]
Date: Mon May 12 17:33:01 2008 -0500
net ads: Upper case he realm name when calling kinit() using machine creds.
Needed fix for the DNS Update option as part of net ads join
(cherry picked from commit aebae0b71b427838fdc6344d69d6dea87a5dd58b)
(cherry picked from commit 437a59598d886b316fd58ca88ed40f5fb325c47f)
---
Summary of changes:
source/lib/replace/getpass.c |7 ++-
source/utils/net_ads.c |1 +
2 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 7b9..0be618f 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -187,10 +187,6 @@ char *rep_getpass(const char *prompt)
in_fd = fileno(in);
if (fgets(buf, bufsize, in) == NULL) {
buf[0] = 0;
- if (in in != stdin) {
- fclose(in);
- }
- return buf;
}
}
nread = strlen(buf);
@@ -201,8 +197,9 @@ char *rep_getpass(const char *prompt)
/* Restore echoing. */
if (echo_off) {
- if (gotintr in_fd == -1)
+ if (gotintr in_fd == -1) {
in = fopen (/dev/tty, w+);
+ }
if (in != NULL)
tcsetattr (fileno (in), TCSANOW, t);
}
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 3df9e2c..ad8882c 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1227,6 +1227,7 @@ int net_ads_join(int argc, const char **argv)
ads_dns-auth.password = secrets_fetch_machine_password(
r-out.netbios_domain_name, NULL, NULL );
ads_dns-auth.realm = SMB_STRDUP(
r-out.dns_domain_name );
+ strupper_m(ads_dns-auth.realm );
ads_kinit_password( ads_dns );
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2417-g9c59c18
The branch, v3-3-test has been updated via 9c59c1895d8d3621f38b67ecf88109c81130c886 (commit) from aebae0b71b427838fdc6344d69d6dea87a5dd58b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 9c59c1895d8d3621f38b67ecf88109c81130c886 Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue May 13 10:18:37 2008 +0200 man pages: Correct version string. As Samba 3.2 will be out soon, man pages should be correct for both versions, Samba 3.0 and 3.2. Karolin --- Summary of changes: docs-xml/manpages-3/findsmb.1.xml |2 +- docs-xml/manpages-3/libsmbclient.7.xml |2 +- docs-xml/manpages-3/lmhosts.5.xml |2 +- docs-xml/manpages-3/log2pcap.1.xml |2 +- docs-xml/manpages-3/nmbd.8.xml |2 +- docs-xml/manpages-3/nmblookup.1.xml|2 +- docs-xml/manpages-3/ntlm_auth.1.xml|2 +- docs-xml/manpages-3/pam_winbind.7.xml |2 +- docs-xml/manpages-3/pdbedit.8.xml |2 +- docs-xml/manpages-3/profiles.1.xml |2 +- docs-xml/manpages-3/rpcclient.1.xml|2 +- docs-xml/manpages-3/samba.7.xml|2 +- docs-xml/manpages-3/smb.conf.5.xml |2 +- docs-xml/manpages-3/smbcacls.1.xml |2 +- docs-xml/manpages-3/smbcontrol.1.xml |2 +- docs-xml/manpages-3/smbcquotas.1.xml |2 +- docs-xml/manpages-3/smbd.8.xml |2 +- docs-xml/manpages-3/smbget.1.xml |2 +- docs-xml/manpages-3/smbgetrc.5.xml |2 +- docs-xml/manpages-3/smbpasswd.5.xml|2 +- docs-xml/manpages-3/smbpasswd.8.xml|2 +- docs-xml/manpages-3/smbsh.1.xml|2 +- docs-xml/manpages-3/smbspool.8.xml |2 +- docs-xml/manpages-3/smbstatus.1.xml|2 +- docs-xml/manpages-3/smbtar.1.xml |2 +- docs-xml/manpages-3/smbtree.1.xml |2 +- docs-xml/manpages-3/swat.8.xml |2 +- docs-xml/manpages-3/tdbbackup.8.xml|2 +- docs-xml/manpages-3/tdbdump.8.xml |2 +- docs-xml/manpages-3/testparm.1.xml |2 +- docs-xml/manpages-3/vfstest.1.xml |2 +- docs-xml/manpages-3/wbinfo.1.xml |2 +- docs-xml/manpages-3/winbindd.8.xml |2 +- 33 files changed, 33 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages-3/findsmb.1.xml index 9161dc4..4824508 100644 --- a/docs-xml/manpages-3/findsmb.1.xml +++ b/docs-xml/manpages-3/findsmb.1.xml @@ -118,7 +118,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml index 61016c5..ec95004 100644 --- a/docs-xml/manpages-3/libsmbclient.7.xml +++ b/docs-xml/manpages-3/libsmbclient.7.xml @@ -119,7 +119,7 @@ titleVERSION/title para - This man page is correct for version 3.0 of the Samba suite. + This man page is correct for version 3 of the Samba suite. /para /refsect1 diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages-3/lmhosts.5.xml index ec27177..fca0616 100644 --- a/docs-xml/manpages-3/lmhosts.5.xml +++ b/docs-xml/manpages-3/lmhosts.5.xml @@ -93,7 +93,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages-3/log2pcap.1.xml index 48eb1a1..d6debe7 100644 --- a/docs-xml/manpages-3/log2pcap.1.xml +++ b/docs-xml/manpages-3/log2pcap.1.xml @@ -103,7 +103,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages-3/nmbd.8.xml index 5c17044..19e6f4f 100644 --- a/docs-xml/manpages-3/nmbd.8.xml +++ b/docs-xml/manpages-3/nmbd.8.xml @@ -254,7 +254,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages-3/nmblookup.1.xml index 3a8672c..85640da 100644 --- a/docs-xml/manpages-3/nmblookup.1.xml +++ b/docs-xml/manpages-3/nmblookup.1.xml @@ -191,7 +191,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1530-gda2179e
The branch, v4-0-test has been updated via da2179ee5d5b6094ab63a9d9d6a8d59893937087 (commit) via 3fddd36e119f73a5021370450f9687ef9d252bab (commit) via aa7ef1af746319a3d771decd0ec03dabe8b8ad28 (commit) via 67845d3471711d24069636d0d4032f9d53748334 (commit) via 0234d397fefee8e1d0dcd3402f748c2251021c90 (commit) via 64591d064dc3da6074f0f7539911a6e433d9cc43 (commit) via f9f8f93adcc7161ebb18f5a0bf28c73d951a15ad (commit) via 3a70274c908e31453942b442351eab8423c1a53d (commit) via 223ef6c08efb52251d0a772bb0c481b2803cf0ce (commit) via fba00736c870f449c0eee32fe0d7b0d539dca51f (commit) via 82e826253b6d18832931dbb5c1dda009889bf9e0 (commit) via c70eba87dbbac6c2c1e68c343cdd410577c1686f (commit) from 2e8766145ad2e8c666ecdc6c39e97ba302b16e04 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit da2179ee5d5b6094ab63a9d9d6a8d59893937087 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 11:01:09 2008 +0200 libreplace: try to fix the build on HP-UX which has if_nametoindex() in -lipv6 metze commit 3fddd36e119f73a5021370450f9687ef9d252bab Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:39:41 2008 +0200 libreplace: make sure system/network.h is only used when AC_LIBREPLACE_NETWORK_CHECKS was used metze commit aa7ef1af746319a3d771decd0ec03dabe8b8ad28 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:32:19 2008 +0200 libreplace: export LIBREPLACE_NETWORK_OBJS and LIBREPLACE_NETWORK_LIBS vars metze commit 67845d3471711d24069636d0d4032f9d53748334 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:27:23 2008 +0200 libreplace: include inet_ntoa.o when the system one is broken metze commit 0234d397fefee8e1d0dcd3402f748c2251021c90 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:08:42 2008 +0200 libreplace: merge getifaddrs.m4 into libreplace_network.m4 metze commit 64591d064dc3da6074f0f7539911a6e433d9cc43 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:06:39 2008 +0200 libreplace: merge getaddrinfo.m4 into libreplace_network.m4 metze commit f9f8f93adcc7161ebb18f5a0bf28c73d951a15ad Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:04:51 2008 +0200 libreplace: merge socketpair.m4 into libreplace_network.m4 metze commit 3a70274c908e31453942b442351eab8423c1a53d Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:02:21 2008 +0200 libreplace: merge inet_pton.m4 into libreplace_network.m4 metze commit 223ef6c08efb52251d0a772bb0c481b2803cf0ce Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 10:00:58 2008 +0200 libreplace: merge inet_ntop.m4 into libreplace_network.m4 metze commit fba00736c870f449c0eee32fe0d7b0d539dca51f Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 09:59:16 2008 +0200 libreplace: merge inet_aton.m4 into libreplace_network.m4 metze commit 82e826253b6d18832931dbb5c1dda009889bf9e0 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 09:58:07 2008 +0200 libreplace: merge inet_ntoa.m4 into libreplace_network.m4 metze commit c70eba87dbbac6c2c1e68c343cdd410577c1686f Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Thu May 8 09:56:10 2008 +0200 libreplace: merge socket.m4 into libreplace_network.m4 metze --- Summary of changes: source/lib/replace/getaddrinfo.m4| 32 source/lib/replace/getifaddrs.m4 | 128 --- source/lib/replace/inet_aton.m4 |1 - source/lib/replace/inet_ntoa.m4 | 19 --- source/lib/replace/inet_ntop.m4 |1 - source/lib/replace/inet_pton.m4 |1 - source/lib/replace/libreplace_network.m4 | 252 +- source/lib/replace/socket.m4 | 39 - source/lib/replace/socketpair.m4 |1 - source/lib/replace/system/network.h |4 + 10 files changed, 248 insertions(+), 230 deletions(-) delete mode 100644 source/lib/replace/getaddrinfo.m4 delete mode 100644 source/lib/replace/getifaddrs.m4 delete mode 100644 source/lib/replace/inet_aton.m4 delete mode 100644 source/lib/replace/inet_ntoa.m4 delete mode 100644 source/lib/replace/inet_ntop.m4 delete mode 100644 source/lib/replace/inet_pton.m4 delete mode 100644 source/lib/replace/socket.m4 delete mode 100644 source/lib/replace/socketpair.m4 Changeset truncated at 500 lines: diff --git a/source/lib/replace/getaddrinfo.m4 b/source/lib/replace/getaddrinfo.m4 deleted file mode 100644 index bc6e69e..000 --- a/source/lib/replace/getaddrinfo.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl test for getaddrinfo/getnameinfo -AC_CACHE_CHECK([for
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-72-g05f6cc5
The branch, v3-2-stable has been updated via 05f6cc5bc1833ce4f48842b43b2d542a4603f826 (commit) from fb691bab6b66c8b1f5535d6bfb5884a43fa38f4c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 05f6cc5bc1833ce4f48842b43b2d542a4603f826 Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue May 13 10:18:37 2008 +0200 man pages: Correct version string. As Samba 3.2 will be out soon, man pages should be correct for both versions, Samba 3.0 and 3.2. Karolin (cherry picked from commit 9c59c1895d8d3621f38b67ecf88109c81130c886) --- Summary of changes: docs-xml/manpages-3/findsmb.1.xml |2 +- docs-xml/manpages-3/libsmbclient.7.xml |2 +- docs-xml/manpages-3/lmhosts.5.xml |2 +- docs-xml/manpages-3/log2pcap.1.xml |2 +- docs-xml/manpages-3/nmbd.8.xml |2 +- docs-xml/manpages-3/nmblookup.1.xml|2 +- docs-xml/manpages-3/ntlm_auth.1.xml|2 +- docs-xml/manpages-3/pam_winbind.7.xml |2 +- docs-xml/manpages-3/pdbedit.8.xml |2 +- docs-xml/manpages-3/profiles.1.xml |2 +- docs-xml/manpages-3/rpcclient.1.xml|2 +- docs-xml/manpages-3/samba.7.xml|2 +- docs-xml/manpages-3/smb.conf.5.xml |2 +- docs-xml/manpages-3/smbcacls.1.xml |2 +- docs-xml/manpages-3/smbcontrol.1.xml |2 +- docs-xml/manpages-3/smbcquotas.1.xml |2 +- docs-xml/manpages-3/smbd.8.xml |2 +- docs-xml/manpages-3/smbget.1.xml |2 +- docs-xml/manpages-3/smbgetrc.5.xml |2 +- docs-xml/manpages-3/smbpasswd.5.xml|2 +- docs-xml/manpages-3/smbpasswd.8.xml|2 +- docs-xml/manpages-3/smbsh.1.xml|2 +- docs-xml/manpages-3/smbspool.8.xml |2 +- docs-xml/manpages-3/smbstatus.1.xml|2 +- docs-xml/manpages-3/smbtar.1.xml |2 +- docs-xml/manpages-3/smbtree.1.xml |2 +- docs-xml/manpages-3/swat.8.xml |2 +- docs-xml/manpages-3/tdbbackup.8.xml|2 +- docs-xml/manpages-3/tdbdump.8.xml |2 +- docs-xml/manpages-3/testparm.1.xml |2 +- docs-xml/manpages-3/vfstest.1.xml |2 +- docs-xml/manpages-3/wbinfo.1.xml |2 +- docs-xml/manpages-3/winbindd.8.xml |2 +- 33 files changed, 33 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages-3/findsmb.1.xml index 9161dc4..4824508 100644 --- a/docs-xml/manpages-3/findsmb.1.xml +++ b/docs-xml/manpages-3/findsmb.1.xml @@ -118,7 +118,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml index 61016c5..ec95004 100644 --- a/docs-xml/manpages-3/libsmbclient.7.xml +++ b/docs-xml/manpages-3/libsmbclient.7.xml @@ -119,7 +119,7 @@ titleVERSION/title para - This man page is correct for version 3.0 of the Samba suite. + This man page is correct for version 3 of the Samba suite. /para /refsect1 diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages-3/lmhosts.5.xml index ec27177..fca0616 100644 --- a/docs-xml/manpages-3/lmhosts.5.xml +++ b/docs-xml/manpages-3/lmhosts.5.xml @@ -93,7 +93,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages-3/log2pcap.1.xml index 48eb1a1..d6debe7 100644 --- a/docs-xml/manpages-3/log2pcap.1.xml +++ b/docs-xml/manpages-3/log2pcap.1.xml @@ -103,7 +103,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages-3/nmbd.8.xml index 5c17044..19e6f4f 100644 --- a/docs-xml/manpages-3/nmbd.8.xml +++ b/docs-xml/manpages-3/nmbd.8.xml @@ -254,7 +254,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages-3/nmblookup.1.xml index 3a8672c..85640da 100644 --- a/docs-xml/manpages-3/nmblookup.1.xml +++ b/docs-xml/manpages-3/nmblookup.1.xml @@ -191,7 +191,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2316-gac935a8
The branch, v3-2-test has been updated via ac935a80ceb61d23070bf82c2193e8389e752aaf (commit) from 437a59598d886b316fd58ca88ed40f5fb325c47f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit ac935a80ceb61d23070bf82c2193e8389e752aaf Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue May 13 10:18:37 2008 +0200 man pages: Correct version string. As Samba 3.2 will be out soon, man pages should be correct for both versions, Samba 3.0 and 3.2. Karolin (cherry picked from commit 9c59c1895d8d3621f38b67ecf88109c81130c886) --- Summary of changes: docs-xml/manpages-3/findsmb.1.xml |2 +- docs-xml/manpages-3/libsmbclient.7.xml |2 +- docs-xml/manpages-3/lmhosts.5.xml |2 +- docs-xml/manpages-3/log2pcap.1.xml |2 +- docs-xml/manpages-3/nmbd.8.xml |2 +- docs-xml/manpages-3/nmblookup.1.xml|2 +- docs-xml/manpages-3/ntlm_auth.1.xml|2 +- docs-xml/manpages-3/pam_winbind.7.xml |2 +- docs-xml/manpages-3/pdbedit.8.xml |2 +- docs-xml/manpages-3/profiles.1.xml |2 +- docs-xml/manpages-3/rpcclient.1.xml|2 +- docs-xml/manpages-3/samba.7.xml|2 +- docs-xml/manpages-3/smb.conf.5.xml |2 +- docs-xml/manpages-3/smbcacls.1.xml |2 +- docs-xml/manpages-3/smbcontrol.1.xml |2 +- docs-xml/manpages-3/smbcquotas.1.xml |2 +- docs-xml/manpages-3/smbd.8.xml |2 +- docs-xml/manpages-3/smbget.1.xml |2 +- docs-xml/manpages-3/smbgetrc.5.xml |2 +- docs-xml/manpages-3/smbpasswd.5.xml|2 +- docs-xml/manpages-3/smbpasswd.8.xml|2 +- docs-xml/manpages-3/smbsh.1.xml|2 +- docs-xml/manpages-3/smbspool.8.xml |2 +- docs-xml/manpages-3/smbstatus.1.xml|2 +- docs-xml/manpages-3/smbtar.1.xml |2 +- docs-xml/manpages-3/smbtree.1.xml |2 +- docs-xml/manpages-3/swat.8.xml |2 +- docs-xml/manpages-3/tdbbackup.8.xml|2 +- docs-xml/manpages-3/tdbdump.8.xml |2 +- docs-xml/manpages-3/testparm.1.xml |2 +- docs-xml/manpages-3/vfstest.1.xml |2 +- docs-xml/manpages-3/wbinfo.1.xml |2 +- docs-xml/manpages-3/winbindd.8.xml |2 +- 33 files changed, 33 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages-3/findsmb.1.xml index 9161dc4..4824508 100644 --- a/docs-xml/manpages-3/findsmb.1.xml +++ b/docs-xml/manpages-3/findsmb.1.xml @@ -118,7 +118,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml index 61016c5..ec95004 100644 --- a/docs-xml/manpages-3/libsmbclient.7.xml +++ b/docs-xml/manpages-3/libsmbclient.7.xml @@ -119,7 +119,7 @@ titleVERSION/title para - This man page is correct for version 3.0 of the Samba suite. + This man page is correct for version 3 of the Samba suite. /para /refsect1 diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages-3/lmhosts.5.xml index ec27177..fca0616 100644 --- a/docs-xml/manpages-3/lmhosts.5.xml +++ b/docs-xml/manpages-3/lmhosts.5.xml @@ -93,7 +93,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages-3/log2pcap.1.xml index 48eb1a1..d6debe7 100644 --- a/docs-xml/manpages-3/log2pcap.1.xml +++ b/docs-xml/manpages-3/log2pcap.1.xml @@ -103,7 +103,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of the Samba suite./para + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 refsect1 diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages-3/nmbd.8.xml index 5c17044..19e6f4f 100644 --- a/docs-xml/manpages-3/nmbd.8.xml +++ b/docs-xml/manpages-3/nmbd.8.xml @@ -254,7 +254,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man page is correct for version 3 of the Samba suite./para /refsect1 diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages-3/nmblookup.1.xml index 3a8672c..85640da 100644 --- a/docs-xml/manpages-3/nmblookup.1.xml +++ b/docs-xml/manpages-3/nmblookup.1.xml @@ -191,7 +191,7 @@ refsect1 titleVERSION/title - paraThis man page is correct for version 3.0 of + paraThis man
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2418-g443691e
The branch, v3-3-test has been updated
via 443691eb2614919043406f94e9c71b49230612d5 (commit)
from 9c59c1895d8d3621f38b67ecf88109c81130c886 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 443691eb2614919043406f94e9c71b49230612d5
Author: Karolin Seeger [EMAIL PROTECTED]
Date: Tue May 13 14:01:52 2008 +0200
tests_all.sh: Do not execute $SMB4TORTURE --version if it is not available.
Improve error message if no SMB4TORTURE is available.
Karolin
---
Summary of changes:
source/script/tests/tests_all.sh |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index 5a6b467..fa62a51 100755
--- a/source/script/tests/tests_all.sh
+++ b/source/script/tests/tests_all.sh
@@ -52,7 +52,9 @@ posix_s3() {
echo RUNNING TESTS posix_s3
eval $LIB_PATH_VAR=\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR; export
$LIB_PATH_VAR
eval echo $LIB_PATH_VAR=\$$LIB_PATH_VAR
- SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ if [ -x $SMBTORTURE4 ]; then
+ SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ fi
if [ -n $SMBTORTURE4 -a -n $SMBTORTURE4VERSION ];then
echo Running Tests with Samba4's smbtorture
echo $SMBTORTURE4VERSION
@@ -61,6 +63,7 @@ posix_s3() {
|| failed=`expr $failed + $?`
else
echo Skip Tests with Samba4's smbtorture
+ echo Try to compile with --with-smbtorture4-path=PATH to
enable
fi
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1159-g660be61
The branch, v3-0-test has been updated
via 660be616b85a32725841877041190a6ec0f122f1 (commit)
via 968ff01d5163b232e10276efbcfd6750f97d81a5 (commit)
from deefb1a4bcfdbbf7d045948598140c477591ea44 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 660be616b85a32725841877041190a6ec0f122f1
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 16:23:19 2008 +0200
Fix signing problem in the client with transs requests
This is a different fix than Jeremy put into 3-0-test with 040db1ce85 and
other
branches with different hashes. Jeremy, I think your fix led to bug 5436,
so I
reverted your fix. This fixes the original problem I found with the transs
requests for large rpc queries in a different way. Please check!
Thanks,
Volker
commit 968ff01d5163b232e10276efbcfd6750f97d81a5
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 16:41:23 2008 +0200
Revert Fix signing bug found by Volker. That one was *subtle*.
This reverts commit 040db1ce851909704d093538ba063863fa11f73e.
---
Summary of changes:
source/libsmb/clitrans.c| 17 +
source/libsmb/smb_signing.c | 79 ---
2 files changed, 91 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index f43a2aa..441f5a0 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -95,9 +95,14 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -108,6 +113,9 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
+ client_set_trans_sign_state_off(cli, mid);
+ client_set_trans_sign_state_on(cli, mid);
+
set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -139,6 +147,7 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -317,6 +326,7 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
out:
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
@@ -384,9 +394,14 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -428,6 +443,7 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -627,5 +643,6 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
out:
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
diff --git a/source/libsmb/smb_signing.c b/source/libsmb/smb_signing.c
index 6768c2a..df74b2d 100644
--- a/source/libsmb/smb_signing.c
+++ b/source/libsmb/smb_signing.c
@@ -26,6 +26,7 @@ struct outstanding_packet_lookup {
struct outstanding_packet_lookup *prev, *next;
uint16 mid;
uint32 reply_seq_num;
+ BOOL can_delete; /* Set to False in trans state. */
};
struct smb_basic_signing_context {
@@ -42,9 +43,7 @@ static BOOL store_sequence_for_reply(struct
outstanding_packet_lookup **list,
/* Ensure we only add a mid once. */
for (t = *list; t; t = t-next) {
if (t-mid ==
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2420-gc572d53
The branch, v3-3-test has been updated
via c572d537e088a3fffb057181cad9a3692e40b815 (commit)
via e402e6508ca0806deef4c4044cfa6461b682850a (commit)
from 443691eb2614919043406f94e9c71b49230612d5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c572d537e088a3fffb057181cad9a3692e40b815
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 16:23:19 2008 +0200
Fix signing problem in the client with transs requests
This is a different fix than Jeremy put into 3-0-test with 040db1ce85 and
other
branches with different hashes. Jeremy, I think your fix led to bug 5436,
so I
reverted your fix. This fixes the original problem I found with the transs
requests for large rpc queries in a different way. Please check!
Thanks,
Volker
commit e402e6508ca0806deef4c4044cfa6461b682850a
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 15:19:46 2008 +0200
Revert Fix signing bug found by Volker. That one was *subtle*.
This reverts commit 816aea6c1a426eb2450061b847729e22bdac33a0.
---
Summary of changes:
source/libsmb/clitrans.c| 17 +
source/libsmb/smb_signing.c | 79 ---
2 files changed, 91 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index bfb31fd..4bb70f1 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -94,9 +94,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -107,6 +112,9 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
+ client_set_trans_sign_state_off(cli, mid);
+ client_set_trans_sign_state_on(cli, mid);
+
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,6 +146,7 @@ bool cli_send_trans(struct cli_state *cli, int trans,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -344,6 +353,7 @@ bool cli_receive_trans(struct cli_state *cli,int trans,
}
}
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
@@ -411,9 +421,14 @@ bool cli_send_nt_trans(struct cli_state *cli,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -455,6 +470,7 @@ bool cli_send_nt_trans(struct cli_state *cli,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -682,5 +698,6 @@ bool cli_receive_nt_trans(struct cli_state *cli,
}
}
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
diff --git a/source/libsmb/smb_signing.c b/source/libsmb/smb_signing.c
index bd6d971..ea1eb05 100644
--- a/source/libsmb/smb_signing.c
+++ b/source/libsmb/smb_signing.c
@@ -25,6 +25,7 @@ struct outstanding_packet_lookup {
struct outstanding_packet_lookup *prev, *next;
uint16 mid;
uint32 reply_seq_num;
+ bool can_delete; /* Set to False in trans state. */
};
struct smb_basic_signing_context {
@@ -41,9 +42,7 @@ static bool store_sequence_for_reply(struct
outstanding_packet_lookup **list,
/* Ensure we only add a mid once. */
for (t = *list; t; t = t-next) {
if (t-mid == mid) {
-
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2318-g6200e88
The branch, v3-2-test has been updated
via 6200e8886b29469cb1dbbe441e4f642fb28b83f2 (commit)
via 67f90361a07841972a01a4faf575da25e29c (commit)
from ac935a80ceb61d23070bf82c2193e8389e752aaf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 6200e8886b29469cb1dbbe441e4f642fb28b83f2
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 16:23:19 2008 +0200
Fix signing problem in the client with transs requests
This is a different fix than Jeremy put into 3-0-test with 040db1ce85 and
other
branches with different hashes. Jeremy, I think your fix led to bug 5436,
so I
reverted your fix. This fixes the original problem I found with the transs
requests for large rpc queries in a different way. Please check!
Thanks,
Volker
commit 67f90361a07841972a01a4faf575da25e29c
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue May 13 16:56:06 2008 +0200
Revert Fix signing bug found by Volker. That one was *subtle*.
This reverts commit 816aea6c1a426eb2450061b847729e22bdac33a0.
---
Summary of changes:
source/libsmb/clitrans.c| 17 +
source/libsmb/smb_signing.c | 79 ---
2 files changed, 91 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index bfb31fd..4bb70f1 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -94,9 +94,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -107,6 +112,9 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
+ client_set_trans_sign_state_off(cli, mid);
+ client_set_trans_sign_state_on(cli, mid);
+
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,6 +146,7 @@ bool cli_send_trans(struct cli_state *cli, int trans,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -344,6 +353,7 @@ bool cli_receive_trans(struct cli_state *cli,int trans,
}
}
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
@@ -411,9 +421,14 @@ bool cli_send_nt_trans(struct cli_state *cli,
return False;
}
+ /* Note we're in a trans state. Save the sequence
+* numbers for replies. */
+ client_set_trans_sign_state_on(cli, mid);
+
if (this_ldata ldata || this_lparam lparam) {
/* receive interim response */
if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return(False);
}
@@ -455,6 +470,7 @@ bool cli_send_nt_trans(struct cli_state *cli,
show_msg(cli-outbuf);
if (!cli_send_smb(cli)) {
+ client_set_trans_sign_state_off(cli, mid);
return False;
}
@@ -682,5 +698,6 @@ bool cli_receive_nt_trans(struct cli_state *cli,
}
}
+ client_set_trans_sign_state_off(cli, SVAL(cli-inbuf,smb_mid));
return ret;
}
diff --git a/source/libsmb/smb_signing.c b/source/libsmb/smb_signing.c
index bd6d971..ea1eb05 100644
--- a/source/libsmb/smb_signing.c
+++ b/source/libsmb/smb_signing.c
@@ -25,6 +25,7 @@ struct outstanding_packet_lookup {
struct outstanding_packet_lookup *prev, *next;
uint16 mid;
uint32 reply_seq_num;
+ bool can_delete; /* Set to False in trans state. */
};
struct smb_basic_signing_context {
@@ -41,9 +42,7 @@ static bool store_sequence_for_reply(struct
outstanding_packet_lookup **list,
/* Ensure we only add a mid once. */
for (t = *list; t; t = t-next) {
if (t-mid == mid) {
-
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2318-g6200e88
On Tue, May 13, 2008 at 10:02:43AM -0500, Volker Lendecke wrote: The branch, v3-2-test has been updated via 6200e8886b29469cb1dbbe441e4f642fb28b83f2 (commit) via 67f90361a07841972a01a4faf575da25e29c (commit) from ac935a80ceb61d23070bf82c2193e8389e752aaf (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 6200e8886b29469cb1dbbe441e4f642fb28b83f2 Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue May 13 16:23:19 2008 +0200 Fix signing problem in the client with transs requests This is a different fix than Jeremy put into 3-0-test with 040db1ce85 and other branches with different hashes. Jeremy, I think your fix led to bug 5436, so I reverted your fix. This fixes the original problem I found with the transs requests for large rpc queries in a different way. Please check! Karolin, this one is a must-pull for 3.2-stable. Thanks ! Jeremy.
Re: [SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1159-g660be61
On Tue, May 13, 2008 at 09:54:06AM -0500, Volker Lendecke wrote: The branch, v3-0-test has been updated via 660be616b85a32725841877041190a6ec0f122f1 (commit) via 968ff01d5163b232e10276efbcfd6750f97d81a5 (commit) from deefb1a4bcfdbbf7d045948598140c477591ea44 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 660be616b85a32725841877041190a6ec0f122f1 Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue May 13 16:23:19 2008 +0200 Fix signing problem in the client with transs requests This is a different fix than Jeremy put into 3-0-test with 040db1ce85 and other branches with different hashes. Jeremy, I think your fix led to bug 5436, so I reverted your fix. This fixes the original problem I found with the transs requests for large rpc queries in a different way. Please check! Ok, examining this it looks like the key to this patch is that you call : client_set_trans_sign_state_off(cli, mid); client_set_trans_sign_state_on(cli, mid); to delete the mid record for the previous sequence, and then re-add it for the new outgoing packet - incrementing the sequence number now rather than the old version of this fix which kept the sequence number constant. Correct ? If so then I understand it and well done and thanks :-). Call me if you need to discuss, I'm on my cell @ Connectathon at the moment. Jeremy.
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2422-g31614cd
The branch, v3-3-test has been updated
via 31614cd5e08dd6389c66e6ddf9f2d5429c6ab033 (commit)
via cb5e8f60ac3313aec726c01687a040e6e0e42c10 (commit)
from c572d537e088a3fffb057181cad9a3692e40b815 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 31614cd5e08dd6389c66e6ddf9f2d5429c6ab033
Author: coffeedude [EMAIL PROTECTED]
Date: Tue May 13 12:58:52 2008 -0500
libwbclient: Abstract the DS_XXX flags for DsGetDcName().
The wbcLookupDomainController() call supports a set of flags
defined in wbclient.h. Add a mapping function between these
flags and the original DS_XXX flags in order to prevent having
to include the generated RPC headers in wbclient.h.
commit cb5e8f60ac3313aec726c01687a040e6e0e42c10
Author: coffeedude [EMAIL PROTECTED]
Date: Tue May 13 12:52:20 2008 -0500
libwbclient: Add wbcLogoffUser() and wbcLookupDomainController().
Add new APIs calls for WINBINDD_PAM_LOGOFF and WINBINDD_DSGETDCNAME
ops.
---
Summary of changes:
source/nsswitch/libwbclient/wbc_pam.c | 52 ++
source/nsswitch/libwbclient/wbc_util.c | 62 ++-
source/nsswitch/libwbclient/wbclient.c |4 ++
source/nsswitch/libwbclient/wbclient.h | 44 ++-
source/winbindd/winbindd.h |1 +
source/winbindd/winbindd_locator.c | 46 +++-
6 files changed, 205 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/libwbclient/wbc_pam.c
b/source/nsswitch/libwbclient/wbc_pam.c
index a0e91fa..a3fb212 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -470,3 +470,55 @@ wbcErr wbcCheckTrustCredentials(const char *domain,
done:
return wbc_status;
}
+
+/** @brief Trigger a logoff notification to Winbind for a specific user
+ *
+ * @param usernameName of user to remove from Winbind's list of
+ *logged on users.
+ * @param uid Uid assigned to the username
+ * @param ccfilename Absolute path to the Krb5 credentials cache to
+ *be removed
+ *
+ * @return #wbcErr
+ *
+ **/
+
+wbcErr wbcLogoffUser(const char *username,
+uid_t uid,
+const char *ccfilename)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ struct passwd *pw = NULL;
+
+ /* validate input */
+
+ if (!username) {
+ wbc_status = WBC_ERR_INVALID_PARAM;
+ BAIL_ON_WBC_ERROR(wbc_status);
+ }
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ strncpy(request.data.logoff.user, username,
+ sizeof(request.data.logoff.user)-1);
+ request.data.logoff.uid = uid;
+
+ if (ccfilename) {
+ strncpy(request.data.logoff.krb5ccname, ccfilename,
+ sizeof(request.data.logoff.krb5ccname)-1);
+ }
+
+ /* Send request */
+
+ wbc_status = wbcRequestResponse(WINBINDD_PAM_LOGOFF,
+ request,
+ response);
+
+ /* Take the response above and return it to the caller */
+
+ done:
+ return wbc_status;
+}
diff --git a/source/nsswitch/libwbclient/wbc_util.c
b/source/nsswitch/libwbclient/wbc_util.c
index 3afd8a2..24568f9 100644
--- a/source/nsswitch/libwbclient/wbc_util.c
+++ b/source/nsswitch/libwbclient/wbc_util.c
@@ -272,7 +272,7 @@ wbcErr wbcResolveWinsByIP(const char *ip, char **name)
/**
*/
-static wbcErr process_domain_info_string(TALLOC_CTX *ctx,
+static wbcErr process_domain_info_string(TALLOC_CTX *ctx,
struct wbcDomainInfo *info,
char *info_string)
{
@@ -437,7 +437,7 @@ wbcErr wbcListTrusts(struct wbcDomainInfo **domains, size_t
*num_domains)
p = (char *)response.extra_data.data;
if (strlen(p) == 0) {
- /* We should always at least get back our
+ /* We should always at least get back our
own SAM domain */
wbc_status = WBC_ERR_DOMAIN_NOT_FOUND;
@@ -492,3 +492,61 @@ wbcErr wbcListTrusts(struct wbcDomainInfo **domains,
size_t *num_domains)
return wbc_status;
}
+
+/** @brief Enumerate the domain trusts known by Winbind
+ *
+ * @param domainName of the domain to query for a DC
+ * @flags Bit flags used to control the domain location query
+ * @param *dc_info Pointer to the returned domain controller information
+ *
+ * @return #wbcErr
+ *
+ **/
+
+
+
+wbcErr wbcLookupDomainController(const char *domain,
+
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1160-g8998e18
The branch, v3-0-test has been updated
via 8998e18a2f3c7a0095614e58992a2facb34a3bc3 (commit)
from 660be616b85a32725841877041190a6ec0f122f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 8998e18a2f3c7a0095614e58992a2facb34a3bc3
Author: Jim McDonough [EMAIL PROTECTED]
Date: Tue May 13 16:29:53 2008 -0400
Enable winbind child processes to do something with signals,
in particular closing and reopening logs on SIGHUP.
---
Summary of changes:
source/nsswitch/winbindd.c | 31 +--
source/nsswitch/winbindd_dual.c |4
2 files changed, 25 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 18abdab..636d635 100644
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -718,6 +718,25 @@ static BOOL remove_idle_client(void)
return False;
}
+/* check if HUP has been received and reload files */
+void winbind_check_sighup(void)
+{
+ if (do_sighup) {
+
+ DEBUG(3, (got SIGHUP\n));
+
+ msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0),
NULL, 0, NULL);
+ do_sighup = False;
+ }
+}
+
+/* check if TERM has been received */
+void winbind_check_sigterm(void)
+{
+ if (do_sigterm)
+ terminate();
+}
+
/* Process incoming clients on listen_sock. We use a tricky non-blocking,
non-forking, non-threaded model which allows us to handle many
simultaneous connections while remaining impervious to many denial of
@@ -882,16 +901,8 @@ static void process_loop(void)
/* Check signal handling things */
- if (do_sigterm)
- terminate();
-
- if (do_sighup) {
-
- DEBUG(3, (got SIGHUP\n));
-
- msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0),
NULL, 0, NULL);
- do_sighup = False;
- }
+ winbind_check_sigterm();
+ winbind_check_sighup();
if (do_sigusr2) {
print_winbindd_status();
diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c
index e058110..937924d 100644
--- a/source/nsswitch/winbindd_dual.c
+++ b/source/nsswitch/winbindd_dual.c
@@ -1014,6 +1014,10 @@ static BOOL fork_domain_child(struct winbindd_child
*child)
lp_TALLOC_FREE();
main_loop_TALLOC_FREE();
+ /* check for signals */
+ winbind_check_sigterm();
+ winbind_check_sighup();
+
run_events(winbind_event_context(), 0, NULL, NULL);
GetTimeOfDay(now);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2423-ge1cda82
The branch, v3-3-test has been updated
via e1cda82f6f7de3306a653af920756c1640057f2d (commit)
from 31614cd5e08dd6389c66e6ddf9f2d5429c6ab033 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit e1cda82f6f7de3306a653af920756c1640057f2d
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 14:01:19 2008 -0700
Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
that sets the DFS bit on pathnames but doesn't
send DFS paths. This causes lookups to fail as
the smbd/msdfs.c code now just eats the first
two parts of the pathname and uses the rest as
the local path. The previous hostname check
used to protect us from that as we knew that
when the hostname was invalid it was a local
path (and a broken client).
I didn't want to put that check back in, but
came up with another idea - even though the
hostname can be a different one, the sharename
must be valid on this machine. So we can check
for a valid sharename instead.
Jeremy.
---
Summary of changes:
source/smbd/conn.c | 25 +++--
source/smbd/msdfs.c | 10 ++
2 files changed, 33 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index e899af1..125277b 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -63,10 +63,10 @@ bool conn_snum_used(int snum)
return(False);
}
-
/
-find a conn given a cnum
+ Find a conn given a cnum.
/
+
connection_struct *conn_find(unsigned cnum)
{
int count=0;
@@ -84,6 +84,27 @@ connection_struct *conn_find(unsigned cnum)
return NULL;
}
+/
+ Find a conn given a service name.
+/
+
+connection_struct *conn_find_byname(const char *service)
+{
+ int count=0;
+ connection_struct *conn;
+
+ for (conn=Connections;conn;conn=conn-next,count++) {
+ if (strequal(lp_servicename(SNUM(conn)),service)) {
+ if (count 10) {
+ DLIST_PROMOTE(Connections, conn);
+ }
+ return conn;
+ }
+ }
+
+ return NULL;
+}
+
/
find first available connection slot, starting from a random position.
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index e321a8c..6306745 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -133,6 +133,16 @@ static NTSTATUS parse_dfs_path(const char *pathname,
if(p == NULL) {
pdp-servicename = temp;
pdp-reqpath = eos_ptr; /* */
+ /* Is this really our servicename ? */
+ if (NULL == conn_find_byname(pdp-servicename)) {
+ DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
+ pdp-servicename));
+ p = temp;
+ DEBUG(10,(parse_dfs_path: trying to convert %s
+ to a local path\n,
+ temp));
+ goto local_path;
+ }
return NT_STATUS_OK;
}
*p = '\0';
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2319-g5c6ed77
The branch, v3-2-test has been updated
via 5c6ed7774220dea30c2c8a564648406b4f3eacbf (commit)
from 6200e8886b29469cb1dbbe441e4f642fb28b83f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 5c6ed7774220dea30c2c8a564648406b4f3eacbf
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 14:03:21 2008 -0700
Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
that sets the DFS bit on pathnames but doesn't
send DFS paths. This causes lookups to fail as
the smbd/msdfs.c code now just eats the first
two parts of the pathname and uses the rest as
the local path. The previous hostname check
used to protect us from that as we knew that
when the hostname was invalid it was a local
path (and a broken client).
I didn't want to put that check back in, but
came up with another idea - even though the
hostname can be a different one, the sharename
must be valid on this machine. So we can check
for a valid sharename instead.
Jeremy.
---
Summary of changes:
source/smbd/conn.c | 25 +++--
source/smbd/msdfs.c | 10 ++
2 files changed, 33 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index 5aedadc..1a55522 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -63,10 +63,10 @@ bool conn_snum_used(int snum)
return(False);
}
-
/
-find a conn given a cnum
+ Find a conn given a cnum.
/
+
connection_struct *conn_find(unsigned cnum)
{
int count=0;
@@ -84,6 +84,27 @@ connection_struct *conn_find(unsigned cnum)
return NULL;
}
+/
+ Find a conn given a service name.
+/
+
+connection_struct *conn_find_byname(const char *service)
+{
+ int count=0;
+ connection_struct *conn;
+
+ for (conn=Connections;conn;conn=conn-next,count++) {
+ if (strequal(lp_servicename(SNUM(conn)),service)) {
+ if (count 10) {
+ DLIST_PROMOTE(Connections, conn);
+ }
+ return conn;
+ }
+ }
+
+ return NULL;
+}
+
/
find first available connection slot, starting from a random position.
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 4f9e739..7400f79 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -133,6 +133,16 @@ static NTSTATUS parse_dfs_path(const char *pathname,
if(p == NULL) {
pdp-servicename = temp;
pdp-reqpath = eos_ptr; /* */
+ /* Is this really our servicename ? */
+ if (NULL == conn_find_byname(pdp-servicename)) {
+ DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
+ pdp-servicename));
+ p = temp;
+ DEBUG(10,(parse_dfs_path: trying to convert %s
+ to a local path\n,
+ temp));
+ goto local_path;
+ }
return NT_STATUS_OK;
}
*p = '\0';
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2320-gc3328a2
The branch, v3-2-test has been updated
via c3328a252430007cd716a406d85fd2a0bbbff607 (commit)
from 5c6ed7774220dea30c2c8a564648406b4f3eacbf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c3328a252430007cd716a406d85fd2a0bbbff607
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:02:53 2008 -0700
Second part of patch for bug #5460. Cope with pathnames
that don't look like \xxx\yyy, cope with arbitrary length.
Jeremy.
---
Summary of changes:
source/smbd/msdfs.c | 54 --
1 files changed, 39 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 7400f79..4408c63 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -49,6 +49,7 @@ static NTSTATUS parse_dfs_path(const char *pathname,
{
char *pathname_local;
char *p,*temp;
+ char *servicename;
char *eos_ptr;
NTSTATUS status = NT_STATUS_OK;
char sepchar;
@@ -128,25 +129,48 @@ static NTSTATUS parse_dfs_path(const char *pathname,
DEBUG(10,(parse_dfs_path: hostname: %s\n,pdp-hostname));
/* Parse out servicename. */
- temp = p+1;
- p = strchr_m(temp,sepchar);
+ servicename = p+1;
+ p = strchr_m(servicename,sepchar);
+ if (p) {
+ *p = '\0';
+ }
+
+ /* Is this really our servicename ? */
+ if (NULL == conn_find_byname(servicename)) {
+ DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
+ servicename));
+
+ /*
+* Possibly client sent a local path by mistake.
+* Try and convert to a local path.
+*/
+
+ pdp-hostname = eos_ptr; /* */
+ pdp-servicename = eos_ptr; /* */
+
+ /* Repair the path - replace the sepchar's
+ we nulled out */
+ servicename--;
+ *servicename = sepchar;
+ if (p) {
+ *p = sepchar;
+ }
+
+ p = temp;
+ DEBUG(10,(parse_dfs_path: trying to convert %s
+ to a local path\n,
+ temp));
+ goto local_path;
+ }
+
+ pdp-servicename = servicename;
+
if(p == NULL) {
- pdp-servicename = temp;
+ /* Client sent self referral \server\share. */
pdp-reqpath = eos_ptr; /* */
- /* Is this really our servicename ? */
- if (NULL == conn_find_byname(pdp-servicename)) {
- DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
- pdp-servicename));
- p = temp;
- DEBUG(10,(parse_dfs_path: trying to convert %s
- to a local path\n,
- temp));
- goto local_path;
- }
return NT_STATUS_OK;
}
- *p = '\0';
- pdp-servicename = temp;
+
DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
p++;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2424-g635035d
The branch, v3-3-test has been updated
via 635035d999fcd8e06b70c8cb1137127c289dc9e6 (commit)
from e1cda82f6f7de3306a653af920756c1640057f2d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 635035d999fcd8e06b70c8cb1137127c289dc9e6
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:02:11 2008 -0700
Second part of patch for bug #5460. Cope with pathnames
that don't look like \xxx\yyy, cope with arbitrary length.
Jeremy.
---
Summary of changes:
source/smbd/msdfs.c | 54 --
1 files changed, 39 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 6306745..4e673d8 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -49,6 +49,7 @@ static NTSTATUS parse_dfs_path(const char *pathname,
{
char *pathname_local;
char *p,*temp;
+ char *servicename;
char *eos_ptr;
NTSTATUS status = NT_STATUS_OK;
char sepchar;
@@ -128,25 +129,48 @@ static NTSTATUS parse_dfs_path(const char *pathname,
DEBUG(10,(parse_dfs_path: hostname: %s\n,pdp-hostname));
/* Parse out servicename. */
- temp = p+1;
- p = strchr_m(temp,sepchar);
+ servicename = p+1;
+ p = strchr_m(servicename,sepchar);
+ if (p) {
+ *p = '\0';
+ }
+
+ /* Is this really our servicename ? */
+ if (NULL == conn_find_byname(servicename)) {
+ DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
+ servicename));
+
+ /*
+* Possibly client sent a local path by mistake.
+* Try and convert to a local path.
+*/
+
+ pdp-hostname = eos_ptr; /* */
+ pdp-servicename = eos_ptr; /* */
+
+ /* Repair the path - replace the sepchar's
+ we nulled out */
+ servicename--;
+ *servicename = sepchar;
+ if (p) {
+ *p = sepchar;
+ }
+
+ p = temp;
+ DEBUG(10,(parse_dfs_path: trying to convert %s
+ to a local path\n,
+ temp));
+ goto local_path;
+ }
+
+ pdp-servicename = servicename;
+
if(p == NULL) {
- pdp-servicename = temp;
+ /* Client sent self referral \server\share. */
pdp-reqpath = eos_ptr; /* */
- /* Is this really our servicename ? */
- if (NULL == conn_find_byname(pdp-servicename)) {
- DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
- pdp-servicename));
- p = temp;
- DEBUG(10,(parse_dfs_path: trying to convert %s
- to a local path\n,
- temp));
- goto local_path;
- }
return NT_STATUS_OK;
}
- *p = '\0';
- pdp-servicename = temp;
+
DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
p++;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2425-g08d168f
The branch, v3-3-test has been updated
via 08d168f0e5b8fb07e95a5118a839e0da53e9d363 (commit)
from 635035d999fcd8e06b70c8cb1137127c289dc9e6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 08d168f0e5b8fb07e95a5118a839e0da53e9d363
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:25:26 2008 -0700
Fix debug message.
Jeremy.
---
Summary of changes:
source/smbd/msdfs.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 4e673d8..04b9b7d 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -165,14 +165,14 @@ static NTSTATUS parse_dfs_path(const char *pathname,
pdp-servicename = servicename;
+ DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
+
if(p == NULL) {
/* Client sent self referral \server\share. */
pdp-reqpath = eos_ptr; /* */
return NT_STATUS_OK;
}
- DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
-
p++;
local_path:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2321-g0a68f23
The branch, v3-2-test has been updated
via 0a68f230cd92b97efed2b3bad19a3bf9a750d401 (commit)
from c3328a252430007cd716a406d85fd2a0bbbff607 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 0a68f230cd92b97efed2b3bad19a3bf9a750d401
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:25:14 2008 -0700
Fix debug message.
Jeremy.
---
Summary of changes:
source/smbd/msdfs.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 4408c63..eaa66ef 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -165,14 +165,14 @@ static NTSTATUS parse_dfs_path(const char *pathname,
pdp-servicename = servicename;
+ DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
+
if(p == NULL) {
/* Client sent self referral \server\share. */
pdp-reqpath = eos_ptr; /* */
return NT_STATUS_OK;
}
- DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
-
p++;
local_path:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1161-ga48a45b
The branch, v3-0-test has been updated
via a48a45bda33a3d46c30b425c802aa5cff19dd92e (commit)
from 8998e18a2f3c7a0095614e58992a2facb34a3bc3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit a48a45bda33a3d46c30b425c802aa5cff19dd92e
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue May 13 15:26:17 2008 -0700
Combination patch back port of :
Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
that sets the DFS bit on pathnames but doesn't
send DFS paths. This causes lookups to fail as
the smbd/msdfs.c code now just eats the first
two parts of the pathname and uses the rest as
the local path. The previous hostname check
used to protect us from that as we knew that
when the hostname was invalid it was a local
path (and a broken client).
I didn't want to put that check back in, but
came up with another idea - even though the
hostname can be a different one, the sharename
must be valid on this machine. So we can check
for a valid sharename instead.
Second part of patch for bug #5460. Cope with pathnames
that don't look like \xxx\yyy, cope with arbitrary length.
Jeremy.
Fix debug message.
Jeremy.
---
Summary of changes:
source/smbd/conn.c | 25 +++--
source/smbd/msdfs.c | 47 +++
2 files changed, 62 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index 282a82c..bd1f490 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -64,10 +64,10 @@ BOOL conn_snum_used(int snum)
return(False);
}
-
/
-find a conn given a cnum
+ Find a conn given a cnum.
/
+
connection_struct *conn_find(unsigned cnum)
{
int count=0;
@@ -85,6 +85,27 @@ connection_struct *conn_find(unsigned cnum)
return NULL;
}
+/
+ Find a conn given a service name.
+/
+
+connection_struct *conn_find_byname(const char *service)
+{
+ int count=0;
+ connection_struct *conn;
+
+ for (conn=Connections;conn;conn=conn-next,count++) {
+ if (strequal(lp_servicename(SNUM(conn)),service)) {
+ if (count 10) {
+ DLIST_PROMOTE(Connections, conn);
+ }
+ return conn;
+ }
+ }
+
+ return NULL;
+}
+
/
find first available connection slot, starting from a random position.
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 982d0ae..e89f24a 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -46,7 +46,7 @@ static NTSTATUS parse_dfs_path(const char *pathname,
BOOL *ppath_contains_wcard)
{
pstring pathname_local;
- char *p,*temp;
+ char *p,*temp, *servicename;
NTSTATUS status = NT_STATUS_OK;
char sepchar;
@@ -107,17 +107,48 @@ static NTSTATUS parse_dfs_path(const char *pathname,
DEBUG(10,(parse_dfs_path: hostname: %s\n,pdp-hostname));
/* Parse out servicename. */
- temp = p+1;
- p = strchr_m(temp,sepchar);
+ servicename = p+1;
+ p = strchr_m(servicename,sepchar);
+ if (p) {
+ *p = '\0';
+ }
+
+ /* Is this really our servicename ? */
+ if (NULL == conn_find_byname(servicename)) {
+ DEBUG(10,(parse_dfs_path: %s is not our servicename\n,
+ servicename));
+
+ /*
+* Possibly client sent a local path by mistake.
+* Try and convert to a local path.
+*/
+
+ pdp-hostname[0] = '\0';
+ pdp-servicename[0] = '\0';
+
+ /* Repair the path - replace the sepchar's
+ we nulled out */
+ servicename--;
+ *servicename = sepchar;
+ if (p) {
+ *p = sepchar;
+ }
+
+ p = temp;
+ DEBUG(10,(parse_dfs_path: trying to convert %s
+ to a local path\n,
+ temp));
+ goto local_path;
+ }
+
+ fstrcpy(pdp-servicename,servicename);
+
+ DEBUG(10,(parse_dfs_path: servicename: %s\n,pdp-servicename));
+
if(p == NULL) {
-
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2427-g6dd44eb
The branch, v3-3-test has been updated
via 6dd44ebf22762e852b43e7dbcd095a58cc45abad (commit)
via 0f7b11accec7df1c0e9a9dc0828a5e0c5ddec4cb (commit)
from 08d168f0e5b8fb07e95a5118a839e0da53e9d363 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 6dd44ebf22762e852b43e7dbcd095a58cc45abad
Merge: 0f7b11accec7df1c0e9a9dc0828a5e0c5ddec4cb
08d168f0e5b8fb07e95a5118a839e0da53e9d363
Author: Jim McDonough [EMAIL PROTECTED]
Date: Tue May 13 18:42:18 2008 -0400
Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
commit 0f7b11accec7df1c0e9a9dc0828a5e0c5ddec4cb
Author: Jim McDonough [EMAIL PROTECTED]
Date: Tue May 13 16:57:01 2008 -0400
Enable winbind child processes to do something with signals,
in particular closing and reopening logs on SIGHUP.
Conflicts:
source/winbindd/winbindd.c
---
Summary of changes:
source/winbindd/winbindd.c | 35 +++
source/winbindd/winbindd_dual.c |4
2 files changed, 27 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 1072f8e..57eee20 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -795,6 +795,27 @@ static bool remove_idle_client(void)
return False;
}
+/* check if HUP has been received and reload files */
+void winbind_check_sighup(void)
+{
+ if (do_sighup) {
+
+ DEBUG(3, (got SIGHUP\n));
+
+ flush_caches();
+ reload_services_file();
+
+ do_sighup = False;
+ }
+}
+
+/* check if TERM has been received */
+void winbind_check_sigterm(void)
+{
+ if (do_sigterm)
+ terminate();
+}
+
/* Process incoming clients on listen_sock. We use a tricky non-blocking,
non-forking, non-threaded model which allows us to handle many
simultaneous connections while remaining impervious to many denial of
@@ -954,18 +975,8 @@ static void process_loop(void)
/* Check signal handling things */
- if (do_sigterm)
- terminate();
-
- if (do_sighup) {
-
- DEBUG(3, (got SIGHUP\n));
-
- flush_caches();
- reload_services_file();
-
- do_sighup = False;
- }
+ winbind_check_sigterm();
+ winbind_check_sighup();
if (do_sigusr2) {
print_winbindd_status();
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index f71eec5..1d741be 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1105,6 +1105,10 @@ static bool fork_domain_child(struct winbindd_child
*child)
struct timeval now;
TALLOC_CTX *frame = talloc_stackframe();
+ /* check for signals */
+ winbind_check_sigterm();
+ winbind_check_sighup();
+
run_events(winbind_event_context(), 0, NULL, NULL);
GetTimeOfDay(now);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2322-g36c5195
The branch, v3-2-test has been updated
via 36c51951c6bca7d9b56b02cd6469e9c5a1c5147f (commit)
from 0a68f230cd92b97efed2b3bad19a3bf9a750d401 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 36c51951c6bca7d9b56b02cd6469e9c5a1c5147f
Author: Jim McDonough [EMAIL PROTECTED]
Date: Tue May 13 16:57:01 2008 -0400
Enable winbind child processes to do something with signals,
in particular closing and reopening logs on SIGHUP.
Conflicts:
source/winbindd/winbindd.c
---
Summary of changes:
source/winbindd/winbindd.c | 35 +++
source/winbindd/winbindd_dual.c |4
2 files changed, 27 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 1072f8e..57eee20 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -795,6 +795,27 @@ static bool remove_idle_client(void)
return False;
}
+/* check if HUP has been received and reload files */
+void winbind_check_sighup(void)
+{
+ if (do_sighup) {
+
+ DEBUG(3, (got SIGHUP\n));
+
+ flush_caches();
+ reload_services_file();
+
+ do_sighup = False;
+ }
+}
+
+/* check if TERM has been received */
+void winbind_check_sigterm(void)
+{
+ if (do_sigterm)
+ terminate();
+}
+
/* Process incoming clients on listen_sock. We use a tricky non-blocking,
non-forking, non-threaded model which allows us to handle many
simultaneous connections while remaining impervious to many denial of
@@ -954,18 +975,8 @@ static void process_loop(void)
/* Check signal handling things */
- if (do_sigterm)
- terminate();
-
- if (do_sighup) {
-
- DEBUG(3, (got SIGHUP\n));
-
- flush_caches();
- reload_services_file();
-
- do_sighup = False;
- }
+ winbind_check_sigterm();
+ winbind_check_sighup();
if (do_sigusr2) {
print_winbindd_status();
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index f71eec5..1d741be 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1105,6 +1105,10 @@ static bool fork_domain_child(struct winbindd_child
*child)
struct timeval now;
TALLOC_CTX *frame = talloc_stackframe();
+ /* check for signals */
+ winbind_check_sigterm();
+ winbind_check_sighup();
+
run_events(winbind_event_context(), 0, NULL, NULL);
GetTimeOfDay(now);
--
Samba Shared Repository
Build status as of Wed May 14 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-05-13 00:00:39.0 + +++ /home/build/master/cache/broken_results.txt 2008-05-14 00:00:22.0 + @@ -1,4 +1,4 @@ -Build status as of Tue May 13 00:00:02 2008 +Build status as of Wed May 14 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -7,7 +7,7 @@ ctdb 0 0 0 distcc 1 0 0 ldb 31 12 0 -libreplace 30 11 0 +libreplace 30 12 0 lorikeet-heimdal 27 23 0 pidl 17 13 0 ppp 11 0 0 @@ -15,8 +15,8 @@ samba-docs 0 0 0 samba-gtk4 4 0 samba_3_2_test 31 19 0 -samba_4_0_test 28 23 1 +samba_4_0_test 29 23 1 smb-build29 5 0 talloc 31 6 0 -tdb 31 13 0 +tdb 30 13 0
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1531-g10415bb
The branch, v4-0-test has been updated via 10415bb738d51afdebbfeae976923e086805ae84 (commit) from da2179ee5d5b6094ab63a9d9d6a8d59893937087 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 10415bb738d51afdebbfeae976923e086805ae84 Author: Simo Sorce [EMAIL PROTECTED] Date: Thu Apr 24 17:28:30 2008 -0400 Make it possible to build libevents standalone. --- Summary of changes: source/lib/events/Makefile.in | 66 ++ source/lib/events/autogen.sh| 17 + source/lib/events/config.mk | 11 +++- source/lib/events/configure.ac | 35 ++ source/lib/events/events.c | 14 +++- source/lib/events/events.i |2 +- source/lib/events/events.mk | 59 source/lib/events/events.pc.in | 11 +++ source/lib/events/events_epoll.c| 15 +++- source/lib/events/events_select.c | 13 +++- source/lib/events/events_signal.c | 13 +++- source/lib/events/events_standard.c | 11 ++- source/lib/events/events_timed.c| 11 ++- source/lib/events/events_util.c | 129 +++ source/lib/events/events_util.h | 123 + source/lib/events/events_wrap.c |2 +- source/lib/events/libevents.m4 | 21 +- 17 files changed, 527 insertions(+), 26 deletions(-) create mode 100644 source/lib/events/Makefile.in create mode 100755 source/lib/events/autogen.sh create mode 100644 source/lib/events/configure.ac create mode 100644 source/lib/events/events.mk create mode 100644 source/lib/events/events.pc.in create mode 100644 source/lib/events/events_util.c create mode 100644 source/lib/events/events_util.h Changeset truncated at 500 lines: diff --git a/source/lib/events/Makefile.in b/source/lib/events/Makefile.in new file mode 100644 index 000..0a0df9b --- /dev/null +++ b/source/lib/events/Makefile.in @@ -0,0 +1,66 @@ +#!gmake +# +# Makefile for tdb directory +# + +CC = @CC@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +libdir = @libdir@ +VPATH = @srcdir@:@tallocdir@:@libreplacedir@ +srcdir = @srcdir@ +builddir = @builddir@ +CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I. +LDFLAGS = @LDFLAGS@ +EXEEXT = @EXEEXT@ +SHLD = @SHLD@ +SHLD_FLAGS = @SHLD_FLAGS@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PICFLAG = @PICFLAG@ +SHLIBEXT = @SHLIBEXT@ +SWIG = swig +PYTHON = @PYTHON@ +PYTHON_CONFIG = @PYTHON_CONFIG@ +PYTHON_BUILD_TARGET = @PYTHON_BUILD_TARGET@ +PYTHON_INSTALL_TARGET = @PYTHON_INSTALL_TARGET@ +PYTHON_CHECK_TARGET = @PYTHON_CHECK_TARGET@ +LIB_PATH_VAR = @LIB_PATH_VAR@ +eventsdir = @eventsdir@ +tallocdir = @tallocdir@ + +TALLOC_LIBS = @TALLOC_LIBS@ +TALLOC_CFLAGS = @TALLOC_CFLAGS@ +TALLOC_OBJ = @TALLOC_OBJ@ + +CFLAGS = $(CPPFLAGS) $(TALLOC_CFLAGS) @CFLAGS@ + +EVENTS_OBJ = @EVENTS_OBJ@ $(TALLOC_OBJ) @LIBREPLACEOBJ@ + +default: all + +include $(eventsdir)/events.mk +include $(eventsdir)/rules.mk + +all:: showflags dirs $(PROGS) $(LIBEVENTS_SOLIB) libevents.a $(PYTHON_BUILD_TARGET) + +install:: all +$(LIBEVENTS_SOLIB): $(EVENTS_OBJ) + $(SHLD) $(SHLD_FLAGS) -o $@ $(EVENTS_OBJ) $(TALLOC_LIBS) @[EMAIL PROTECTED](LIBEVENTS_SONAME) + +check: test + +test:: $(PYTHON_CHECK_TARGET) +installcheck:: test install + +clean:: + rm -f *.o *.a */*.o + rm -f $(TALLOC_OBJ) + +distclean:: clean + rm -f config.log config.status include/config.h config.cache + rm -f Makefile + +realdistclean:: distclean + rm -f configure include/config.h.in diff --git a/source/lib/events/autogen.sh b/source/lib/events/autogen.sh new file mode 100755 index 000..b13a4b6 --- /dev/null +++ b/source/lib/events/autogen.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +rm -rf autom4te.cache +rm -f configure config.h.in + +IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace +IPATHS=$IPATHS -I lib/talloc -I talloc -I ../talloc +autoconf $IPATHS || exit 1 +autoheader $IPATHS || exit 1 + +rm -rf autom4te.cache + +swig -O -Wall -python -keyword events.i # Ignore errors for now + +echo Now run ./configure and then make. +exit 0 + diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk index 058ce7f..34c24f7 100644 --- a/source/lib/events/config.mk +++ b/source/lib/events/config.mk @@ -1,3 +1,13 @@ + +# Start SUBSYSTEM LIBEVENTS +[LIBRARY::LIBEVENTS] +PUBLIC_DEPENDENCIES = LIBTALLOC +OUTPUT_TYPE = STATIC_LIBRARY +CFLAGS = -Ilib/events +# +# End SUBSYSTEM LIBEVENTS + + ## [MODULE::EVENTS_AIO] PRIVATE_DEPENDENCIES = LIBAIO_LINUX @@ -34,7 +44,6 @@ EVENTS_STANDARD_OBJ_FILES = lib/events/events_standard.o ## # Start SUBSYSTEM LIBEVENTS
[SCM] CTDB repository - branch test created - ca266a989ba1c6fcac48b1739e7cff7766481df7
The branch, test has been created at ca266a989ba1c6fcac48b1739e7cff7766481df7 (commit) - Log - --- -- CTDB repository
[SCM] CTDB repository - branch ronnie created - 2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2
The branch, ronnie has been created at 2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2 (commit) - Log - --- -- CTDB repository
[SCM] CTDB repository - branch tridge created - b616961c16667328a81efa00a1c880efa4e791f1
The branch, tridge has been created at b616961c16667328a81efa00a1c880efa4e791f1 (commit) - Log - commit b616961c16667328a81efa00a1c880efa4e791f1 Merge: 3e6160e5d90a0661eb833b163c11be2267117d0b 13d3eb9a8bc7fad14fcd3e7e023c1336657424d6 Author: Andrew Tridgell [EMAIL PROTECTED] Date: Wed May 14 14:37:11 2008 +1000 Merge commit 'ronnie-ctdb/master' into tridge commit 13d3eb9a8bc7fad14fcd3e7e023c1336657424d6 Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Mon May 12 16:44:33 2008 +1000 When we run the init script to start the ctdb service Use tdbdump to verify that all persistent database files are good before we start the daemon. commit 8d6ecf47318188448d934ab76e40da7e4cece67d Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Mon May 12 13:37:31 2008 +1000 Try to use tdb transactions when updating a record and record header inside the ctdb daemon. If a transaction could be started, do safe transaction store when updating the record inside the daemon. If the transaction could not be started (maybe another samba process has a lock on the database?) then just do a normal store instead (instead of blocking the ctdb daemon). The client can signal ctdb that updates to this database should, if possible, be done using safe transactions by specifying the TDB_NOSYNC flag when attaching to the database. The TDB flags are passed to ctdb in the srvid field of the control header when attaching using the CTDB_CONTROL_DB_ATTACH_PERSISTENT. Currently, samba3.2 does not yet tell ctdbd to handle any persistent databases using safe transactions. If samba3.2 wants a particular persistent database to be handled using safe transactions inside the ctdbd daemon, it should pass TDB_NOSYNC as the flags to the call to attach to a persistent database in ctdbd_db_attach() it currently specifies 0 as the srvid commit 423a2b0965ed6aaaf1dce8864a07ed93944bcf16 Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Mon May 12 07:24:02 2008 +1000 Update to new release commit 7c569720beb626617d800211faaf9029f0deb4cf Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Sun May 11 14:30:43 2008 +1000 when pulling the nfs directories to check during 60.nfs monitor grep for lines starting with a '/' character since exportfs will sometimes split a single export line into two lines of outputlike this : [EMAIL PROTECTED] ~]# exportfs /NFS4exports/tmp world /NFS4exportsworld commit c4c2c53918da6fb566d6e9cbd6b02e61ae2921e7 Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Sun May 11 14:28:33 2008 +1000 ctdb-methods becomes NULL when we shutdown the transport. If we shutdown the transport and CTDB later decides to send a command out for queueing, the call to ctdb-methods-allocate_pkt() will SEGV. This could trigger for example when we are in the process of shuttind down CTDBD and have already shutdown the transport but we are still waiting for the shutdown eventscripts to finish. If the event scripts now take much much longer to execute for some reason, this race condition becomes much more probable. Decorate all dereferencing of ctdb-methods-with a check that ctdb-menthods is non-NULL --- -- CTDB repository
[SCM] CTDB repository - branch master updated - 406a2a1e364cf71eb15e5aeec3b87c62f825da92
The branch, master has been updated
via 406a2a1e364cf71eb15e5aeec3b87c62f825da92 (commit)
via 93b98838824fae5f47e4ed6b95ae9e4e7597bec3 (commit)
via 6131f4b4fc7b65f83f3d57927b23393c84bd2a2b (commit)
via 7f4c7cf6355a88b1a02d3a4d1fa25427106953f9 (commit)
via b712762a1b8a3028625085e32136df4458b292c0 (commit)
from 13d3eb9a8bc7fad14fcd3e7e023c1336657424d6 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 406a2a1e364cf71eb15e5aeec3b87c62f825da92
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed May 14 15:47:47 2008 +1000
Start implementing support for ipv6.
This enhances the framework for sending tcp tickles to be able to send ipv6
tickles as well.
Since we can not use one single RAW socket to send both handcrafted ipv4
and ipv6 packets, instead of always opening TWO sockets, one ipv4 and one ipv6
we get rid of the helper ctdb_sys_open_sending_socket() and just open (and
close) a raw socket of the appropriate type inside ctdb_sys_send_tcp().
We know which type of socket v4/v6 to use based on the sin_family of the
destination address.
Since ctdb_sys_send_tcp() opens its own socket we no longer nede to pass a
socket
descriptor as a parameter. Get rid of this redundant parameter and fixup
all callers.
commit 93b98838824fae5f47e4ed6b95ae9e4e7597bec3
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed May 14 15:40:44 2008 +1000
add a new container to hold a socketaddr for either ipv4 or ipv6
commit 6131f4b4fc7b65f83f3d57927b23393c84bd2a2b
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed May 14 15:37:20 2008 +1000
Add a missing include
commit 7f4c7cf6355a88b1a02d3a4d1fa25427106953f9
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed May 14 15:33:01 2008 +1000
move the function to open a sending socket into the main executable since
this function will dissapear soon...
commit b712762a1b8a3028625085e32136df4458b292c0
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed May 14 12:25:55 2008 +1000
add a checksum routine for tcp over ipv6
---
Summary of changes:
common/ctdb_util.c | 70 -
common/system_aix.c|5 +-
common/system_linux.c | 194 ---
include/ctdb_private.h | 18 +++-
server/ctdb_takeover.c | 51 +
tools/ctdb.c | 17 +---
utils/ipmux/ipmux.c| 29 +++
7 files changed, 266 insertions(+), 118 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 8ae4df7..cb53511 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -296,18 +296,78 @@ static bool parse_ip_num(const char *s, struct in_addr
*addr, unsigned *num, con
}
+static bool parse_ipv4(const char *s, unsigned port, ctdb_sock_addr *saddr)
+{
+ saddr-ip.sin_family = AF_INET;
+ saddr-ip.sin_port = htons(port);
+
+ if (inet_pton(AF_INET, s, saddr-ip.sin_addr) != 1) {
+ DEBUG(DEBUG_ERR, (__location__ Failed to translate %s into
sin_addr\n, s));
+ return false;
+ }
+
+ return true;
+}
+
+static bool parse_ipv6(const char *s, unsigned port, ctdb_sock_addr *saddr)
+{
+ saddr-ip6.sin6_family = AF_INET6;
+ saddr-ip6.sin6_port = htons(port);
+ saddr-ip6.sin6_flowinfo = 0;
+ saddr-ip6.sin6_scope_id = 0;
+
+ if (inet_pton(AF_INET6, s, saddr-ip6.sin6_addr) != 1) {
+ DEBUG(DEBUG_ERR, (__location__ Failed to translate %s into
sin6_addr\n, s));
+ return false;
+ }
+
+ return true;
+}
/*
parse a ip:port pair
*/
-bool parse_ip_port(const char *s, struct sockaddr_in *ip)
+bool parse_ip_port(const char *addr, ctdb_sock_addr *saddr)
{
+ TALLOC_CTX *tmp_ctx = talloc_new(NULL);
+ char *s, *p;
unsigned port;
- if (!parse_ip_num(s, ip-sin_addr, port, ':')) {
+ char *endp = NULL;
+ bool ret;
+
+ s = talloc_strdup(tmp_ctx, addr);
+ if (s == NULL) {
+ DEBUG(DEBUG_ERR, (__location__ Failed strdup()\n));
+ talloc_free(tmp_ctx);
return false;
}
- ip-sin_family = AF_INET;
- ip-sin_port = htons(port);
- return true;
+
+ p = rindex(s, ':');
+ if (p == NULL) {
+ DEBUG(DEBUG_ERR, (__location__ This addr: %s does not contain
a port number\n, s));
+ talloc_free(tmp_ctx);
+ return false;
+ }
+
+ port = strtoul(p+1, endp, 10);
+ if (endp == NULL || *endp != 0) {
+ /* trailing garbage */
+ DEBUG(DEBUG_ERR, (__location__ Trailing garbage after the
port in %s\n, s));
+ talloc_free(tmp_ctx);
+ return false;
+ }
+
