[Samba] Re: samba 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
Hi all, Ok, now I able to open up active directory via windows 2003 'dsa.msc' (you need to download and install adminpak if you use windows xp pro). However seems like it not yet stable and we can't add new OU. I can't wait for newer version come out! Anything I can help to make the progress become faster? Everybody can download and test samba 4 live cd at http://www.extraknowledge.org/xoops/modules/articles/article.php?id=29 Regards, Ks 在 2007-07-24二的 14:35 +0800，KS Tan写道： Its great! I will test it tonight!! What a good news to me(I'd test TP5 but no luck.) 在 2007-07-24二的 14:23 +1000，Andrew Bartlett写道： On Tue, 2007-07-24 at 12:03 +0800, KS Tan wrote: Andrew Bartlett, Oh! How you configure the group policy? I will test it in my computer. Once it done I will release another live cd (Or probably my live cd already work but I dunno). 23995 should work. I just connected to Active directory users and computers, selected the domain, clicked properties then the 'group policy' tab. The smb.conf matches the default, I think... Andrew Bartlett -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: samba 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
On Tue, 2007-07-24 at 15:56 +0800, KS Tan wrote: Hi all, Ok, now I able to open up active directory via windows 2003 'dsa.msc' (you need to download and install adminpak if you use windows xp pro). However seems like it not yet stable and we can't add new OU. Yeah, that's bug 4806: https://bugzilla.samba.org/show_bug.cgi?id=4806 Now that I've seen group policies behaving, I'm going to try my hand at this one. It shouldn't be too hard... I can't wait for newer version come out! Anything I can help to make the progress become faster? Keep testing and reporting issues, particularly on samba-technical and in bugzilla. We have a wide range of clients to keep working, so just checking all sorts of combinations is a great help. It's not just windows: - Samba 3.0 (latest) - Samba 3.0 (older) - someone can remind me when we changed the join code - Mac OSX Naturally, checking windows versions is also really helpful: - Win2k SP0 (tricky kerberos issues make it an interesting test) - win2k latest SP - winXP SP0 - winXP SP1 - winXP SP2 - win2k3 - win2k3 SP1 - win2k3 R2 with SP2 With some effort, I can recreate setups with these, so I should be able to chase down issues. Help out by writing docs to cover things that are not clear (request wiki write access if you want to do it there). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. http://redhat.com signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: samba 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
Sure, and I will keep maintaining the live CD, and probably I'll make a 1 day work shop with few of my friend at end of next month(or next 2 month) to have a heavy test at Samba 4. Hope this help. Regarding the documentation, I affraid my lousy english make user become more confuse. Sorry for that. 在 2007-07-24二的 18:11 +1000，Andrew Bartlett写道： On Tue, 2007-07-24 at 15:56 +0800, KS Tan wrote: Hi all, Ok, now I able to open up active directory via windows 2003 'dsa.msc' (you need to download and install adminpak if you use windows xp pro). However seems like it not yet stable and we can't add new OU. Yeah, that's bug 4806: https://bugzilla.samba.org/show_bug.cgi?id=4806 Now that I've seen group policies behaving, I'm going to try my hand at this one. It shouldn't be too hard... I can't wait for newer version come out! Anything I can help to make the progress become faster? Keep testing and reporting issues, particularly on samba-technical and in bugzilla. We have a wide range of clients to keep working, so just checking all sorts of combinations is a great help. It's not just windows: - Samba 3.0 (latest) - Samba 3.0 (older) - someone can remind me when we changed the join code - Mac OSX Naturally, checking windows versions is also really helpful: - Win2k SP0 (tricky kerberos issues make it an interesting test) - win2k latest SP - winXP SP0 - winXP SP1 - winXP SP2 - win2k3 - win2k3 SP1 - win2k3 R2 with SP2 With some effort, I can recreate setups with these, so I should be able to chase down issues. Help out by writing docs to cover things that are not clear (request wiki write access if you want to do it there). Andrew Bartlett -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: What are my smbd's doing ? (was Re: [Samba] secrets.tdb locking
On Mon, Jul 23, 2007 at 06:01:06PM +0100, Mac wrote: On one previous occasion, the whole thing seemed to grind to a virtual halt, and we suspected (but couldn't prove) that a locking battle over (something like) secrets.tdb was to blame. Can you just start winbind on that box? No libnss_winbind or winbind entries in /etc/nsswitch.conf necessary. Just start it, winbind then should proxy access to the DC's and give some relief on the mutex for the DC. We already do. (it's in the init.d script, so it's automatic as well) # ps -ef | grep winbind root 24365 24364 1 09:11:55 ?1:46 /usr/local/samba/sbin/winbindd -D root 24366 24364 1 09:11:56 ?0:56 /usr/local/samba/sbin/winbindd -D root 2963 24364 0 09:58:14 ?0:00 /usr/local/samba/sbin/winbindd -D root 24364 1 3 09:11:55 ?6:38 /usr/local/samba/sbin/winbindd -D root 4233 28012 0 10:10:13 pts/20:00 grep winbind I've just briefly upped the debug level to '3' (smbcontrol winbindd debug 3). and there's nothing unusual looking there. e.g.:- [2007/07/24 10:15:25, 3, pid=24364] nsswitch/winbindd_sid.c:winbindd_gid_to_sid(477) [ 4346]: gid to sid 130 [2007/07/24 10:15:25, 3, pid=24364] nsswitch/winbindd_sid.c:winbindd_lookupname(103) [24366]: lookupname AD\Bacteriology [2007/07/24 10:15:25, 3, pid=24364] nsswitch/winbindd_sid.c:winbindd_gid_to_sid(477) [ 4346]: gid to sid 130 [2007/07/24 10:15:25, 3, pid=24364] nsswitch/winbindd_sid.c:winbindd_lookupname(103) [24366]: lookupname AD\Bacteriology I'm now confused. I thought 'smbd' did all its own lookups withthe DCs. Should they in fact not be? Should winbindd be doing it ? How do we tell 'smbd' to use 'winbindd' ? Mac Assistant Systems Administrator @nibsc.ac.uk [EMAIL PROTECTED] Work: +44 1707 641565 Everything else: +44 7956 237670 (anytime) -- 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 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
Regarding the documentation, I affraid my lousy english make user become more confuse. Sorry for that. Don't affraid. A lot of people have problem with english. It's better to have some documentation instead of no one. It's easiear (less time consuming) to correct existing doc ;o) I think a lot of people will appreciate the documentation. Please. Regards, Luf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Winbind cache problem after upgrade to 3.0.25b.
Have just upgraded from 3.0.14a to 3.0.25b. On starting winbindd it puts the following in /var/log/messages: initialize_winbindd_cache: clearing cache and re-creating with version number 1 All the winbind UID/GID mappings are lost and it starts again from scratch. Hence all file ownership / ACLs on this samba server become invalid. Anyone else seen this? Why does it see fit to destroy this important file in such a casual manner?! It didn't even bother to make a backup copy. Thanks in advance for any help... Simon Ashford. --- This e-mail and any attachments may contain confidential and/or privileged material; it is for the intended addressee(s) only. If you are not a named addressee, you must not use, retain or disclose such information. NPL Management Ltd cannot guarantee that the e-mail or any attachments are free from viruses. NPL Management Ltd. Registered in England and Wales. No: 2937881 Registered Office: Serco House, 16 Bartley Wood Business Park, Hook, Hampshire, United Kingdom RG27 9UY --- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbind: string overflow in safe_strcpy_fn(659)
Hi, after rebooting the server last weekend, we're still getting the same error messages from winbind. Jul 24 13:10:01 cvk027 winbindd[20648]: [2007/07/24 13:10:01, 0] lib/util_str.c: safe_strcpy_fn(659) Jul 24 13:10:01 cvk027 winbindd[20648]: ERROR: string overflow by 1 (256 - 255) in safe_strcpy [S+²9AÐåä96^_1ßQ*F\ÄÍ1µkÓ88^?^Sl^CëO9ACáYíÿ¬ÑWªáäØß 8C½t®] We've already set the winbind debug level to 10. Should we post the complete logs here again, or is there something we can do before that? Regards, -- i. A. Thomas Bartschies IT Systeme Cornelsen Verlagskontor GmbH Co. KG Kammerratsheide 66, 33609 Bielefeld Telefon 0521.9719-310 Telefax 0521.9719-93310 http://www.cvk.de AG Bielefeld HRA 10578 - Geschäftsführer: Horst Keplinger Geschäftsführende Komplementärin: AG Bielefeld HRB 7107 - Cornelsen Verlagskontor Verwaltungs-GmbH Weitere Komplementärin: AG Charlottenburg HRA 20764 - Cornelsen Verlagsholding GmbH Co., Berlin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba in a freebsd jail
Hello, I'm trying to get samba 3.0.25a working in a freebsd 6.2 jail. I believe i had samba working previously on another system in a jail, but this time i'm getting an error No available network interfaces found. An ifconfig in the jail shows he network interface and i can ssh in to the jail. I am open to suggestions. Thanks. Dave. -- 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 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
Ok, Seems I better do it. So, which part of documentation I should start from? What information normally user need? Or probably I just teach them how to build from samba source, setup dns server, join windows into domain and use dsa.msc? Regards, Ks Regards, Ks 在 2007-07-24二的 11:55 +0200，Ludek Finstrle写道： Regarding the documentation, I affraid my lousy english make user become more confuse. Sorry for that. Don't affraid. A lot of people have problem with english. It's better to have some documentation instead of no one. It's easiear (less time consuming) to correct existing doc ;o) I think a lot of people will appreciate the documentation. Please. Regards, Luf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Access share from client out of second domain
Hello, I have two samba domains and I want to let users of each domain connect to shares of each other PDC. As long as I use samba =3.0.22 it works fine (DOM1\user1 is automatically mapped to DOM2\user2) , but later versions won't (DOM1\user1 is shown as DOM1\user1 on PDC2). How can I do this? Regards Marc Muehlfeld -- Marc Muehlfeld (Leitung Systemadministration) Zentrum fuer Humangenetik und Laboratoriumsmedizin Dr. Klein und Dr. Rost Lochhamer Str. 29 - D-82152 Martinsried Telefon: +49(0)89/895578-0 - Fax: +49(0)89/895578-78 http://www.medizinische-genetik.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: samba 4 svn23995 live CD release (maybe tp6?) dsa.msc works!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Andrew Bartlett wrote: - Samba 3.0 (latest) - Samba 3.0 (older) - someone can remind me when we changed the join code The join code was rewritten in 3.0.23 IIRC. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGphNbIR7qMdg1EfYRAkb+AJ9HwD8LlLUuu57/juvdSWttkXjQKwCfW7mj xRMEdFxvfr4nsXdT/MSrqNg= =c74w -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] Prewin2kname with samba
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Felipe Augusto van de Wiel wrote: Imagining that Samba3 is not as good as Samba4 with AD and that Samba3 gives preference to NT4-style domains, probably it is using the pre-win2k names. If you create a user without all the options that AD gives what happens? It actually has more to do with name canonicalization that any missing features. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGphPRIR7qMdg1EfYRAl4gAJ4qtrmaHy5kcE/MnrILosqHhFpE0QCbBulr BVMz2GFD5ESxLNN28ZpCJkM= =6QBF -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] uid/gid translation of a Owner SID/Group SID
Suppose I have a linux machine which has user abc (belongs to group def). I mount a cifs share from a Windows server as user ghi. The share has files with owner/Group domain1-jkl/mno, domain2-jkl/prq, prq/rst. Now if these files were to be listed on the linux machine which mounted this share, what would be the user and owner of these files? There is nothing like winbind on this linux machine. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Winbind cache problem after upgrade to 3.0.25b.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Simon Ashford wrote: Have just upgraded from 3.0.14a to 3.0.25b. On starting winbindd it puts the following in /var/log/messages: initialize_winbindd_cache: clearing cache and re-creating with version number 1 All the winbind UID/GID mappings are lost and it starts again from scratch. Hence all file ownership / ACLs on this samba server become invalid. Anyone else seen this? Why does it see fit to destroy this important file in such a casual manner?! It didn't even bother to make a backup copy. It's just a cache. Temporary high speed storage of lookups. By default, the data in the cache only lives for 300 seconds before winbind queries the server (again) for current mappings. If you're losing mappings or generating different mappings on a restart, something else is wrong. Not enough info here to make even an educated guess. Regards, Doug -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGph0SFqWysr/jOHMRAmZtAKDM17bmNAvVBV81y9OOFk9fjNl7rACfRJ0N hEbjP/7p4P/D4p7gcIuGfGA= =BbW/ -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] Prewin2kname with samba
Actually in this case userPrincipalName and sAMAccountname are different. Is it possible that Samba only displays the sAMAccountname? Also if those differ, is it possible that Samba will have problem authenticating against AD using win2k name of the user? On current version of samba that's whats happening. Issue is when win2k and pre-win2k names are different Samba is unable to authenticate the user ( when you try DOMAIN\win2kname ) DOMAIN\pre-win2k user is authenticated but not found in valid users list and hence will be denied access to the share. In effect when win2k and pre-win2k names differ user can not mount the share using DOMAIn\win2k or DOMAIN\pre-win2k names. :-( On 7/24/07, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Felipe Augusto van de Wiel wrote: Imagining that Samba3 is not as good as Samba4 with AD and that Samba3 gives preference to NT4-style domains, probably it is using the pre-win2k names. If you create a user without all the options that AD gives what happens? It actually has more to do with name canonicalization that any missing features. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGphPRIR7qMdg1EfYRAl4gAJ4qtrmaHy5kcE/MnrILosqHhFpE0QCbBulr BVMz2GFD5ESxLNN28ZpCJkM= =6QBF -END PGP SIGNATURE- -- 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] Access share from client out of second domain
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Marc Muehlfeld wrote, On 24-07-2007 09:26: Hello, I have two samba domains and I want to let users of each domain connect to shares of each other PDC. As long as I use samba =3.0.22 it works fine (DOM1\user1 is automatically mapped to DOM2\user2) , but later versions won't (DOM1\user1 is shown as DOM1\user1 on PDC2). How can I do this? Since you didn't speak about the previous configuration and don't give any details about your smb.conf in both domains, I will just hard guess what you could do. :-) Have you tried Interdomain Trusts? http://samba.org/samba/docs/man/Samba-HOWTO-Collection/InterdomainTrusts.html Kind regards, - -- Felipe Augusto van de Wiel [EMAIL PROTECTED] Coordenadoria de Tecnologia da Informação (CTI) - SEDU/PARANACIDADE http://www.paranacidade.org.br/ Phone: (+55 41 3350 3300) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGpiVMCj65ZxU4gPQRCLzVAKCNBdCRQYOr6zXgg+Tw/W4clZgAMACgpTYp x/BBaP+YmI1aNoP6YbWKJj4= =Dn/a -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] Winbind cache problem after upgrade to 3.0.25b.
I suspect you are using Ubuntu (and/or Debian), which have a bug regarding the Winbind cache. https://bugs.launchpad.net/ubuntu/+source/samba/+bug/118977 On Tue, 2007-07-24 at 11:24 +0100, Simon Ashford wrote: Have just upgraded from 3.0.14a to 3.0.25b. On starting winbindd it puts the following in /var/log/messages: initialize_winbindd_cache: clearing cache and re-creating with version number 1 All the winbind UID/GID mappings are lost and it starts again from scratch. Hence all file ownership / ACLs on this samba server become invalid. Anyone else seen this? Why does it see fit to destroy this important file in such a casual manner?! It didn't even bother to make a backup copy. Thanks in advance for any help... Simon Ashford. --- This e-mail and any attachments may contain confidential and/or privileged material; it is for the intended addressee(s) only. If you are not a named addressee, you must not use, retain or disclose such information. NPL Management Ltd cannot guarantee that the e-mail or any attachments are free from viruses. NPL Management Ltd. Registered in England and Wales. No: 2937881 Registered Office: Serco House, 16 Bartley Wood Business Park, Hook, Hampshire, United Kingdom RG27 9UY --- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Vista and Samba
I was just setting a Windows Vista machine up on my network and have the following problems. If the user logs into the domain, then there are no network drives showing. It is as if the script is not executing. If I logon locally with an administrator and then run '\\server-name' to get a list of drives, I can see them but nothing shows up in any of them except for two of the shares which are dfs shares. I mapped a drive letter to one of the shares that was not dfs and then things showed up in it and it let me browse it. I browsed to a setup file and when I clicked on it, the machine told me that the file that I just clicked on did not exist. It must have something to do with my msdfs shares. If I change the 'host msdfs = no' then I can get to all the shares except for the 2 that are dfs shares. If I leave it as 'host msdfs = yes' then I can get to the two dfs shares, but not any of the others. All of my Win98 and WinXP machines work with the current setup, but the Vista machine will not. My current samba version is 3.0.10.1 and here is my smb.conf. Thanks for any info on this. [global] # workgroup = NT-Domain-Name or Workgroup-Name workgroup = BES netbios name = server host msdfs = yes obey pam restrictions = No ldap passwd sync = Yes time server = Yes mangling method = hash2 Dos charset = 850 passdb backend = ldapsam:ldap://127.0.0.1 ldap admin dn = cn=Manager,dc=server,dc=bes.domain ldap suffix = dc=server,dc=bes.domain ldap group suffix = ou=Groups ldap user suffix = ou=Users ldap machine suffix = ou=Computers ldap idmap suffix = ou=Users add user script = /opt/IDEALX/sbin/smbldap-useradd -m %u ldap delete dn = Yes add machine script = /root/users/user_add -mach first %m none add group script = /opt/IDEALX/sbin/smbldap-groupadd -p %g add user to group script = /opt/IDEALX/sbin/smbldap-groupmod -m %u %g delete user from group script = /opt/IDEALX/sbin/smbldap-groupmod -x %u %g set primary group script = /opt/IDEALX/sbin/smbldap-usermod -g %g %u kernel oplocks = no printcap name = cups load printers = yes printing = cups cups options = raw log file = /var/log/samba/%m.log log level = 3 max log size = 500 security = user encrypt passwords = yes *passwd:*all*authentication*tokens*updated*successfully* socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 os level = 65 domain master = yes preferred master = yes domain logons = yes logon path = logon home = wins support = yes dns proxy = no idmap uid = 16777216-33554431 idmap gid = 16777216-33554431 template shell = /bin/false winbind use default domain = no [teachers] path = /export/teachers msdfs root = yes [students] path = /export/students msdfs root = yes [userhome] comment = Home Directories path = /home/%u read only = no # Un-comment the following and create the netlogon directory for Domain Logons [netlogon] comment = Network Logon Service path = /opt/samba/netlogon guest ok = yes root preexec = /opt/samba/netlogon/logonscript.pl %U %M %m %I root postexec = /opt/samba/netlogon/logoutscript.pl %U %M %m %I read only = no locking = no [school] path = /school/bes read only = no valid users = @teacher @admin create mask = 666 force create mode = 2666 directory mask = 777 force directory mode = 3777 [bes] path = /school/bes read only = no valid users = @teacher @admin @bes @bms create mask = 660 force create mode = 2660 directory mask = 770 force directory mode = 3770 [lemburg] path = /lemburg read only = no valid users = @teacher @admin @lemburg create mask = 666 force create mode = 666 directory mask = 770 force directory mode = 2770 [sis] path = /sis read only = no valid users = @teacher @admin @lemburg create mask = 666 force create mode = 666 directory mask = 770 force directory mode = 2770 level 2 oplocks = no oplocks = no [data] path = /student/software read only = no valid users = @bes @bms @student @admin @teacher create mask = 666 force create mode = 666 directory mask = 777 force directory mode = 2777 [software] path = /software read only = no -- Scott Mayo System Administrator Bloomfield Schools Duct tape is like the force, it has a light side and a dark side and it holds the universe together. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Access share from client out of second domain
Hello, Felipe Augusto van de Wiel schrieb: Have you tried Interdomain Trusts? Yes. The problem is that I need to run winbind to get the accounts of each other domain. But I can't run winbind on a PDC. I allready tried and found the information from Gerald (Jerry) Carter: http://www.gatago.com/linux/samba/14515423.html winbindd on a PDC only alloocates Unix ids for users and groups from trusted domains. Not its own domain. Does anyone know if it's planned to be supported to run winbind on a PDC in a future release? Regards Marc -- Marc Muehlfeld (Leitung Systemadministration) Zentrum fuer Humangenetik und Laboratoriumsmedizin Dr. Klein und Dr. Rost Lochhamer Str. 29 - D-82152 Martinsried Telefon: +49(0)89/895578-0 - Fax: +49(0)89/895578-78 http://www.medizinische-genetik.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] domain or not domain?
Hi all, that's my first post in this mailing list. I'm looking for a very special and strange samba configuration (at least from my point of view and my experience) and I'm not sure it is possible to reach this goal. Anyway, this is my request: I'm running a M$ Windows 2003 Serve as PDC with Active Directory and file server, and I would like to configure in a Linux machine a directory shared either from some domain's user or from some samba (only, not domain's user) users. In your opinion is it possible? This request is due to the need to let some files available to some external agents when they visit our offices, but I don't want to give them a Domain account to avoid let them able to browse others shares in the windows file server. So, if it is possible to set up a machine where I can authenticate either domain's user or not domain's user I solved my problem in a easy a clean way. Any idea about? Thanks a lot for your help Roger -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] domain or not domain?
Favero Roger skrev: Hi all, that's my first post in this mailing list. I'm looking for a very special and strange samba configuration (at least from my point of view and my experience) and I'm not sure it is possible to reach this goal. Anyway, this is my request: I'm running a M$ Windows 2003 Serve as PDC with Active Directory and file server, and I would like to configure in a Linux machine a directory shared either from some domain's user or from some samba (only, not domain's user) users. In your opinion is it possible? This request is due to the need to let some files available to some external agents when they visit our offices, but I don't want to give them a Domain account to avoid let them able to browse others shares in the windows file server. So, if it is possible to set up a machine where I can authenticate either domain's user or not domain's user I solved my problem in a easy a clean way. Any idea about? If I understand you correctly, you just need a standalone Samba server? Only accounts that are *not* in your PDC will access it? If that's your goal, it's easy, just set up the Samba server as stand-alone, and do not join it in the domain. Then you manage all access on that Samba server locally. Anders. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RES: [Samba] domain or not domain?
I think you have 2 alternatives: 1 - configure this samba server out of your ad and create a thrusted relationship allowing users from you ad domain access to this share. 2 - Configure your samba as a domain member of you ad comain and configure a user in you ad with restricted access and give him access to this share. Hope it helps, Bruno Gimenes Pereti OBS.: Antes de imprimir este e-mail, pense em seu compromisso com o Meio Ambiente. Essa mensagem é destinada exclusivamente ao seu destinatário e pode conter informações confidenciais, protegidas por sigilo profissional ou cuja divulgação seja proibida por lei. O uso não autorizado de tais informações é proibido e está sujeito às penalidades cabíveis. That information is confidential, protected by a professional privilege or which disclosure is prohibited by law. Unauthorized use of such information is prohibited and subject to applicable penalties. -Mensagem original- De: [EMAIL PROTECTED] [mailto:samba- [EMAIL PROTECTED] Em nome de Favero Roger Enviada em: terça-feira, 24 de julho de 2007 07:36 Para: samba@lists.samba.org Assunto: [Samba] domain or not domain? Hi all, that's my first post in this mailing list. I'm looking for a very special and strange samba configuration (at least from my point of view and my experience) and I'm not sure it is possible to reach this goal. Anyway, this is my request: I'm running a M$ Windows 2003 Serve as PDC with Active Directory and file server, and I would like to configure in a Linux machine a directory shared either from some domain's user or from some samba (only, not domain's user) users. In your opinion is it possible? This request is due to the need to let some files available to some external agents when they visit our offices, but I don't want to give them a Domain account to avoid let them able to browse others shares in the windows file server. So, if it is possible to set up a machine where I can authenticate either domain's user or not domain's user I solved my problem in a easy a clean way. Any idea about? Thanks a lot for your help Roger -- 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
[Samba] trouble compiling --with-ads
Hi again, In working on my previous problem with joining a domain, I'm trying to join with AD instead of NTLM. I've got openldap v2.3.19 installed, and the libraries are in my LD_LIBRARY_PATH. configure --with-ads fails: checking for LDAP support... auto checking ldap.h usability... yes checking ldap.h presence... yes checking for ldap.h... yes checking lber.h usability... yes checking lber.h presence... yes checking for lber.h... yes checking for ber_tag_t... yes checking for ber_scanf in -llber... no checking for ldap_init in -lldap... no checking for ldap_set_rebind_proc... no checking whether ldap_set_rebind_proc takes 3 arguments... 3 checking for ldap_initialize... no configure: WARNING: libldap is needed for LDAP support checking for Active Directory and krb5 support... yes configure: error: Active Directory Support requires LDAP support But: :~/samba-3.0.25b/source # grep ldap_init /usr/lib/libldap.so Binary file /usr/lib/libldap.so matches :~/samba-3.0.25b/source # grep ber_scanf /usr/lib/liblber.so Binary file /usr/lib/liblber.so matches :~/samba-3.0.25b/source # grep ldap_set_rebind_proc /usr/lib/libldap.so Binary file /usr/lib/libldap.so matches :~/samba-3.0.25b/source # grep ldap_initialize /usr/lib/libldap.so Binary file /usr/lib/libldap.so matches How does this make sense? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Use shares like postboxes !
Hello, I want to configure share for Windows like Postboxes. A user has a directory. He could do with content what ever he want. All the world could only put in files in the user directory. I think this must be the Unix permissions: rwx --- -w- How should i configure this share in samba ? I would like a hierarchy like: [postboxes] path = /pathtoboxes/%U I Žam looking forward to your answers. Bye Andy _ In 5 Schritten zur eigenen Homepage. Jetzt Domain sichern und gestalten! Nur 3,99 EUR/Monat! http://www.maildomain.web.de/?mc=021114 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Vista and Samba
On Tue, Jul 24, 2007 at 12:27:04PM -0500, Scott Mayo wrote: My current samba version is 3.0.10.1 and here is my smb.conf. There have been some DFS related Vista fixes lately. Please try the current SAMBA_3_0_25 branch or wait for the 3.0.25c due very soon. Volker pgp1j073wm6Dw.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
svn commit: samba r24010 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: abartlet
Date: 2007-07-24 06:01:30 + (Tue, 24 Jul 2007)
New Revision: 24010
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24010
Log:
Fix warning for the function paramter to qsort().
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-07-23 19:46:48 UTC (rev 24009)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-07-24 06:01:30 UTC (rev 24010)
@@ -153,7 +153,7 @@
qsort(allowedAttributes-values,
allowedAttributes-num_values,
sizeof(*allowedAttributes-values),
- data_blob_cmp);
+ (comparison_fn_t)data_blob_cmp);
for (i=1 ; i allowedAttributes-num_values; i++) {
struct ldb_val *val1 = allowedAttributes-values[i-1];
svn commit: samba r24011 - in branches/SAMBA_4_0/source/libnet: .
Author: abartlet Date: 2007-07-24 06:02:32 + (Tue, 24 Jul 2007) New Revision: 24011 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24011 Log: Keep the connect handle around in libnet, in case we want it. Andrew Bartlett Modified: branches/SAMBA_4_0/source/libnet/libnet.h branches/SAMBA_4_0/source/libnet/libnet_domain.c Changeset: Modified: branches/SAMBA_4_0/source/libnet/libnet.h === --- branches/SAMBA_4_0/source/libnet/libnet.h 2007-07-24 06:01:30 UTC (rev 24010) +++ branches/SAMBA_4_0/source/libnet/libnet.h 2007-07-24 06:02:32 UTC (rev 24011) @@ -31,6 +31,7 @@ const char *name; uint32_t access_mask; struct policy_handle handle; + struct policy_handle connect_handle; int buf_size; } samr; Modified: branches/SAMBA_4_0/source/libnet/libnet_domain.c === --- branches/SAMBA_4_0/source/libnet/libnet_domain.c2007-07-24 06:01:30 UTC (rev 24010) +++ branches/SAMBA_4_0/source/libnet/libnet_domain.c2007-07-24 06:02:32 UTC (rev 24011) @@ -359,6 +359,7 @@ /* store the resulting handle and related data for use by other libnet functions */ + ctx-samr.connect_handle = s-connect_handle; ctx-samr.handle = s-domain_handle; ctx-samr.name= talloc_steal(ctx, s-domain_name.string); ctx-samr.access_mask = s-access_mask;
svn commit: samba r24012 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: abartlet
Date: 2007-07-24 06:03:03 + (Tue, 24 Jul 2007)
New Revision: 24012
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24012
Log:
Remove duplicate code block (from bad merge).
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2007-07-24
06:02:32 UTC (rev 24011)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_auth.c 2007-07-24
06:03:03 UTC (rev 24012)
@@ -149,23 +149,6 @@
mprSetPropertyValue(auth, username,
mprString(server_info-account_name));
mprSetPropertyValue(auth, domain,
mprString(server_info-domain_name));
- if (security_token_is_system(session_info-security_token)) {
- mprSetPropertyValue(auth, report, mprString(SYSTEM));
- }
-
- if (security_token_is_anonymous(session_info-security_token)) {
- mprSetPropertyValue(auth, report, mprString(ANONYMOUS));
- }
-
- if
(security_token_has_builtin_administrators(session_info-security_token)) {
- mprSetPropertyValue(auth, report, mprString(ADMINISTRATOR));
- }
-
- if
(security_token_has_nt_authenticated_users(session_info-security_token)) {
- mprSetPropertyValue(auth, report, mprString(USER));
- }
-
-
done:
return 0;
}
svn commit: samba r24013 - in branches/SAMBA_3_2/source/modules: .
Author: metze Date: 2007-07-24 08:04:42 + (Tue, 24 Jul 2007) New Revision: 24013 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24013 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: fixed prototype metze Modified: branches/SAMBA_3_2/source/modules/nfs4_acls.h Changeset: Modified: branches/SAMBA_3_2/source/modules/nfs4_acls.h === --- branches/SAMBA_3_2/source/modules/nfs4_acls.h 2007-07-24 06:03:03 UTC (rev 24012) +++ branches/SAMBA_3_2/source/modules/nfs4_acls.h 2007-07-24 08:04:42 UTC (rev 24013) @@ -137,7 +137,7 @@ * when applicable */ typedef BOOL (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *); -BOOL smb_set_nt_acl_nfs4(files_struct *fsp, +NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd, set_nfs4acl_native_fn_t set_nfs4_native);
svn commit: samba r24014 - in branches/SAMBA_3_2_0/source/modules: .
Author: metze Date: 2007-07-24 08:05:13 + (Tue, 24 Jul 2007) New Revision: 24014 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24014 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: fixed prototype metze Modified: branches/SAMBA_3_2_0/source/modules/nfs4_acls.h Changeset: Modified: branches/SAMBA_3_2_0/source/modules/nfs4_acls.h === --- branches/SAMBA_3_2_0/source/modules/nfs4_acls.h 2007-07-24 08:04:42 UTC (rev 24013) +++ branches/SAMBA_3_2_0/source/modules/nfs4_acls.h 2007-07-24 08:05:13 UTC (rev 24014) @@ -137,7 +137,7 @@ * when applicable */ typedef BOOL (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *); -BOOL smb_set_nt_acl_nfs4(files_struct *fsp, +NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd, set_nfs4acl_native_fn_t set_nfs4_native);
svn commit: samba r24015 - in branches/SAMBA_3_2/packaging: . RHEL4-CTDB RHEL4-CTDB/setup
Author: metze Date: 2007-07-24 08:42:21 + (Tue, 24 Jul 2007) New Revision: 24015 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24015 Log: merge RHEL4-CTDB packaging stuff from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/ metze Added: branches/SAMBA_3_2/packaging/RHEL4-CTDB/ branches/SAMBA_3_2/packaging/RHEL4-CTDB/README branches/SAMBA_3_2/packaging/RHEL4-CTDB/configure.rpm branches/SAMBA_3_2/packaging/RHEL4-CTDB/makerpms.sh branches/SAMBA_3_2/packaging/RHEL4-CTDB/samba.spec branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/ branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/filter-requires-samba.sh branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/samba.log branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/samba.pamd branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/samba.sysconfig branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/smb.conf branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/smb.init branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/smbprint branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/smbusers branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/swat branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/swat.desktop branches/SAMBA_3_2/packaging/RHEL4-CTDB/setup/winbind.init Changeset: Sorry, the patch is too large (1381 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24015
svn commit: samba r24016 - in branches/SAMBA_3_2_0/packaging: . RHEL4-CTDB RHEL4-CTDB/setup
Author: metze Date: 2007-07-24 08:42:35 + (Tue, 24 Jul 2007) New Revision: 24016 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24016 Log: merge RHEL4-CTDB packaging stuff from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/ metze Added: branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/ branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/README branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/configure.rpm branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/makerpms.sh branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/samba.spec branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/ branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/filter-requires-samba.sh branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/samba.log branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/samba.pamd branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/samba.sysconfig branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/smb.conf branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/smb.init branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/smbprint branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/smbusers branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/swat branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/swat.desktop branches/SAMBA_3_2_0/packaging/RHEL4-CTDB/setup/winbind.init Changeset: Sorry, the patch is too large (1381 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24016
svn commit: samba r24017 - in branches/SAMBA_3_2/source/nsswitch: .
Author: metze
Date: 2007-07-24 08:59:36 + (Tue, 24 Jul 2007)
New Revision: 24017
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24017
Log:
merge from http://samba.org/~tridge/samba_3_2_ctdb/:
add add_trusted_domain() can return NULL
metze
Modified:
branches/SAMBA_3_2/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_util.c 2007-07-24 08:42:35 UTC
(rev 24016)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_util.c 2007-07-24 08:59:36 UTC
(rev 24017)
@@ -323,7 +323,9 @@
domain = add_trusted_domain(p, alternate_name,
cache_methods,
sid);
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ setup_domain_child(domain, domain-child,
NULL);
+ }
}
p=q;
if (p != NULL)
@@ -702,32 +704,38 @@
domain = add_trusted_domain( lp_workgroup(), lp_realm(),
cache_methods, our_sid);
- domain-primary = True;
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ domain-primary = True;
+ setup_domain_child(domain, domain-child, NULL);
- /* Even in the parent winbindd we'll need to
- talk to the DC, so try and see if we can
- contact it. Theoretically this isn't neccessary
- as the init_dc_connection() in init_child_recv()
- will do this, but we can start detecting the DC
- early here. */
- set_domain_online_request(domain);
+ /* Even in the parent winbindd we'll need to
+ talk to the DC, so try and see if we can
+ contact it. Theoretically this isn't neccessary
+ as the init_dc_connection() in init_child_recv()
+ will do this, but we can start detecting the DC
+ early here. */
+ set_domain_online_request(domain);
+ }
}
/* Local SAM */
domain = add_trusted_domain(get_global_sam_name(), NULL,
passdb_methods, get_global_sam_sid());
- if ( role != ROLE_DOMAIN_MEMBER ) {
- domain-primary = True;
+ if (domain) {
+ if ( role != ROLE_DOMAIN_MEMBER ) {
+ domain-primary = True;
+ }
+ setup_domain_child(domain, domain-child, NULL);
}
- setup_domain_child(domain, domain-child, NULL);
/* BUILTIN domain */
domain = add_trusted_domain(BUILTIN, NULL, passdb_methods,
global_sid_Builtin);
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ setup_domain_child(domain, domain-child, NULL);
+ }
return True;
}
svn commit: samba r24018 - in branches/SAMBA_3_2_0/source/nsswitch: .
Author: metze
Date: 2007-07-24 09:00:00 + (Tue, 24 Jul 2007)
New Revision: 24018
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24018
Log:
merge from http://samba.org/~tridge/samba_3_2_ctdb/:
add add_trusted_domain() can return NULL
metze
Modified:
branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c2007-07-24
08:59:36 UTC (rev 24017)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c2007-07-24
09:00:00 UTC (rev 24018)
@@ -324,7 +324,9 @@
domain = add_trusted_domain(p, alternate_name,
cache_methods,
sid);
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ setup_domain_child(domain, domain-child,
NULL);
+ }
}
p=q;
if (p != NULL)
@@ -703,32 +705,38 @@
domain = add_trusted_domain( lp_workgroup(), lp_realm(),
cache_methods, our_sid);
- domain-primary = True;
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ domain-primary = True;
+ setup_domain_child(domain, domain-child, NULL);
- /* Even in the parent winbindd we'll need to
- talk to the DC, so try and see if we can
- contact it. Theoretically this isn't neccessary
- as the init_dc_connection() in init_child_recv()
- will do this, but we can start detecting the DC
- early here. */
- set_domain_online_request(domain);
+ /* Even in the parent winbindd we'll need to
+ talk to the DC, so try and see if we can
+ contact it. Theoretically this isn't neccessary
+ as the init_dc_connection() in init_child_recv()
+ will do this, but we can start detecting the DC
+ early here. */
+ set_domain_online_request(domain);
+ }
}
/* Local SAM */
domain = add_trusted_domain(get_global_sam_name(), NULL,
passdb_methods, get_global_sam_sid());
- if ( role != ROLE_DOMAIN_MEMBER ) {
- domain-primary = True;
+ if (domain) {
+ if ( role != ROLE_DOMAIN_MEMBER ) {
+ domain-primary = True;
+ }
+ setup_domain_child(domain, domain-child, NULL);
}
- setup_domain_child(domain, domain-child, NULL);
/* BUILTIN domain */
domain = add_trusted_domain(BUILTIN, NULL, passdb_methods,
global_sid_Builtin);
- setup_domain_child(domain, domain-child, NULL);
+ if (domain) {
+ setup_domain_child(domain, domain-child, NULL);
+ }
return True;
}
svn commit: samba r24019 - in branches/SAMBA_3_2/source/utils: .
Author: metze
Date: 2007-07-24 09:20:23 + (Tue, 24 Jul 2007)
New Revision: 24019
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24019
Log:
merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:
use a timed event to make sure the timelimit is correctly
handled in smbcontrol when waiting for messages
metze
Modified:
branches/SAMBA_3_2/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_2/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_2/source/utils/smbcontrol.c2007-07-24 09:00:00 UTC
(rev 24018)
+++ branches/SAMBA_3_2/source/utils/smbcontrol.c2007-07-24 09:20:23 UTC
(rev 24019)
@@ -65,23 +65,38 @@
return ret;
}
+static void timeout_handler(struct event_context *event_ctx,
+ struct timed_event *te,
+ const struct timeval *now,
+ void *private_data)
+{
+ BOOL *timed_out = (BOOL *)private_data;
+ TALLOC_FREE(te);
+ *timed_out = True;
+}
+
/* Wait for one or more reply messages */
static void wait_replies(struct messaging_context *msg_ctx,
BOOL multiple_replies)
{
- time_t start_time = time(NULL);
+ struct timed_event *te;
+ BOOL timed_out = False;
- /* Wait around a bit. This is pretty disgusting - we have to
- busy-wait here as there is no nicer way to do it. */
+ if (!(te = event_add_timed(messaging_event_context(msg_ctx), NULL,
+ timeval_current_ofs(timeout, 0),
+ smbcontrol_timeout,
+ timeout_handler, (void *)timed_out))) {
+ DEBUG(0, (event_add_timed failed\n));
+ return;
+ }
- do {
+ while (!timed_out) {
message_dispatch(msg_ctx);
- event_loop_once(messaging_event_context(msg_ctx));
if (num_replies 0 !multiple_replies)
break;
- sleep(1);
- } while (timeout - (time(NULL) - start_time) 0);
+ event_loop_once(messaging_event_context(msg_ctx));
+ }
}
/* Message handler callback that displays the PID and a string on stdout */
svn commit: samba r24020 - in branches/SAMBA_3_2_0/source/utils: .
Author: metze
Date: 2007-07-24 09:20:58 + (Tue, 24 Jul 2007)
New Revision: 24020
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24020
Log:
merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:
use a timed event to make sure the timelimit is correctly
handled in smbcontrol when waiting for messages
metze
Modified:
branches/SAMBA_3_2_0/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-07-24 09:20:23 UTC
(rev 24019)
+++ branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-07-24 09:20:58 UTC
(rev 24020)
@@ -65,23 +65,38 @@
return ret;
}
+static void timeout_handler(struct event_context *event_ctx,
+ struct timed_event *te,
+ const struct timeval *now,
+ void *private_data)
+{
+ BOOL *timed_out = (BOOL *)private_data;
+ TALLOC_FREE(te);
+ *timed_out = True;
+}
+
/* Wait for one or more reply messages */
static void wait_replies(struct messaging_context *msg_ctx,
BOOL multiple_replies)
{
- time_t start_time = time(NULL);
+ struct timed_event *te;
+ BOOL timed_out = False;
- /* Wait around a bit. This is pretty disgusting - we have to
- busy-wait here as there is no nicer way to do it. */
+ if (!(te = event_add_timed(messaging_event_context(msg_ctx), NULL,
+ timeval_current_ofs(timeout, 0),
+ smbcontrol_timeout,
+ timeout_handler, (void *)timed_out))) {
+ DEBUG(0, (event_add_timed failed\n));
+ return;
+ }
- do {
+ while (!timed_out) {
message_dispatch(msg_ctx);
- event_loop_once(messaging_event_context(msg_ctx));
if (num_replies 0 !multiple_replies)
break;
- sleep(1);
- } while (timeout - (time(NULL) - start_time) 0);
+ event_loop_once(messaging_event_context(msg_ctx));
+ }
}
/* Message handler callback that displays the PID and a string on stdout */
svn commit: samba r24021 - in branches/SAMBA_3_2/source: include utils
Author: metze
Date: 2007-07-24 09:32:05 + (Tue, 24 Jul 2007)
New Revision: 24021
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24021
Log:
use MSG_BROADCAST_PID_STR as value for broadcast messages
to fix the cluster case
vl: please check, if this works with clustering = no
metze
Modified:
branches/SAMBA_3_2/source/include/messages.h
branches/SAMBA_3_2/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_2/source/include/messages.h
===
--- branches/SAMBA_3_2/source/include/messages.h2007-07-24 09:20:58 UTC
(rev 24020)
+++ branches/SAMBA_3_2/source/include/messages.h2007-07-24 09:32:05 UTC
(rev 24021)
@@ -148,8 +148,12 @@
#endif
};
+#ifdef CLUSTER_SUPPORT
+#define MSG_BROADCAST_PID_STR 0:0
+#else
+#define MSG_BROADCAST_PID_STR 0
+#endif
-
struct messaging_context;
struct messaging_rec;
struct data_blob;
Modified: branches/SAMBA_3_2/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_2/source/utils/smbcontrol.c2007-07-24 09:20:58 UTC
(rev 24020)
+++ branches/SAMBA_3_2/source/utils/smbcontrol.c2007-07-24 09:32:05 UTC
(rev 24021)
@@ -1148,7 +1148,7 @@
/* Zero is a special return value for broadcast smbd */
if (strequal(dest, smbd)) {
- return interpret_pid(0);
+ return interpret_pid(MSG_BROADCAST_PID_STR);
}
/* Try self - useful for testing */
svn commit: samba r24022 - in branches/SAMBA_3_2_0/source: include utils
Author: metze
Date: 2007-07-24 09:32:33 + (Tue, 24 Jul 2007)
New Revision: 24022
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24022
Log:
use MSG_BROADCAST_PID_STR as value for broadcast messages
to fix the cluster case
vl: please check, if this works with clustering = no
metze
Modified:
branches/SAMBA_3_2_0/source/include/messages.h
branches/SAMBA_3_2_0/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/include/messages.h
===
--- branches/SAMBA_3_2_0/source/include/messages.h 2007-07-24 09:32:05 UTC
(rev 24021)
+++ branches/SAMBA_3_2_0/source/include/messages.h 2007-07-24 09:32:33 UTC
(rev 24022)
@@ -148,8 +148,12 @@
#endif
};
+#ifdef CLUSTER_SUPPORT
+#define MSG_BROADCAST_PID_STR 0:0
+#else
+#define MSG_BROADCAST_PID_STR 0
+#endif
-
struct messaging_context;
struct messaging_rec;
struct data_blob;
Modified: branches/SAMBA_3_2_0/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-07-24 09:32:05 UTC
(rev 24021)
+++ branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-07-24 09:32:33 UTC
(rev 24022)
@@ -1148,7 +1148,7 @@
/* Zero is a special return value for broadcast smbd */
if (strequal(dest, smbd)) {
- return interpret_pid(0);
+ return interpret_pid(MSG_BROADCAST_PID_STR);
}
/* Try self - useful for testing */
svn commit: samba r24023 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib
Author: gd Date: 2007-07-24 09:42:15 + (Tue, 24 Jul 2007) New Revision: 24023 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24023 Log: Correctly support REG_BINARY in registry_push_value() and registry_pull_value(). Guenther Modified: branches/SAMBA_3_2/source/lib/util_reg_api.c branches/SAMBA_3_2_0/source/lib/util_reg_api.c Changeset: Modified: branches/SAMBA_3_2/source/lib/util_reg_api.c === --- branches/SAMBA_3_2/source/lib/util_reg_api.c2007-07-24 09:32:33 UTC (rev 24022) +++ branches/SAMBA_3_2/source/lib/util_reg_api.c2007-07-24 09:42:15 UTC (rev 24023) @@ -107,8 +107,7 @@ } break; case REG_BINARY: - value-v.binary.data = talloc_move(value, data); - value-v.binary.length = length; + value-v.binary = data_blob_talloc(mem_ctx, data, length); break; default: err = WERR_INVALID_PARAM; @@ -148,6 +147,11 @@ } break; } + case REG_BINARY: + *presult = data_blob_talloc(mem_ctx, + value-v.binary.data, + value-v.binary.length); + break; default: return WERR_INVALID_PARAM; } Modified: branches/SAMBA_3_2_0/source/lib/util_reg_api.c === --- branches/SAMBA_3_2_0/source/lib/util_reg_api.c 2007-07-24 09:32:33 UTC (rev 24022) +++ branches/SAMBA_3_2_0/source/lib/util_reg_api.c 2007-07-24 09:42:15 UTC (rev 24023) @@ -107,8 +107,7 @@ } break; case REG_BINARY: - value-v.binary.data = talloc_move(value, data); - value-v.binary.length = length; + value-v.binary = data_blob_talloc(mem_ctx, data, length); break; default: err = WERR_INVALID_PARAM; @@ -148,6 +147,11 @@ } break; } + case REG_BINARY: + *presult = data_blob_talloc(mem_ctx, + value-v.binary.data, + value-v.binary.length); + break; default: return WERR_INVALID_PARAM; }
svn commit: samba r24024 - in branches: SAMBA_3_2/source/libgpo SAMBA_3_2_0/source/libgpo
Author: gd
Date: 2007-07-24 09:46:21 + (Tue, 24 Jul 2007)
New Revision: 24024
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24024
Log:
Minor cleanup in ads_parse_gp_ext().
Guenther
Modified:
branches/SAMBA_3_2/source/libgpo/gpo_ldap.c
branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c
Changeset:
Modified: branches/SAMBA_3_2/source/libgpo/gpo_ldap.c
===
--- branches/SAMBA_3_2/source/libgpo/gpo_ldap.c 2007-07-24 09:42:15 UTC (rev
24023)
+++ branches/SAMBA_3_2/source/libgpo/gpo_ldap.c 2007-07-24 09:46:21 UTC (rev
24024)
@@ -29,6 +29,7 @@
const char *extension_raw,
struct GP_EXT **gp_ext)
{
+ ADS_STATUS status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
struct GP_EXT *ext = NULL;
char **ext_list;
char **ext_strings = NULL;
@@ -131,16 +132,9 @@
}
}
- if (ext_list) {
- str_list_free_talloc(mem_ctx, ext_list);
- }
- if (ext_strings) {
- str_list_free_talloc(mem_ctx, ext_strings);
- }
-
*gp_ext = ext;
- return ADS_ERROR(LDAP_SUCCESS);
+ status = ADS_ERROR_NT(NT_STATUS_OK);
parse_error:
if (ext_list) {
@@ -150,7 +144,7 @@
str_list_free_talloc(mem_ctx, ext_strings);
}
- return ADS_ERROR(LDAP_NO_MEMORY);
+ return status;
}
/
Modified: branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c
===
--- branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c 2007-07-24 09:42:15 UTC
(rev 24023)
+++ branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c 2007-07-24 09:46:21 UTC
(rev 24024)
@@ -29,6 +29,7 @@
const char *extension_raw,
struct GP_EXT **gp_ext)
{
+ ADS_STATUS status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
struct GP_EXT *ext = NULL;
char **ext_list;
char **ext_strings = NULL;
@@ -131,16 +132,9 @@
}
}
- if (ext_list) {
- str_list_free_talloc(mem_ctx, ext_list);
- }
- if (ext_strings) {
- str_list_free_talloc(mem_ctx, ext_strings);
- }
-
*gp_ext = ext;
- return ADS_ERROR(LDAP_SUCCESS);
+ status = ADS_ERROR_NT(NT_STATUS_OK);
parse_error:
if (ext_list) {
@@ -150,7 +144,7 @@
str_list_free_talloc(mem_ctx, ext_strings);
}
- return ADS_ERROR(LDAP_NO_MEMORY);
+ return status;
}
/
svn commit: samba r24025 - in branches/SAMBA_3_2/source/lib: .
Author: metze
Date: 2007-07-24 09:47:26 + (Tue, 24 Jul 2007)
New Revision: 24025
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24025
Log:
packet_send() expects DATA_BLOB elements as vaargs
and not TDB_DATA
metze
Modified:
branches/SAMBA_3_2/source/lib/ctdbd_conn.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/ctdbd_conn.c
===
--- branches/SAMBA_3_2/source/lib/ctdbd_conn.c 2007-07-24 09:46:21 UTC (rev
24024)
+++ branches/SAMBA_3_2/source/lib/ctdbd_conn.c 2007-07-24 09:47:26 UTC (rev
24025)
@@ -684,7 +684,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_control, data)),
- data);
+ data_blob_const(data.dptr, data.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
@@ -852,7 +852,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_call, data)),
- key);
+ data_blob_const(key.dptr, key.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
@@ -911,7 +911,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_call, data)),
- key);
+ data_blob_const(key.dptr, key.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
svn commit: samba r24026 - in branches/SAMBA_3_2_0/source/lib: .
Author: metze
Date: 2007-07-24 09:47:54 + (Tue, 24 Jul 2007)
New Revision: 24026
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24026
Log:
packet_send() expects DATA_BLOB elements as vaargs
and not TDB_DATA
metze
Modified:
branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c
===
--- branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c2007-07-24 09:47:26 UTC
(rev 24025)
+++ branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c2007-07-24 09:47:54 UTC
(rev 24026)
@@ -684,7 +684,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_control, data)),
- data);
+ data_blob_const(data.dptr, data.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
@@ -852,7 +852,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_call, data)),
- key);
+ data_blob_const(key.dptr, key.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
@@ -911,7 +911,7 @@
status = packet_send(
conn-pkt, 2,
data_blob_const(req, offsetof(struct ctdb_req_call, data)),
- key);
+ data_blob_const(key.dptr, key.dsize));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, (packet_send failed: %s\n, nt_errstr(status)));
svn commit: samba r24027 - in branches/SAMBA_3_2/source: nmbd param
Author: metze
Date: 2007-07-24 10:24:27 + (Tue, 24 Jul 2007)
New Revision: 24027
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24027
Log:
merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:
add in any cluster addresses. We need to response to these,
but not listen on them. This allows us to run nmbd on every
node in the cluster, and have all of them register with a
WINS server correctly
metze
Modified:
branches/SAMBA_3_2/source/nmbd/nmbd_mynames.c
branches/SAMBA_3_2/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_2/source/nmbd/nmbd_mynames.c
===
--- branches/SAMBA_3_2/source/nmbd/nmbd_mynames.c 2007-07-24 09:47:54 UTC
(rev 24026)
+++ branches/SAMBA_3_2/source/nmbd/nmbd_mynames.c 2007-07-24 10:24:27 UTC
(rev 24027)
@@ -114,6 +114,7 @@
{
struct subnet_record *subrec;
int i;
+ const char **cluster_addresses = NULL;
for(subrec = FIRST_SUBNET; subrec; subrec =
NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
register_my_workgroup_one_subnet(subrec);
@@ -145,6 +146,35 @@
}
/*
+* add in any cluster addresses. We need to response to these,
+* but not listen on them. This allows us to run nmbd on every
+* node in the cluster, and have all of them register with a
+* WINS server correctly
+*/
+ if (lp_clustering()) {
+ cluster_addresses = lp_cluster_addresses();
+ }
+ if (cluster_addresses) {
+ int a, n;
+ unsigned name_types[] = {0x20, 0x3, 0x0};
+
+ for (i=0; my_netbios_names(i); i++) {
+ for(subrec = FIRST_SUBNET; subrec; subrec =
subrec-next) {
+ for (n=0;nARRAY_SIZE(name_types);n++) {
+ struct name_record *namerec;
+ struct nmb_name nmbname;
+ make_nmb_name(nmbname,
my_netbios_names(i), name_types[n]);
+ namerec =
find_name_on_subnet(unicast_subnet, nmbname, FIND_SELF_NAME);
+ if (namerec == NULL) continue;
+ for (a=0;cluster_addresses[a];a++) {
+ add_ip_to_name_record(namerec,
*interpret_addr2(cluster_addresses[a]));
+ }
+ }
+ }
+ }
+ }
+
+ /*
* Add the WORKGROUP0 and WORKGROUP1e group names to the unicast
subnet
* also for the same reasons.
*/
Modified: branches/SAMBA_3_2/source/param/loadparm.c
===
--- branches/SAMBA_3_2/source/param/loadparm.c 2007-07-24 09:47:54 UTC (rev
24026)
+++ branches/SAMBA_3_2/source/param/loadparm.c 2007-07-24 10:24:27 UTC (rev
24027)
@@ -252,6 +252,7 @@
char *szCupsServer;
char *szIPrintServer;
char *ctdbdSocket;
+ char **szClusterAddresses;
BOOL clustering;
int ldap_passwd_sync;
int ldap_replication_sleep;
@@ -1046,6 +1047,7 @@
{name cache timeout, P_INTEGER, P_GLOBAL,
Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED},
{ctdbd socket, P_STRING, P_GLOBAL, Globals.ctdbdSocket, NULL, NULL,
FLAG_ADVANCED | FLAG_GLOBAL},
+ {cluster addresses, P_LIST, P_GLOBAL, Globals.szClusterAddresses,
NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL},
{clustering, P_BOOL, P_GLOBAL, Globals.clustering, NULL, NULL,
FLAG_ADVANCED | FLAG_GLOBAL},
{N_(Printing Options), P_SEP, P_SEPARATOR},
@@ -1645,6 +1647,7 @@
string_set(Globals.szIPrintServer, );
string_set(Globals.ctdbdSocket, );
+ Globals.szClusterAddresses = NULL;
Globals.clustering = False;
Globals.winbind_cache_time = 300; /* 5 minutes */
@@ -2061,6 +2064,7 @@
FN_GLOBAL_STRING(lp_cups_server, Globals.szCupsServer)
FN_GLOBAL_STRING(lp_iprint_server, Globals.szIPrintServer)
FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, Globals.ctdbdSocket)
+FN_GLOBAL_LIST(lp_cluster_addresses, Globals.szClusterAddresses)
FN_GLOBAL_BOOL(lp_clustering, Globals.clustering);
FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
svn commit: samba r24028 - in branches/SAMBA_3_2_0/source: nmbd param
Author: metze
Date: 2007-07-24 10:25:09 + (Tue, 24 Jul 2007)
New Revision: 24028
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24028
Log:
merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:
add in any cluster addresses. We need to response to these,
but not listen on them. This allows us to run nmbd on every
node in the cluster, and have all of them register with a
WINS server correctly
metze
Modified:
branches/SAMBA_3_2_0/source/nmbd/nmbd_mynames.c
branches/SAMBA_3_2_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/nmbd/nmbd_mynames.c
===
--- branches/SAMBA_3_2_0/source/nmbd/nmbd_mynames.c 2007-07-24 10:24:27 UTC
(rev 24027)
+++ branches/SAMBA_3_2_0/source/nmbd/nmbd_mynames.c 2007-07-24 10:25:09 UTC
(rev 24028)
@@ -114,6 +114,7 @@
{
struct subnet_record *subrec;
int i;
+ const char **cluster_addresses = NULL;
for(subrec = FIRST_SUBNET; subrec; subrec =
NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
register_my_workgroup_one_subnet(subrec);
@@ -145,6 +146,35 @@
}
/*
+* add in any cluster addresses. We need to response to these,
+* but not listen on them. This allows us to run nmbd on every
+* node in the cluster, and have all of them register with a
+* WINS server correctly
+*/
+ if (lp_clustering()) {
+ cluster_addresses = lp_cluster_addresses();
+ }
+ if (cluster_addresses) {
+ int a, n;
+ unsigned name_types[] = {0x20, 0x3, 0x0};
+
+ for (i=0; my_netbios_names(i); i++) {
+ for(subrec = FIRST_SUBNET; subrec; subrec =
subrec-next) {
+ for (n=0;nARRAY_SIZE(name_types);n++) {
+ struct name_record *namerec;
+ struct nmb_name nmbname;
+ make_nmb_name(nmbname,
my_netbios_names(i), name_types[n]);
+ namerec =
find_name_on_subnet(unicast_subnet, nmbname, FIND_SELF_NAME);
+ if (namerec == NULL) continue;
+ for (a=0;cluster_addresses[a];a++) {
+ add_ip_to_name_record(namerec,
*interpret_addr2(cluster_addresses[a]));
+ }
+ }
+ }
+ }
+ }
+
+ /*
* Add the WORKGROUP0 and WORKGROUP1e group names to the unicast
subnet
* also for the same reasons.
*/
Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===
--- branches/SAMBA_3_2_0/source/param/loadparm.c2007-07-24 10:24:27 UTC
(rev 24027)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c2007-07-24 10:25:09 UTC
(rev 24028)
@@ -253,6 +253,7 @@
char *szCupsServer;
char *szIPrintServer;
char *ctdbdSocket;
+ char **szClusterAddresses;
BOOL clustering;
int ldap_passwd_sync;
int ldap_replication_sleep;
@@ -1049,6 +1050,7 @@
{name cache timeout, P_INTEGER, P_GLOBAL,
Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED},
{ctdbd socket, P_STRING, P_GLOBAL, Globals.ctdbdSocket, NULL, NULL,
FLAG_ADVANCED | FLAG_GLOBAL},
+ {cluster addresses, P_LIST, P_GLOBAL, Globals.szClusterAddresses,
NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL},
{clustering, P_BOOL, P_GLOBAL, Globals.clustering, NULL, NULL,
FLAG_ADVANCED | FLAG_GLOBAL},
{N_(Printing Options), P_SEP, P_SEPARATOR},
@@ -1648,6 +1650,7 @@
string_set(Globals.szIPrintServer, );
string_set(Globals.ctdbdSocket, );
+ Globals.szClusterAddresses = NULL;
Globals.clustering = False;
Globals.winbind_cache_time = 300; /* 5 minutes */
@@ -2061,6 +2064,7 @@
FN_GLOBAL_STRING(lp_cups_server, Globals.szCupsServer)
FN_GLOBAL_STRING(lp_iprint_server, Globals.szIPrintServer)
FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, Globals.ctdbdSocket)
+FN_GLOBAL_LIST(lp_cluster_addresses, Globals.szClusterAddresses)
FN_GLOBAL_BOOL(lp_clustering, Globals.clustering);
FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
svn commit: samba r24029 - in branches/SAMBA_3_2/source/smbd: .
Author: metze Date: 2007-07-24 10:35:10 + (Tue, 24 Jul 2007) New Revision: 24029 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24029 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: the claim_connection() must come after the sockets are open metze Modified: branches/SAMBA_3_2/source/smbd/server.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/server.c === --- branches/SAMBA_3_2/source/smbd/server.c 2007-07-24 10:25:09 UTC (rev 24028) +++ branches/SAMBA_3_2/source/smbd/server.c 2007-07-24 10:35:10 UTC (rev 24029) @@ -349,6 +349,14 @@ maxfd = MAX(maxfd, fd_listenset[i]); } + + /* Setup the main smbd so that we can get messages. Note that + do this after starting listening. This is needed as when in + clustered mode, ctdb won't allow us to start doing database + operations until it has gone thru a full startup, which + includes checking to see that smbd is listening. */ + claim_connection(NULL,,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); + /* Listen to messages */ messaging_register(smbd_messaging_context(), NULL, @@ -1040,11 +1048,6 @@ return -1; } - /* Setup the main smbd so that we can get messages. */ - /* don't worry about general printing messages here */ - - claim_connection(NULL,,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); - /* only start the background queue daemon if we are running as a daemon -- bad things will happen if smbd is launched via inetd and we fork a copy of
svn commit: samba r24030 - in branches/SAMBA_3_2_0/source/smbd: .
Author: metze Date: 2007-07-24 10:35:44 + (Tue, 24 Jul 2007) New Revision: 24030 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24030 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: the claim_connection() must come after the sockets are open metze Modified: branches/SAMBA_3_2_0/source/smbd/server.c Changeset: Modified: branches/SAMBA_3_2_0/source/smbd/server.c === --- branches/SAMBA_3_2_0/source/smbd/server.c 2007-07-24 10:35:10 UTC (rev 24029) +++ branches/SAMBA_3_2_0/source/smbd/server.c 2007-07-24 10:35:44 UTC (rev 24030) @@ -435,6 +435,14 @@ SAFE_FREE(ports); + + /* Setup the main smbd so that we can get messages. Note that + do this after starting listening. This is needed as when in + clustered mode, ctdb won't allow us to start doing database + operations until it has gone thru a full startup, which + includes checking to see that smbd is listening. */ + claim_connection(NULL,,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); + /* Listen to messages */ messaging_register(smbd_messaging_context(), NULL, @@ -1078,11 +1086,6 @@ return -1; } - /* Setup the main smbd so that we can get messages. */ - /* don't worry about general printing messages here */ - - claim_connection(NULL,,FLAG_MSG_GENERAL|FLAG_MSG_SMBD); - /* only start the background queue daemon if we are running as a daemon -- bad things will happen if smbd is launched via inetd and we fork a copy of
svn commit: samba r24031 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib
Author: vlendec
Date: 2007-07-24 11:45:29 + (Tue, 24 Jul 2007)
New Revision: 24031
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24031
Log:
Fix some 64 bit warnings
Modified:
branches/SAMBA_3_2/source/lib/ctdbd_conn.c
branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/ctdbd_conn.c
===
--- branches/SAMBA_3_2/source/lib/ctdbd_conn.c 2007-07-24 10:35:44 UTC (rev
24030)
+++ branches/SAMBA_3_2/source/lib/ctdbd_conn.c 2007-07-24 11:45:29 UTC (rev
24031)
@@ -157,8 +157,8 @@
if (msglen sizeof(struct ctdb_req_header)) {
DEBUG(0, (Got invalid msglen: %d, expected at least %d for
- the req_header\n, msglen,
- sizeof(struct ctdb_req_header)));
+ the req_header\n, (int)msglen,
+ (int)sizeof(struct ctdb_req_header)));
cluster_fatal(ctdbd protocol error\n);
}
@@ -313,7 +313,8 @@
if (conn-msg_ctx == NULL) {
DEBUG(1, (Got a message without having a msg ctx,
- dropping msg %llu\n, msg-srvid));
+ dropping msg %llu\n,
+ (long long unsigned)msg-srvid));
goto again;
}
Modified: branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c
===
--- branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c2007-07-24 10:35:44 UTC
(rev 24030)
+++ branches/SAMBA_3_2_0/source/lib/ctdbd_conn.c2007-07-24 11:45:29 UTC
(rev 24031)
@@ -157,8 +157,8 @@
if (msglen sizeof(struct ctdb_req_header)) {
DEBUG(0, (Got invalid msglen: %d, expected at least %d for
- the req_header\n, msglen,
- sizeof(struct ctdb_req_header)));
+ the req_header\n, (int)msglen,
+ (int)sizeof(struct ctdb_req_header)));
cluster_fatal(ctdbd protocol error\n);
}
@@ -313,7 +313,8 @@
if (conn-msg_ctx == NULL) {
DEBUG(1, (Got a message without having a msg ctx,
- dropping msg %llu\n, msg-srvid));
+ dropping msg %llu\n,
+ (long long unsigned)msg-srvid));
goto again;
}
svn commit: samba r24032 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib
Author: vlendec
Date: 2007-07-24 11:47:37 + (Tue, 24 Jul 2007)
New Revision: 24032
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24032
Log:
It helps testing tremendously if the cluster messaging actually sends
and receives messages to other nodes... :-)
Modified:
branches/SAMBA_3_2/source/lib/messages.c
branches/SAMBA_3_2/source/lib/messages_ctdbd.c
branches/SAMBA_3_2_0/source/lib/messages.c
branches/SAMBA_3_2_0/source/lib/messages_ctdbd.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/messages.c
===
--- branches/SAMBA_3_2/source/lib/messages.c2007-07-24 11:45:29 UTC (rev
24031)
+++ branches/SAMBA_3_2/source/lib/messages.c2007-07-24 11:47:37 UTC (rev
24032)
@@ -320,6 +320,13 @@
struct server_id server, uint32_t msg_type,
const DATA_BLOB *data)
{
+#ifdef CLUSTER_SUPPORT
+ if (!procid_is_local(server)) {
+ return msg_ctx-remote-send_fn(msg_ctx, server,
+ msg_type, data,
+ msg_ctx-remote);
+ }
+#endif
return msg_ctx-local-send_fn(msg_ctx, server, msg_type, data,
msg_ctx-local);
}
Modified: branches/SAMBA_3_2/source/lib/messages_ctdbd.c
===
--- branches/SAMBA_3_2/source/lib/messages_ctdbd.c 2007-07-24 11:45:29 UTC
(rev 24031)
+++ branches/SAMBA_3_2/source/lib/messages_ctdbd.c 2007-07-24 11:47:37 UTC
(rev 24032)
@@ -94,6 +94,15 @@
return status;
}
+ status = ctdbd_register_msg_ctx(ctx-conn, msg_ctx);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, (ctdbd_register_msg_ctx failed: %s\n,
+ nt_errstr(status)));
+ TALLOC_FREE(result);
+ return status;
+ }
+
global_ctdbd_connection = ctx-conn;
talloc_set_destructor(ctx, messaging_ctdbd_destructor);
Modified: branches/SAMBA_3_2_0/source/lib/messages.c
===
--- branches/SAMBA_3_2_0/source/lib/messages.c 2007-07-24 11:45:29 UTC (rev
24031)
+++ branches/SAMBA_3_2_0/source/lib/messages.c 2007-07-24 11:47:37 UTC (rev
24032)
@@ -320,6 +320,13 @@
struct server_id server, uint32_t msg_type,
const DATA_BLOB *data)
{
+#ifdef CLUSTER_SUPPORT
+ if (!procid_is_local(server)) {
+ return msg_ctx-remote-send_fn(msg_ctx, server,
+ msg_type, data,
+ msg_ctx-remote);
+ }
+#endif
return msg_ctx-local-send_fn(msg_ctx, server, msg_type, data,
msg_ctx-local);
}
Modified: branches/SAMBA_3_2_0/source/lib/messages_ctdbd.c
===
--- branches/SAMBA_3_2_0/source/lib/messages_ctdbd.c2007-07-24 11:45:29 UTC
(rev 24031)
+++ branches/SAMBA_3_2_0/source/lib/messages_ctdbd.c2007-07-24 11:47:37 UTC
(rev 24032)
@@ -94,6 +94,15 @@
return status;
}
+ status = ctdbd_register_msg_ctx(ctx-conn, msg_ctx);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, (ctdbd_register_msg_ctx failed: %s\n,
+ nt_errstr(status)));
+ TALLOC_FREE(result);
+ return status;
+ }
+
global_ctdbd_connection = ctx-conn;
talloc_set_destructor(ctx, messaging_ctdbd_destructor);
svn commit: samba r24033 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib
Author: vlendec Date: 2007-07-24 11:48:35 + (Tue, 24 Jul 2007) New Revision: 24033 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24033 Log: We need to be able to cope with packet_handler calling itself recursively Modified: branches/SAMBA_3_2/source/lib/packet.c branches/SAMBA_3_2_0/source/lib/packet.c Changeset: Modified: branches/SAMBA_3_2/source/lib/packet.c === --- branches/SAMBA_3_2/source/lib/packet.c 2007-07-24 11:47:37 UTC (rev 24032) +++ branches/SAMBA_3_2/source/lib/packet.c 2007-07-24 11:48:35 UTC (rev 24033) @@ -136,15 +136,16 @@ SMB_ASSERT(length = ctx-in.length); - data.data = ctx-in.data; - data.length = length; + data = data_blob(ctx-in.data, length); - *status = callback(data, private_data); - memmove(ctx-in.data, ctx-in.data + length, ctx-in.length - length); ctx-in.length -= length; + *status = callback(data, private_data); + + data_blob_free(data); + return True; } Modified: branches/SAMBA_3_2_0/source/lib/packet.c === --- branches/SAMBA_3_2_0/source/lib/packet.c2007-07-24 11:47:37 UTC (rev 24032) +++ branches/SAMBA_3_2_0/source/lib/packet.c2007-07-24 11:48:35 UTC (rev 24033) @@ -136,15 +136,16 @@ SMB_ASSERT(length = ctx-in.length); - data.data = ctx-in.data; - data.length = length; + data = data_blob(ctx-in.data, length); - *status = callback(data, private_data); - memmove(ctx-in.data, ctx-in.data + length, ctx-in.length - length); ctx-in.length -= length; + *status = callback(data, private_data); + + data_blob_free(data); + return True; }
svn commit: samba r24034 - in branches: SAMBA_3_2/source/locking SAMBA_3_2_0/source/locking
Author: vlendec
Date: 2007-07-24 11:50:54 + (Tue, 24 Jul 2007)
New Revision: 24034
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24034
Log:
Print the full cluster pid in print_lock_struct
Modified:
branches/SAMBA_3_2/source/locking/brlock.c
branches/SAMBA_3_2_0/source/locking/brlock.c
Changeset:
Modified: branches/SAMBA_3_2/source/locking/brlock.c
===
--- branches/SAMBA_3_2/source/locking/brlock.c 2007-07-24 11:48:35 UTC (rev
24033)
+++ branches/SAMBA_3_2/source/locking/brlock.c 2007-07-24 11:50:54 UTC (rev
24034)
@@ -41,11 +41,11 @@
static void print_lock_struct(unsigned int i, struct lock_struct *pls)
{
- DEBUG(10,([%u]: smbpid = %u, tid = %u, pid = %u, ,
+ DEBUG(10,([%u]: smbpid = %u, tid = %u, pid = %s, ,
i,
(unsigned int)pls-context.smbpid,
(unsigned int)pls-context.tid,
- (unsigned int)procid_to_pid(pls-context.pid) ));
+ procid_str_static(pls-context.pid) ));
DEBUG(10,(start = %.0f, size = %.0f, fnum = %d, %s %s\n,
(double)pls-start,
Modified: branches/SAMBA_3_2_0/source/locking/brlock.c
===
--- branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-24 11:48:35 UTC
(rev 24033)
+++ branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-24 11:50:54 UTC
(rev 24034)
@@ -41,11 +41,11 @@
static void print_lock_struct(unsigned int i, struct lock_struct *pls)
{
- DEBUG(10,([%u]: smbpid = %u, tid = %u, pid = %u, ,
+ DEBUG(10,([%u]: smbpid = %u, tid = %u, pid = %s, ,
i,
(unsigned int)pls-context.smbpid,
(unsigned int)pls-context.tid,
- (unsigned int)procid_to_pid(pls-context.pid) ));
+ procid_str_static(pls-context.pid) ));
DEBUG(10,(start = %.0f, size = %.0f, fnum = %d, %s %s\n,
(double)pls-start,
svn commit: samba r24035 - in branches/SAMBA_3_0_25/source/modules: .
Author: vlendec Date: 2007-07-24 11:52:38 + (Tue, 24 Jul 2007) New Revision: 24035 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24035 Log: merge from http://samba.org/~tridge/samba_3_2_ctdb/: fixed prototype Modified: branches/SAMBA_3_0_25/source/modules/nfs4_acls.h Changeset: Modified: branches/SAMBA_3_0_25/source/modules/nfs4_acls.h === --- branches/SAMBA_3_0_25/source/modules/nfs4_acls.h2007-07-24 11:50:54 UTC (rev 24034) +++ branches/SAMBA_3_0_25/source/modules/nfs4_acls.h2007-07-24 11:52:38 UTC (rev 24035) @@ -138,7 +138,7 @@ * when applicable */ typedef BOOL (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *); -BOOL smb_set_nt_acl_nfs4(files_struct *fsp, +NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd, set_nfs4acl_native_fn_t set_nfs4_native);
Rev 584: up release number in http://samba.org/~tridge/ctdb
revno: 584 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-07-24 22:14:12 +1000 message: up release number modified: packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3 === modified file 'packaging/RPM/ctdb.spec' --- a/packaging/RPM/ctdb.spec 2007-07-10 05:29:31 + +++ b/packaging/RPM/ctdb.spec 2007-07-24 12:14:12 + @@ -5,7 +5,7 @@ Packager: Samba Team [EMAIL PROTECTED] Name: ctdb Version: 1.0 -Release: 7 +Release: 8 Epoch: 0 License: GNU GPL version 3 Group: System Environment/Daemons
svn commit: samba r24036 - in branches: SAMBA_3_0_25/source/client SAMBA_3_2/source/client SAMBA_3_2_0/source/client
Author: jra
Date: 2007-07-24 22:28:19 + (Tue, 24 Jul 2007)
New Revision: 24036
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24036
Log:
Fix dfs rename bug in smbclient reported by Thomas Bork [EMAIL PROTECTED].
Couldn't rename file as we weren't DFS enabling the target path.
Jeremy.
Modified:
branches/SAMBA_3_0_25/source/client/client.c
branches/SAMBA_3_2/source/client/client.c
branches/SAMBA_3_2_0/source/client/client.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/client/client.c
===
--- branches/SAMBA_3_0_25/source/client/client.c2007-07-24 11:52:38 UTC
(rev 24035)
+++ branches/SAMBA_3_0_25/source/client/client.c2007-07-24 22:28:19 UTC
(rev 24036)
@@ -2649,7 +2649,8 @@
pstring src,dest;
pstring buf,buf2;
struct cli_state *targetcli;
- pstring targetname;
+ pstring targetsrc;
+ pstring targetdest;
pstrcpy(src,cur_dir);
pstrcpy(dest,cur_dir);
@@ -2663,15 +2664,23 @@
pstrcat(src,buf);
pstrcat(dest,buf2);
- if ( !cli_resolve_path( , cli, src, targetcli, targetname ) ) {
- d_printf(chown %s: %s\n, src, cli_errstr(cli));
+ if ( !cli_resolve_path( , cli, src, targetcli, targetsrc ) ) {
+ d_printf(rename %s: %s\n, src, cli_errstr(cli));
return 1;
}
- if (!cli_rename(targetcli, targetname, dest)) {
- d_printf(%s renaming files\n,cli_errstr(targetcli));
+ if ( !cli_resolve_path( , cli, dest, targetcli, targetdest ) ) {
+ d_printf(rename %s: %s\n, dest, cli_errstr(cli));
return 1;
}
+
+ if (!cli_rename(targetcli, targetsrc, targetdest)) {
+ d_printf(%s renaming files %s - %s \n,
+ cli_errstr(targetcli),
+ targetsrc,
+ targetdest);
+ return 1;
+ }
return 0;
}
Modified: branches/SAMBA_3_2/source/client/client.c
===
--- branches/SAMBA_3_2/source/client/client.c 2007-07-24 11:52:38 UTC (rev
24035)
+++ branches/SAMBA_3_2/source/client/client.c 2007-07-24 22:28:19 UTC (rev
24036)
@@ -2727,7 +2727,8 @@
pstring src,dest;
pstring buf,buf2;
struct cli_state *targetcli;
- pstring targetname;
+ pstring targetsrc;
+ pstring targetdest;
pstrcpy(src,cur_dir);
pstrcpy(dest,cur_dir);
@@ -2741,15 +2742,23 @@
pstrcat(src,buf);
pstrcat(dest,buf2);
- if ( !cli_resolve_path( , cli, src, targetcli, targetname ) ) {
- d_printf(chown %s: %s\n, src, cli_errstr(cli));
+ if ( !cli_resolve_path( , cli, src, targetcli, targetsrc ) ) {
+ d_printf(rename %s: %s\n, src, cli_errstr(cli));
return 1;
}
- if (!cli_rename(targetcli, targetname, dest)) {
- d_printf(%s renaming files\n,cli_errstr(targetcli));
+ if ( !cli_resolve_path( , cli, dest, targetcli, targetdest ) ) {
+ d_printf(rename %s: %s\n, dest, cli_errstr(cli));
return 1;
}
+
+ if (!cli_rename(targetcli, targetsrc, targetdest)) {
+ d_printf(%s renaming files %s - %s \n,
+ cli_errstr(targetcli),
+ targetsrc,
+ targetdest);
+ return 1;
+ }
return 0;
}
Modified: branches/SAMBA_3_2_0/source/client/client.c
===
--- branches/SAMBA_3_2_0/source/client/client.c 2007-07-24 11:52:38 UTC (rev
24035)
+++ branches/SAMBA_3_2_0/source/client/client.c 2007-07-24 22:28:19 UTC (rev
24036)
@@ -2679,7 +2679,8 @@
pstring src,dest;
pstring buf,buf2;
struct cli_state *targetcli;
- pstring targetname;
+ pstring targetsrc;
+ pstring targetdest;
pstrcpy(src,cur_dir);
pstrcpy(dest,cur_dir);
@@ -2693,15 +2694,23 @@
pstrcat(src,buf);
pstrcat(dest,buf2);
- if ( !cli_resolve_path( , cli, src, targetcli, targetname ) ) {
- d_printf(chown %s: %s\n, src, cli_errstr(cli));
+ if ( !cli_resolve_path( , cli, src, targetcli, targetsrc ) ) {
+ d_printf(rename %s: %s\n, src, cli_errstr(cli));
return 1;
}
- if (!cli_rename(targetcli, targetname, dest)) {
- d_printf(%s renaming files\n,cli_errstr(targetcli));
+ if ( !cli_resolve_path( , cli, dest, targetcli, targetdest ) ) {
+ d_printf(rename %s: %s\n, dest, cli_errstr(cli));
return 1;
}
+
+ if (!cli_rename(targetcli, targetsrc, targetdest)) {
+ d_printf(%s renaming files %s - %s \n,
+ cli_errstr(targetcli),
+
Build status as of Wed Jul 25 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-07-24 00:01:33.0 + +++ /home/build/master/cache/broken_results.txt 2007-07-25 00:01:05.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Jul 24 00:00:02 2007 +Build status as of Wed Jul 25 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -7,18 +7,18 @@ ccache 34 8 0 ctdb 0 0 0 distcc 2 0 0 -ldb 33 4 0 +ldb 34 4 0 libreplace 33 10 0 -lorikeet-heimdal 28 13 0 +lorikeet-heimdal 29 13 0 pidl 18 4 0 ppp 13 9 0 python 0 0 0 rsync35 13 0 samba-docs 0 0 0 samba-gtk2 2 0 -samba4 32 31 6 +samba4 32 28 4 samba_3_235 21 0 smb-build32 32 0 -talloc 35 1 0 +talloc 34 1 0 tdb 34 3 0
Rev 585: make timed_event structure private to events_timed.c in http://samba.org/~tridge/ctdb
revno: 585
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-07-25 11:43:27 +1000
message:
make timed_event structure private to events_timed.c
modified:
lib/events/events_internal.h
events_internal.h-20061117234101-o3qt14umlg9en8z0-28
lib/events/events_timed.c
events_timed.c-20070501213746-4fxluwiq4rcxib8p-5
=== modified file 'lib/events/events_internal.h'
--- a/lib/events/events_internal.h 2007-07-10 05:34:00 +
+++ b/lib/events/events_internal.h 2007-07-25 01:43:27 +
@@ -71,17 +71,6 @@
void *additional_data;
};
-struct timed_event {
- struct timed_event *prev, *next;
- struct event_context *event_ctx;
- struct timeval next_event;
- event_timed_handler_t handler;
- /* this is private for the specific handler */
- void *private_data;
- /* this is private for the events_ops implementation */
- void *additional_data;
-};
-
struct signal_event {
struct signal_event *prev, *next;
struct event_context *event_ctx;
=== modified file 'lib/events/events_timed.c'
--- a/lib/events/events_timed.c 2007-07-10 05:34:00 +
+++ b/lib/events/events_timed.c 2007-07-25 01:43:27 +
@@ -27,6 +27,17 @@
#include lib/events/events.h
#include lib/events/events_internal.h
+struct timed_event {
+ struct timed_event *prev, *next;
+ struct event_context *event_ctx;
+ struct timeval next_event;
+ event_timed_handler_t handler;
+ /* this is private for the specific handler */
+ void *private_data;
+ /* this is private for the events_ops implementation */
+ void *additional_data;
+};
+
/*
destroy a timed event
*/
