[Samba] need help with group mapping!
Hello I really need help with the group mapping stuff on AIX! I have domain user A which is member of domain group B. And I have a local group C. What I want to do now is: if A maps a smb-share, he should be a member of group C. Is such a mapping possible? cheers -- 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 PDC - Pls Help!
If your domain crosses multiple subnets, you'll need WINS server. Furthermore, you also need the samba PDC machine becoming the main browser list machine for the subnets. So add the following in your samba configure: wins support = yes remote announce = your subnets list On Tue, May 08, 2007 at 06:58:46PM -0700, chris reyes wrote: Hello guys! I'm newbie in Linux and particularly in SAMBA. You can call me Microsoft centric but am veering away with MS and so my boss who wishes for me to establish a SAMBA PDC Server who will authenticate users, -- Shaochun Wang(王绍春) [EMAIL PROTECTED] PH.D Candidate State Key Laboratory of Computer Science, Institute of Software, Chinese Academy of Sciences -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Pkg-samba-maint] [Samba] Binary_Packages/Debian
Christian Perrier wrote: All this should make both packaging styles to converge together and, ideally, the DEB files published on samba.org could then be simple backports of the packages in Debian unstable. The major obstacle to this are the patches we use. Just after SambaXP, I and Steve Langasek examined all of them and commented them. Several are marked forward upstream so it's just a matter of time for us to recover from the recent security fixes/release hype (and the associated bug reports mini-flood) and come back at you discussing about these patches. I've committed most that were marked as forward upstream a couple of weeks ago, except for the famous fix FHS one and some smbfs stuff. Cheers, Jelmer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Abnormal Windows behaviour with Samba
Chris Smith-16 wrote: I believe modern Windows versions use DNS first, then WINS. IMO, a modern Samba network should have both WINS and DNS resolution for all systems. I really agree about the WINS part - that's why I prefer enabling this functionality in Samba. It seems that it resolves a lot of issues in general. However what do you mean by DNS? Do you believe that I have to install Bind on my server and create zone files for each terminal? If this is the case, what would be a sample configuration for each zone? I have only installed Bind for real domains.. Can I create zones without TLDs (i.e. just PC-01)? If a fake TLD is needed, do I have to call the server's share using this TLD (i.e. \\server.tld\share\whatever)? Explain this please, as it's a little confusing to me... Chris Smith-16 wrote: Use ipconfig /all on the clients to make sure they are configured as you believe. Check your WINS database and see if all the systems are properly registered. Check the nmbd logs for possible clues (such as making sure your server is the local master browser). Check the smbd logs for possible clues (network issues, etc.). Check (by temporarily disabling) that some AV software on the clients isn't causing an issue (automatic updates for one can take a lot of system time at boot). I will do so in the afternoon and I will post the results. Chris Smith-16 wrote: Also when using user and group names in smb.conf it's a good idea (and mandatory in some cases) to fully qualify the names as DOMAINNAME\username or DOMAINNAME\groupname, ex: X-NET\x-admin, X-NET\erebus, etc. Is this also the case if Samba is not configured as a PDC, but just as a workgroup server? I don't use a domain in my configuration. Thank you very much for your response, I really appreciate it. Best regards, Konstantinos -- View this message in context: http://www.nabble.com/Abnormal-Windows-behaviour-with-Samba-tf3821648.html#a10892296 Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] policy files
Hi, I think I have two questions - one which is samba and one which is windows policy files. I'll try to limit this question to the samba side but will give the full picture for completeness. I'm trying to implement a simple policy to redirect a few simple folders (for starters). I have a policy file called NTConfig.POL that is available on my share \\wilson\netlogon (wilson is the name of the server running samba). I'll append its contents at the end of this email in case that's where my problem lies (although that's a windows question, so I don't expect an answer here). I don't have anything that mentions the policy file in my samba config, but according to http://www.pcc-services.com/custom_poledit.html I don't need to (other than having NTConfig.POL readable at \\wilson\netlogon\NTPolicy.POL, which it is). I've seen lots of stuff that suggests I need special windows programs (that seem to only be available on NT or 2003) to edit these files, and then other pages (such as the link above) that say they are just text files. Is there a simple howto that I've missed on this? Thanks in advance for any tips. cheers dim CLASS USER CATEGORY Custom Folder Redirection KEYNAME Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders POLICY Custom Internet Cookies Folder PART Path to User's Internet Cookies Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Cookies VALUENAME Cookies END PART END POLICY POLICY Custom Internet Favorites Folder PART Path to User's Internet Favorites Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Favorites VALUENAME Favorites END PART END POLICY POLICY Custom Internet History Folder PART Path to User's Internet History Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\History VALUENAME History END PART END POLICY POLICY Custom My Documents Folder PART Path to User's My Documents Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Documents VALUENAME Personal END PART END POLICY END CATEGORY ;Custom Folder Redirection -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
This is a Windows issue, not a Samba issue. I don't have anything that mentions the policy file in my samba config, but according to http://www.pcc-services.com/custom_poledit.html I don't need to (other than having NTConfig.POL readable at \\wilson\netlogon\NTPolicy.POL, which it is). I've seen lots of stuff that suggests I need special windows programs (that seem to only be available on NT or 2003) to edit these files, and then other pages (such as the link above) that say they are just text files. No, the ADM template files are text files. The policy file is not. You must have POLEDIT.EXE to edit the policy. It reads the ADM files, presents a UI, and produces the binary POL file. Is there a simple howto that I've missed on this? Thanks in advance for any tips. Yes, the Windows documentation. O'Reilly has a title: Windows NT User Administration you need a book like that. Most of the HOWTOs and what not on the Internet are confusing garbage, or at best only half complete, my advise is to skip them entirely. The *OFFICIAL* Samba documentation does cover this to some extend, beyond that get a book. http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] logon drive problem
I have samba 3 with ldap as a auth backend. And I have a problem with logon drive, when user is loging to domain the logon drive isnt mapped. I dont know where is a problem in smb.con I have logon drive = Z: logon home = \\%L\%u logon script = login.cmd somebody knows whereis problem? thanks in advance luk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Backup Domain not working
I recently set up a backup domain controller using Samba 3.0.23. I have a Samba PDC already running, and all is working fine, but once I added the BDC, now when people log in to their windows account, their home directory is now being mapped to their home on the BDC (which is empty) instead of the PDC. Conf files from each below: PDC Samba Conf: [global] unix charset = LOCALE workgroup = mydomain netbios name = PDC server string = Domain Controller running %v interfaces = eth1, lo bind interfaces only = yes os level = 255 preferred master = yes local master = yes domain master = yes security = user time server = yes username map = /etc/samba/smbusers wins support = yes encrypt passwords = yes pam password change = yes name resolve order = wins bcast hosts winbind nested groups = no passdb backend = ldapsam:ldap://127.0.0.1 ldap://BDC; ldap passwd sync = Yes ldap suffix = dc=mydomain,dc=com ldap admin dn = cn=Manager,dc=mydomain,dc=com ldap ssl = no ldap group suffix = ou=Groups ldap user suffix = ou=People ldap machine suffix = ou=People ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://127.0.0.1/ idmap uid = 1-2 idmap gid = 1-2 map acl inherit = yes add user script = /etc/smbldap-tools/smbldap-useradd -m %u #delete user script = /etc/smbldap-tools/smbldap-userdel %u add machine script = /etc/smbldap-tools/smbldap-useradd -w %u add group script = /etc/smbldap-tools/smbldap-groupadd -p %g #delete group script = /etc/smbldap-tools/smbldap-groupdel %g add user to group script = /etc/smbldap-tools/smbldap-groupmod -m %u %g delete user from group script = /etc/smbldap-tools/smbldap-groupmod -x %u %g set primary group script = /etc/smbldap-tools/smbldap-usermod -g %g %u domain logons = yes log file = /var/log/samba/log.%m log level = 1 syslog = 0 max log size = 50 #smb ports = 139 445 smb ports = 139 hosts allow = 127.0.0.1 172.16.0.0/255.255.0.0 # User profiles and home directories logon drive = U: logon path = \\%L\profiles\%U logon script = %U.bat large readwrite = no read raw = no write raw = no printcap name = /etc/printcap load printers = no printing = template shell = /bin/false winbind use default domain = no BDC Samba Conf. [global] unix charset = LOCALE workgroup = mydomain server string = Backup Domain Controller security = domain username map = /etc/samba/smbusers log level = 1 syslog = 0 log file = /var/log/samba/%m.log max log size = 50 smb ports = 139 name resolve order = wins bcast hosts wins server = 172.16.24.7 ldap suffix = dc=mydomain,dc=com ldap machine suffix = ou=People ldap user suffix = ou=People ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap ldap admin dn = cn=Manager,dc=mydomain,dc=com idmap backend = ldap:ldap://PDC idmap uid = 1-2 idmap gid = 1-2 winbind trusted domains only = yes password server = 172.16.24.7 template shell = /bin/false domain master = no local master = no os level = 0 preferred master = no winbind use default domain = no veto oplock files = /*.mbd/ large readwrite = no read raw = no write raw = noprintcap name = /etc/printcap load printers = no printing = -- *Jason Baker */IT Coordinator/ *Glastender Inc.* 5400 North Michigan Road Saginaw, Michigan 48604 USA 800.748.0423 Phone: 989.752.4275 ext. 228 Fax: 989.752. www.glastender.com http://www.glastender.com -BEGIN GEEK CODE BLOCK- Version: 3.1 GIT$ d- s: a C++$ LU+++$ P+ L++L !E--- W+++ N o? K? w !O M !V PS PE++ Y? PGP- t 5? X+ R+ tv+ b- DI-- D++ G e+ h--- r+++ y+++ --END GEEK CODE BLOCK-- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Can not join via ADS using administrator account, succeeded using another account
Hello, Yesterday I have used Samba to help me authenticate Windows uses within the Squid Proxy server. ( FreeBSD-6.1 + Samba 3.0.25 ) The Kerberos setup went fine. However I got the NT_STATUS_PROTOCOL_UNREACHABLE error code when trying to net join the domain. It seems this is Kerberos related. On the net some emails suggest using kdc = tcp/server.name syntax to deal with big packets. This had no effect. I was able to join the domain using the Administrator account and net rpc. The net ads would fail each time. Another user was able to join the domain via net ads without any problems! I do not understand why that is. Do you ? After joining the domain wbinfo still didnt do what I hoped it would. What did work was: #wbinfo -u #wbinfo -g #wbinfo -n #wbinfo --user-sids What did not work was: #wbinfo -r #wbinfo -i proxy# wbinfo -r administrator proxy# wbinfo -r administrator2 Could not get groups for user administrator2 proxy# wbinfo -i administrator Could not get info for user administrator proxy# winbindd -V Version 3.0.25 proxy# wbinfo -V Version 3.0.25 proxy# net ads status -U administrator administrator's password: proxy# proxy# net ads status -U administrator administrator's password: [2007/05/31 13:00:12, 0] libads/kerberos.c:ads_kinit_password(227) kerberos_kinit_password [EMAIL PROTECTED] failed: Preauthentication failed [2007/05/31 13:00:12, 0] libads/kerberos.c:ads_kinit_password(227) kerberos_kinit_password [EMAIL PROTECTED] failed: Preauthentication failed proxy# So above we see here that when I enter the wrong password I get kerberos errors. proxy# clear proxy# net ads status -U giessen giessen's password: objectClass: top objectClass: person objectClass: organizationalPerson objectClass: user objectClass: computer [ SNIP ] With the above username/password I do get a reply! This might be because I joined the domain using that account ? I have no clue, do you ? If someone has an idea what is causing this I'd like to hear. If more info is needed please tell me and I will see if I can provide mode details. Thanks, Frans -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] net ads join doesn't work with samba 3.0.22
Hi, I have a problem joining my Linux servers to my AD with Samba 3.0.22 I have tested with various distros : Suse 10.2, smb 3.0.23d Debian Etch, smb 3.0.24 but always get the same error message : debian:~# net ads join -U administrateur -S s-dc-acms administrateur's password: [2007/05/30 12:27:15, 0] utils/net_ads.c:ads_startup(289) ads_connect: Aucun fichier ou rÃ(c)pertoire de ce type (last line means No such file or directory) The problem is quite weird. With a Suse 10.1 (smb 3.0.22) I am able to join the server to AD flawlessly. kinit does work, I get a ticket when I do klist debian:~# klist Ticket cache: FILE:/tmp/krb5cc_0 Default principal: [EMAIL PROTECTED] Valid starting ExpiresService principal 05/30/07 12:19:43 05/30/07 18:59:43 krbtgt/[EMAIL PROTECTED] Kerberos 4 ticket cache: /tmp/tkt0 klist: You have no tickets cached Any ideas that might help ? Thanks a lot -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Backup Domain not working
I suspect you need to specify the logon home with actual server name (PDC). Otherwise it defaults to the server you logged onto - in this case your BDC. Jason Baker wrote: I recently set up a backup domain controller using Samba 3.0.23. I have a Samba PDC already running, and all is working fine, but once I added the BDC, now when people log in to their windows account, their home directory is now being mapped to their home on the BDC (which is empty) instead of the PDC. Conf files from each below: PDC Samba Conf: [global] unix charset = LOCALE workgroup = mydomain netbios name = PDC server string = Domain Controller running %v interfaces = eth1, lo bind interfaces only = yes os level = 255 preferred master = yes local master = yes domain master = yes security = user time server = yes username map = /etc/samba/smbusers wins support = yes encrypt passwords = yes pam password change = yes name resolve order = wins bcast hosts winbind nested groups = no passdb backend = ldapsam:ldap://127.0.0.1 ldap://BDC; ldap passwd sync = Yes ldap suffix = dc=mydomain,dc=com ldap admin dn = cn=Manager,dc=mydomain,dc=com ldap ssl = no ldap group suffix = ou=Groups ldap user suffix = ou=People ldap machine suffix = ou=People ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://127.0.0.1/ idmap uid = 1-2 idmap gid = 1-2 map acl inherit = yes add user script = /etc/smbldap-tools/smbldap-useradd -m %u #delete user script = /etc/smbldap-tools/smbldap-userdel %u add machine script = /etc/smbldap-tools/smbldap-useradd -w %u add group script = /etc/smbldap-tools/smbldap-groupadd -p %g #delete group script = /etc/smbldap-tools/smbldap-groupdel %g add user to group script = /etc/smbldap-tools/smbldap-groupmod -m %u %g delete user from group script = /etc/smbldap-tools/smbldap-groupmod -x %u %g set primary group script = /etc/smbldap-tools/smbldap-usermod -g %g %u domain logons = yes log file = /var/log/samba/log.%m log level = 1 syslog = 0 max log size = 50 #smb ports = 139 445 smb ports = 139 hosts allow = 127.0.0.1 172.16.0.0/255.255.0.0 # User profiles and home directories logon drive = U: logon path = \\%L\profiles\%U logon script = %U.bat large readwrite = no read raw = no write raw = no printcap name = /etc/printcap load printers = no printing = template shell = /bin/false winbind use default domain = no BDC Samba Conf. [global] unix charset = LOCALE workgroup = mydomain server string = Backup Domain Controller security = domain username map = /etc/samba/smbusers log level = 1 syslog = 0 log file = /var/log/samba/%m.log max log size = 50 smb ports = 139 name resolve order = wins bcast hosts wins server = 172.16.24.7 ldap suffix = dc=mydomain,dc=com ldap machine suffix = ou=People ldap user suffix = ou=People ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap ldap admin dn = cn=Manager,dc=mydomain,dc=com idmap backend = ldap:ldap://PDC idmap uid = 1-2 idmap gid = 1-2 winbind trusted domains only = yes password server = 172.16.24.7 template shell = /bin/false domain master = no local master = no os level = 0 preferred master = no winbind use default domain = no veto oplock files = /*.mbd/ large readwrite = no read raw = no write raw = noprintcap name = /etc/printcap load printers = no printing = -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Smba with Amanda backup --- permissions
Hi, I am trying to create a Samba share on /media/winshare with the owner as amandabackup instead of root. But as soon as I mount the Samba share on to the mount point, the permissions for the owner get reverted back to root instead of amandabackup. Attaching a snapshot of how it looks like. http://www.nabble.com/file/p10894282/samba%2Bquery.jpg -- View this message in context: http://www.nabble.com/Smba-with-Amanda-backup-permissions-tf3846638.html#a10894282 Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Abnormal Windows behaviour with Samba
On Thursday 31 May 2007, Erebus wrote: I really agree about the WINS part - that's why I prefer enabling this functionality in Samba. It seems that it resolves a lot of issues in general. However what do you mean by DNS? Do you believe that I have to install Bind on my server and create zone files for each terminal? Or some DNS server. I've used bind in the past and been using djbdns lately with good results. Windows will only use netBIOS resolution as a fallback so it may be slower. However, you did state you set up hosts files which should be looked at first in all cases. But hosts files are a maintenance nightmare (anything over 5 PC's it becomes absurd) and DNS will serve you much better. Also if you plan to use hosts in place of DNS then your hosts files should contain the name IP mapping, be properly setup (both short and fqdn names with a carriage return at the end) for all of the systems and be placed on all of the systems. Plus hosts files AFAIK don't provide any reverse information (cannot resolve name from IP address). If this is the case, what would be a sample configuration for each zone? I have only installed Bind for real domains.. Can I create zones without TLDs (i.e. just PC-01)? If a fake TLD is needed, do I have to call the server's share using this TLD (i.e. \\server.tld\share\whatever)? Explain this please, as it's a little confusing to me... Not necessary for a real TLD, ample info is avaliable in numerous places to assist with this. Also when using user and group names in smb.conf it's a good idea (and mandatory in some cases) to fully qualify the names as DOMAINNAME\username or DOMAINNAME\groupname, ex: X-NET\x-admin, X-NET\erebus, etc. Is this also the case if Samba is not configured as a PDC, but just as a workgroup server? I don't use a domain in my configuration. Good question, don't really know, but if it doesn't hurt I would try it that way. I always thought that domain logons and domain master went hand in hand. Odd that you specified one and not the other. Do you have a Windows NT PDC? If so then you shouldn't specify domain master = yes and might as well let the PDC be the WINS server as well, if not there's no reason I can think of not to make Samba a PDC as well by specifying domain logons = yes. I guess I don't see the sense in running a 30 PC network without a domain controller as it makes everything so much more manageable. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba 3.0.24 + openldap + solaris won't start up
On Wed, 30 May 2007, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 James Craig wrote: sys_getgrouplist: user [nobody] push_sec_ctx(0, 0) : sec_ctx_stack_ndx = 1 push_conn_ctx(0) : conn_ctx_stack_ndx = 0 setting sec ctx (0, 0) - sec_ctx_stack_ndx = 1 NT user token: (NULL) UNIX token of user 0 Primary group is 0 and contains 0 supplementary groups === INTERNAL ERROR: Signal 11 in pid 27597 (3.0.24) Please read the Trouble-Shooting section of the Samba3-HOWTO From: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf === Segmentation Fault Seems identical to this bug (but doesn't look like you posted it): https://bugzilla.samba.org/show_bug.cgi?id=4629 Do any of my comments/questions in the report apply to you? That looks like the problem I am seeing too. (sorry I didn't see that report before posting!) I compiled samba against the openldap libraries, but the server I am runing on uses the native client libraries for itself. From your comments in the bug, I did check that the system is running /usr/sbin/nscd. The system itself is using the native solaris ldap client, and it's native nss_ldap I am not certain how to specify the samba server to use nscd over nss, so I can't tell you exactly which one is being used during smbd's startup. jim craig -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Smba with Amanda backup --- permissions
On 5/31/07, bhoomikasc [EMAIL PROTECTED] wrote: I am trying to create a Samba share on /media/winshare with the owner as amandabackup instead of root. But as soon as I mount the Samba share on to the mount point, the permissions for the owner get reverted back to root instead of amandabackup. Attaching a snapshot of how it looks like. http://www.nabble.com/file/p10894282/samba%2Bquery.jpg The permissions on the directory used as the mount point have no effect on the permissions of the mounted filesystem. This is the case for Linux and Unix in general and is not a Samba-specific issue. You should be able to add the uid= and gid= options to your mount command to change the permissions of the mounted filesystem: mount -t cifs -o username=linuxbak,uid=amandabackup,gid=root //10.80.101.15/linuxbak /media/winshare Note that the mount type smbfs is generally deprecated in favor of cifs. Amanda supports backing up Windows shares using smbclient; I've always used that method instead of mounting a SMB filesystem. Josh Kelley -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Smba with Amanda backup --- permissions
bhoomikasc wrote: Hi, I am trying to create a Samba share on /media/winshare with the owner as amandabackup instead of root. But as soon as I mount the Samba share on to the mount point, the permissions for the owner get reverted back to root instead of amandabackup. Attaching a snapshot of how it looks like. http://www.nabble.com/file/p10894282/samba%2Bquery.jpg I suspect udev is coming into the picture because you're using /media as your mountpoint. Try mounting under /mnt see what happens. -- Ben Tisdall -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Smba with Amanda backup --- permissions
Thanks everybody...solution found. Its in the mounting --- add uid and gid to it. bhoomikasc wrote: Hi, I am trying to create a Samba share on /media/winshare with the owner as amandabackup instead of root. But as soon as I mount the Samba share on to the mount point, the permissions for the owner get reverted back to root instead of amandabackup. Attaching a snapshot of how it looks like. http://www.nabble.com/file/p10894282/samba%2Bquery.jpg -- View this message in context: http://www.nabble.com/Smba-with-Amanda-backup-permissions-tf3846638.html#a10897449 Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] logon drive problem
Hi Luk, I have samba 3 with ldap as a auth backend. And I have a problem with logon drive, when user is loging to domain the logon drive isnt mapped. I dont know where is a problem in smb.con I have logon drive = Z: logon home = \\%L\%u logon script = login.cmd somebody knows whereis problem? Have you tried to specify those values directly in the LDAP tree (sambaHomePath, sambaHomeDrive, sambaLogonScript attributes)? I remember having a hard time getting the smb.conf parameters used as default for ldap users, but it works perfectly if the attributes are defined in the ldap tree. Cheers, Denis thanks in advance luk -- Denis Cardon Tranquil IT Systems 10 rue du Docteur Bouchard 49400 Saumur tel : +33 (0) 2.41.67.56.99 http://www.tranquil-it-systems.fr -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Backup Domain not working
That makes sense. I will try that and report back. *Jason Baker */IT Coordinator/ *Glastender Inc.* 5400 North Michigan Road Saginaw, Michigan 48604 USA 800.748.0423 Phone: 989.752.4275 ext. 228 Fax: 989.752. www.glastender.com http://www.glastender.com -BEGIN GEEK CODE BLOCK- Version: 3.1 GIT$ d- s: a C++$ LU+++$ P+ L++L !E--- W+++ N o? K? w !O M !V PS PE++ Y? PGP- t 5? X+ R+ tv+ b- DI-- D++ G e+ h--- r+++ y+++ --END GEEK CODE BLOCK-- Gary Dale wrote: I suspect you need to specify the logon home with actual server name (PDC). Otherwise it defaults to the server you logged onto - in this case your BDC. Jason Baker wrote: I recently set up a backup domain controller using Samba 3.0.23. I have a Samba PDC already running, and all is working fine, but once I added the BDC, now when people log in to their windows account, their home directory is now being mapped to their home on the BDC (which is empty) instead of the PDC. Conf files from each below: PDC Samba Conf: [global] unix charset = LOCALE workgroup = mydomain netbios name = PDC server string = Domain Controller running %v interfaces = eth1, lo bind interfaces only = yes os level = 255 preferred master = yes local master = yes domain master = yes security = user time server = yes username map = /etc/samba/smbusers wins support = yes encrypt passwords = yes pam password change = yes name resolve order = wins bcast hosts winbind nested groups = no passdb backend = ldapsam:ldap://127.0.0.1 ldap://BDC; ldap passwd sync = Yes ldap suffix = dc=mydomain,dc=com ldap admin dn = cn=Manager,dc=mydomain,dc=com ldap ssl = no ldap group suffix = ou=Groups ldap user suffix = ou=People ldap machine suffix = ou=People ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://127.0.0.1/ idmap uid = 1-2 idmap gid = 1-2 map acl inherit = yes add user script = /etc/smbldap-tools/smbldap-useradd -m %u #delete user script = /etc/smbldap-tools/smbldap-userdel %u add machine script = /etc/smbldap-tools/smbldap-useradd -w %u add group script = /etc/smbldap-tools/smbldap-groupadd -p %g #delete group script = /etc/smbldap-tools/smbldap-groupdel %g add user to group script = /etc/smbldap-tools/smbldap-groupmod -m %u %g delete user from group script = /etc/smbldap-tools/smbldap-groupmod -x %u %g set primary group script = /etc/smbldap-tools/smbldap-usermod -g %g %u domain logons = yes log file = /var/log/samba/log.%m log level = 1 syslog = 0 max log size = 50 #smb ports = 139 445 smb ports = 139 hosts allow = 127.0.0.1 172.16.0.0/255.255.0.0 # User profiles and home directories logon drive = U: logon path = \\%L\profiles\%U logon script = %U.bat large readwrite = no read raw = no write raw = no printcap name = /etc/printcap load printers = no printing = template shell = /bin/false winbind use default domain = no BDC Samba Conf. [global] unix charset = LOCALE workgroup = mydomain server string = Backup Domain Controller security = domain username map = /etc/samba/smbusers log level = 1 syslog = 0 log file = /var/log/samba/%m.log max log size = 50 smb ports = 139 name resolve order = wins bcast hosts wins server = 172.16.24.7 ldap suffix = dc=mydomain,dc=com ldap machine suffix = ou=People ldap user suffix = ou=People ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap ldap admin dn = cn=Manager,dc=mydomain,dc=com idmap backend = ldap:ldap://PDC idmap uid = 1-2 idmap gid = 1-2 winbind trusted domains only = yes password server = 172.16.24.7 template shell = /bin/false domain master = no local master = no os level = 0 preferred master = no winbind use default domain = no veto oplock files = /*.mbd/ large readwrite = no read raw = no write raw = noprintcap name = /etc/printcap load printers = no printing = -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] logon drive problem
Cardon Denis skrev: Hi Luk, I have samba 3 with ldap as a auth backend. And I have a problem with logon drive, when user is loging to domain the logon drive isnt mapped. I dont know where is a problem in smb.con I have logon drive = Z: logon home = \\%L\%u logon script = login.cmd somebody knows whereis problem? Have you tried to specify those values directly in the LDAP tree (sambaHomePath, sambaHomeDrive, sambaLogonScript attributes)? I remember having a hard time getting the smb.conf parameters used as default for ldap users, but it works perfectly if the attributes are defined in the ldap tree. Cheers, Denis Hi Denis what is the result of pdbedit -Lw ? Cheers Rune -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] What makes excel file opening so slow??
Hi list, Despite the question I asked last time (I will re-install the FC3 with Samba 3.0.14a on another computer for replacement soon), I still have one more question on Excel files. I found that Excel file opening is extremely slow (especially on slow connections, i.e. VPN). The case is really bad, it takes around 2 mins to open a excel file of around 400k. Actually we got both side having 4M/4M DSL line. One side is Hong Kong, and the other side is China. However if we build a VPN inside Hong Kong, it takes 10~20 seconds to open a 400k excel file. However if I just copy a 400k file, neither of them take such a long time. Both situation can finish the transmission within some seconds. So what is so special about opening a excel file, and how can I improve the speed? Thanks for comments! Yours sincerely, Jason Chan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] What makes excel file opening so slow??
Despite the question I asked last time (I will re-install the FC3 with Samba 3.0.14a on another computer for replacement soon), I still have one more question on Excel files. I found that Excel file opening is extremely slow (especially on slow connections, i.e. VPN). The case is really bad, it takes around 2 mins to open a excel file of around 400k. Actually we got both side having 4M/4M DSL line. Speed doesn't matter so much as latency. Check out some documents on windowing, etc... maybe you can improve the efficiency of your link. http://dsd.lbl.gov/TCP-tuning/tcp-wan-perf.pdf However if we build a VPN inside Hong Kong, it takes 10~20 seconds to open a 400k excel file. I don't understand what this means. However if I just copy a 400k file, neither of them take such a long time. Ok, opening is not comparable to copying. Both situation can finish the transmission within some seconds. So what is so special about opening a excel file, and how can I improve the speed? Thanks for comments! One would have to see a network trace, but I'd wager Excel is reading the file in a manner that causes lots of round trips - then latency kills you. I've seen this kind of thing before. Make sure oplocks are enabled. If you really need to go faster maybe see if accessing the file via WebDAV instead of CIFS/SMB is sufficient. We've found WebDAV to be 'faster' over high-latency VPN links. But you get less fancy locking (if any). -- Adam Tauno Williams, Network Systems Administrator Consultant - http://www.whitemiceconsulting.com Developer - http://www.opengroupware.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] roaming profiles in a home environment
On 5/30/2007 Adam Tauno Williams ([EMAIL PROTECTED]) wrote: I'm assuming that I'd be better off not using roaming profiles, but instead using folder redirection (in outlook's case simply put the files on the share). Yes. I would recommend against doing this... Microsoft itself recommends against it, but I have also had problems with corruption in .pst files that are stored on a network share, both on Windows shares *and* Samba shares... -- Best regards, Charles -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Forcing user/group with winbindd
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] wrote: Is it possible to force a particular user/group to own files when using winbindd? Yes. But you have to fully qualify the name. Depending on the version of Samba you are running, this may either be a hard or soft requirement. cheer,s jerry I have tried this, but cannot seem to get it to work right. I am running Samba-3.0.23c on FreeBSD 6.2. When I add: force user = mo+linda to my smb.conf, I receive the following error message when I try to connect. System Error 64. The specified network name is no longer available. If I remove the force user statement, I am able to connect to the share fine, but the user is not set as I would like for it to be. Following is a copy of the share I am working with. [Test.Share] comment = Test Share valid users = mo+linda, mo+jay write list = mo+linda, mo+jay create mode = 0777 directory mode = 0777 # force user = mo+linda writeable = Yes brosweable = Yes path = /home/linda I have set the permissions on /home/linda to 777 for testing purposes. I'm sure this is something simple that I am doing wrong. Any suggestions would be greatly appreciated. Thanks, Jay -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Bugzilla and other servers at samba.org upgrades schedule
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 This is just a general status update: We are doing server upgrades on the following servers beginning at 23:59 today (GMT-5): * bugzilla.samba.org * people.samba.org * news.samba.org * projects.samba.org The upgrade window is around 12 hours so the servers should be back online sometime tomorrow afternoon during the CDT US timezone. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXzAoIR7qMdg1EfYRAqNkAJwMITkVgxptJyIZ/t9JOeDUFckYqgCgur0P DtuZdyBOu7XEofi/ZGZhJ6U= =QswG -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] Fwd: Samba 3.025 wbinfo checking the trust secret via RPC calls failed
Some additional info The unix-level (non samba) authentication is configure for LDAP via the /etc/nswitch.conf file. I also have openldap installed from sunfreeware, although it doesn't seem to have a pkgconfig file. I am not using LDAP authentication within samba.I was able to create samba accounts with pdbedit whether they were local or network accounts. Configuration gave me the following .. # ./configure --prefix=/usr/local/samba.3025a OR # ./configure --prefix=/usr/local/samba.3025a --with-ldap=no .. configure: WARNING: netinet/ip.h: present but cannot be compiled configure: WARNING: netinet/ip.h: check for missing prerequisite headers? configure: WARNING: netinet/ip.h: see the Autoconf documentation configure: WARNING: netinet/ip.h: section Present But Cannot Be Compiled configure: WARNING: netinet/ip.h: proceeding with the preprocessor's result configure: WARNING: netinet/ip.h: in the future, the compiler will take precedence make command have be lots of warnings about option -o appears more than once. ... make ... ld: warning: option -o appears more than once, first setting taken Compiling nsswitch/winbind_nss_solaris.c Compiling nsswitch/winbind_nss_linux.c Linking nsswitch/libnss_winbind.so ld: warning: option -o appears more than once, first setting taken Compiling nsswitch/wins.c Linking nsswitch/libnss_wins.so .. I joined 2 Windows 2003 machines to the domain. I was able to log as administrator and root but no other accounts, whether local or not. The user accounts them self seem OK- it just seems to be a winbind or trusts issue. # net user info myusername--server pdc --user sambadomain\administrator Password: myusergroup # tail log.winbindd-idmap [2007/05/31 16:29:51, 3] nsswitch/winbindd_async.c:winbindd_dual_sid2gid(xyz) [ 6403]: sid to gid S-wxyz [2007/05/31 16:29:51, 3] nsswitch/winbindd_async.c:winbindd_dual_sid2gid(xyz) [ 6403]: sid to gid S-wxyz [2007/05/31 16:29:51, 3] nsswitch/winbindd_async.c:winbindd_dual_sid2gid(xyz) [ 6403]: sid to gid S-wxyz [2007/05/31 16:29:51, 3] nsswitch/winbindd_async.c:winbindd_dual_sid2gid(xyz) [ 6403]: sid to gid S-wxyz [2007/05/31 16:35:52, 3] nsswitch/winbindd_dual.c:child_read_request(51) Got invalid request length: 0 I tried building the software on another solaris 10 machine (which is the LDAP server but is itself NOT an ldap client) but got the same configure errors. I even tried running the autogen.sh file first. I had no problem when I compiled 3.0.22. I don't think I saw this with 3.0.25 either. Thanks -- Forwarded message -- From: Gaiseric Vandal [EMAIL PROTECTED] Date: May 30, 2007 4:07 PM Subject: Samba 3.025 wbinfo checking the trust secret via RPC calls failed To: samba@lists.samba.org I have compiled Samba 3.0.25a from source on a Solaris 10 machine. I had previously been testing Samba 3.0.24 (from packages on www.sunfreeware.com) and have reused the smb.conf file. Otherwise this is a clean setup, not an upgrade. The server is configured as a PDC for my domain SAMBADOMAIN I created a samba password for the local root and administrator accounts. I joined the server machine to its own domain pdc# net join sambadomain -U root Password: Joined domain SAMBADOMAIN pdc# bin/net rpc testjoin Join to SAMBADOMAIN is OK gopher# I joined a Windows 2003 server to the domain. All seems weel. I tried establish trusts with another domain.Either way this fails with a warning that the trust password was incorrect. going back a step, I tried to verify the trust to my own domain. pdc # ./wbinfo -t checking the trust secret via RPC calls failed error code was NT_STATUS_INVALID_HANDLE (0xc008) Could not check secret pdc# ./wbinfo --own-domain -t SAMBADOMAIN checking the trust secret via RPC calls failed error code was NT_STATUS_INVALID_HANDLE (0xc008) Could not check secret This had worked with Samba 3.0.24. Not sure if this is a winbind issue. my smb.conf file includes the following: idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind enum groups = yes Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Trying to mount a Linux share on Windows
Hi, I am trying to mount a Linux directory onto the Windows box. The smb.conf file looks like this: Load smb config files from /etc/samba/smb.conf Processing section [homes] Processing section [profiles] Processing section [users] Processing section [groups] Processing section [winshare] Loaded services file OK. WARNING: passdb expand explicit = yes is deprecated Server role: ROLE_STANDALONE [global] workgroup = OVE.LOCAL map to guest = Bad User valid users = root, linuxbak, amandabackup force user = amandabackup [homes] comment = Home Directories valid users = %S, %D%w%S read only = No inherit acls = Yes [profiles] comment = Network Profiles Service path = %H read only = No create mask = 0600 directory mask = 0700 store dos attributes = Yes [users] comment = All users path = /home read only = No inherit acls = Yes [groups] comment = All groups path = /home/groups read only = No inherit acls = Yes [winshare] comment = Share for the Windows server ove-dc3bkup01 path = /media/winshare write list = root, amandabackup, linuxbak read only = No create mask = 0600 directory mask = 0700 inherit acls = Yes Also, can't seem to see the share below AmandaBackup:/media # smbclient -L 10.80.101.15 -U linuxbak Password: Domain=[OVE] OS=[Windows Server 2003 R2 3790 Service Pack 1] Server=[Windows Server 2003 R2 5.2] Sharename Type Comment - --- C$ Disk Default share S$ Disk Default share F$ Disk Default share IPC$IPC Remote IPC G$ Disk Default share LinuxBakDisk ADMIN$ Disk Remote Admin SQL Bak Disk E$ Disk Default share session request to 10.80.101.15 failed (Called name not present) session request to 10 failed (Called name not present) Domain=[OVE] OS=[Windows Server 2003 R2 3790 Service Pack 1] Server=[Windows Server 2003 R2 5.2] Server Comment ---- OVE-DC3BKUP01 WorkgroupMaster ---- OVE OVE-DC3AD01 OVEDMZ OVE-DC3ISA02 While mounting it, AmandaBackup:~ # mount -t smbfs -o username=linuxbak,uid=amandabackup,gid=disk /media/winshare/ //10.80.101.15/LinuxBak -bash: !,uid=amandabackup,gid=disk: event not found AmandaBackup:~ # mount -t smbfs -o username=linuxbak /media/winshare/ //10.80.101.15/LinuxBak Could not resolve mount point //10.80.101.15/LinuxBak AmandaBackup:~ # mount -t smbfs -o username=linuxbak 10.90.219.64:/media/winshare/ 10.80.101.15:/LinuxBak Could not resolve mount point 10.80.101.15:/LinuxBak Please Help -- View this message in context: http://www.nabble.com/Trying-to-mount-a-Linux-share-on-Windows-tf3849150.html#a10902922 Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Bulk] [Samba] Trying to mount a Linux share on Windows
bhoomikasc escribió: Hi, I am trying to mount a Linux directory onto the Windows box. I think this is not possible, you can't mount a ntfs partition of a Windows box from linux Am I right? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Bulk] [Samba] Trying to mount a Linux share on Windows
On Thursday 31 May 2007 05:34:48 pm Miguel Gonzalez Castaños wrote: bhoomikasc escribió: Hi, I am trying to mount a Linux directory onto the Windows box. I think this is not possible, you can't mount a ntfs partition of a Windows box from linux Am I right? You can mount Linux file systems on Windows you just have to have the right utilities to do so. Linux supports NTFS (NTVFS is another matter) with ntfs-3g now. --Shaun -- It isn't about it being free. Rather, its about the freedom it brings. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbd write failure, kernel
On Thu, May 31, 2007 at 12:14:36PM +0700, Филипп Филиппов wrote:
syslog(kern.debug):
May 22 16:57:37 server kernel: audit(1179827857.498:149): avc: denied
{ write } for pid=10734 comm=smbd name=log dev=tmpfs ino=24665
scontext=system_u:system_r:smbd_t:s0 tcontext=root:object_r:device_t:s0
tclass=sock_file
I think this is an SELinux issue. Maybe you need refine the SELinux
policy or change the sock_file's security context.
--
Shaochun Wang(王绍春) [EMAIL PROTECTED]
PH.D Candidate
State Key Laboratory of Computer Science,
Institute of Software,
Chinese Academy of Sciences
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Bugzilla and other servers at samba.org upgrades schedule
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gerald (Jerry) Carter wrote: This is just a general status update: We are doing server upgrades on the following servers beginning at 23:59 today (GMT-5): * bugzilla.samba.org * people.samba.org * news.samba.org * projects.samba.org The upgrade window is around 12 hours so the servers should be back online sometime tomorrow afternoon during the CDT US timezone. One more addendum: This will include wiki.samba.org as well jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGX3ykIR7qMdg1EfYRAkmYAJ9CYPd+wK/uuzYYU6JbwnDS0fuhhACdFU7E /WdAogtlpNfhSpccpFLNsAw= =i+qr -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] username map security=user and 3.0.25a
On my production servers I am currently using username map= to map the Windows IDs to the IDs on my FreeBSD system. This evening, when I upgraded to 3.0.25a, the username map function stopped working. Reverting to 3.0.23d fixed the problem. I found this bugreport, which is similar, but not exactly the setup I am using since I am using security=user https://bugzilla.samba.org/show_bug.cgi?id=4620 I did not see anything in the log files which stood out. What else should I be looking at? Thanks, Jay -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.
Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c === --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c2007-05-29 17:10:36 -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor_info *psd) +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor *psd) I think we need to increase the VFS interface version for 3.0.26 metze
Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.
On Thu, May 31, 2007 at 08:23:08AM +0200, Stefan (metze) Metzmacher wrote: Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c === --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c 2007-05-29 17:10:36 -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor_info *psd) +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor *psd) I think we need to increase the VFS interface version for 3.0.26 I thouhgt I already did that when adding LCHOWN ? Jeremy.
Re: svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules:.
On Wed, May 30, 2007 at 11:34:30PM -0700, Jeremy Allison wrote: On Thu, May 31, 2007 at 08:23:08AM +0200, Stefan (metze) Metzmacher wrote: Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c === --- branches/SAMBA_3_0_26/source/modules/vfs_cap.c2007-05-29 17:10:36 -static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor_info *psd) +static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor *psd) I think we need to increase the VFS interface version for 3.0.26 I thouhgt I already did that when adding LCHOWN ? Yep - just checked. It's 21 for 3.0.25 and 22 for 3.0.26. Jeremy.
svn commit: samba r23263 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: vlendec
Date: 2007-05-31 09:23:51 + (Thu, 31 May 2007)
New Revision: 23263
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23263
Log:
Remove an unused variable -- Fix Coverity ID 358
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 05:37:52 UTC
(rev 23262)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 09:23:51 UTC
(rev 23263)
@@ -898,7 +898,6 @@
uint32 **name_types)
{
ADS_STATUS rc;
- LDAPMessage *res=NULL;
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -1081,9 +1080,6 @@
done:
- if (res)
- ads_msgfree(ads, res);
-
/* free intermediate lists. - a temp talloc ctx might be better. */
TALLOC_FREE(sid_mem_nocache);
TALLOC_FREE(names_nocache);
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
05:37:52 UTC (rev 23262)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
09:23:51 UTC (rev 23263)
@@ -898,7 +898,6 @@
uint32 **name_types)
{
ADS_STATUS rc;
- LDAPMessage *res=NULL;
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -1081,9 +1080,6 @@
done:
- if (res)
- ads_msgfree(ads, res);
-
/* free intermediate lists. - a temp talloc ctx might be better. */
TALLOC_FREE(sid_mem_nocache);
TALLOC_FREE(names_nocache);
svn commit: samba r23264 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet Date: 2007-05-31 12:08:03 + (Thu, 31 May 2007) New Revision: 23264 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23264 Log: Make it more clear what this is actually setting up Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js === --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-31 09:23:51 UTC (rev 23263) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-31 12:08:03 UTC (rev 23264) @@ -720,7 +720,7 @@ info.subobj = subobj; info.message = message; - message(Setting up sam.ldb partitions\n); + message(Setting up + tmp_schema_path + as a temporary database to store the schema\n); /* This will erase anything in the tmp db */ var samdb = open_ldb(info, tmp_schema_path, true);
svn commit: samba r23265 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-05-31 12:23:52 + (Thu, 31 May 2007) New Revision: 23265 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23265 Log: HP-UX 11.00 also needs this, try to see if 11.23 is also happy with it... metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:08:03 UTC (rev 23264) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:23:52 UTC (rev 23265) @@ -60,10 +60,10 @@ *hpux*) # mmap on HPUX is completely broken... AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken]) - if test `uname -r` = B.11.11; then +# if test `uname -r` = B.11.11; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS=$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000 - fi +# fi if test `uname -r` = B.11.23; then AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround]) CFLAGS=$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED
svn commit: samba r23266 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-05-31 13:59:08 + (Thu, 31 May 2007) New Revision: 23266 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23266 Log: HP-UX 11.23 doesn't like this, but HP-UX 11.00 and 11.11 need it metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:23:52 UTC (rev 23265) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 13:59:08 UTC (rev 23266) @@ -60,10 +60,10 @@ *hpux*) # mmap on HPUX is completely broken... AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken]) -# if test `uname -r` = B.11.11; then + if test `uname -r` = B.11.00 -o `uname -r` = B.11.11; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS=$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000 -# fi + fi if test `uname -r` = B.11.23; then AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround]) CFLAGS=$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED
svn commit: samba r23267 - in branches/SAMBA_3_0_26/source: . script
Author: jerry Date: 2007-05-31 15:41:46 + (Thu, 31 May 2007) New Revision: 23267 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23267 Log: Merge idl Makefile target and associated files from SAMBA_3_0 Added: branches/SAMBA_3_0_26/source/script/build_idl.sh Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 13:59:08 UTC (rev 23266) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 15:41:46 UTC (rev 23267) @@ -33,6 +33,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ + [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -172,7 +174,7 @@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@ @@ -729,6 +731,11 @@ lib/replace/test/strptime.o \ $(LIBREPLACE_OBJ) +NDRDUMP_OBJ = librpc/tools/ndrdump.o \ + $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \ + $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ + $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(SECRETS_OBJ) + RPCTORTURE_OBJ = torture/rpctorture.o \ rpcclient/display.o \ rpcclient/cmd_lsarpc.o \ @@ -900,6 +907,20 @@ cac: SHOWFLAGS $(LIBMSRPC) +# +## Perl IDL Compiler +IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \ + srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \ + epmapper.idl messaging.idl + +idl: + @IDL_FILES=$(IDL_FILES) CPP=$(CPP) PERL=$(PERL) \ +srcdir=$(srcdir) $(srcdir)/script/build_idl.sh $(PIDL_ARGS) + + +# + + everything: all libsmbclient debug2html smbfilter talloctort replacetort modules torture \ $(EVERYTHING_PROGS) @@ -1165,6 +1186,11 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) +bin/[EMAIL PROTECTED]@: $(NDRDUMP_OBJ) bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ + @POPTLIBS@ @LDAP_LIBS@ + bin/[EMAIL PROTECTED]@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) Copied: branches/SAMBA_3_0_26/source/script/build_idl.sh (from rev 23266, branches/SAMBA_3_0/source/script/build_idl.sh)
svn commit: samba r23268 - in branches: SAMBA_3_0/source/librpc/idl SAMBA_3_0_26/source/librpc/idl
Author: jerry Date: 2007-05-31 15:43:40 + (Thu, 31 May 2007) New Revision: 23268 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23268 Log: Rename some variables in the svcctl.idl to prevent redeclaration compile failures in the generated client code. Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl Changeset: Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl === --- branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -96,7 +96,7 @@ WERROR svcctl_ControlService( [in,ref] policy_handle *handle, [in] uint32 control, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -127,7 +127,7 @@ /* Function 0x06 */ WERROR svcctl_QueryServiceStatus( [in,ref] policy_handle *handle, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -197,7 +197,7 @@ WERROR svcctl_EnumDependentServicesW( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -248,7 +248,7 @@ WERROR svcctl_QueryServiceLockStatusW( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); @@ -326,7 +326,7 @@ WERROR svcctl_EnumDependentServicesA( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -376,7 +376,7 @@ WERROR svcctl_QueryServiceLockStatusA( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); Modified: branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl === --- branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -96,7 +96,7 @@ WERROR svcctl_ControlService( [in,ref] policy_handle *handle, [in] uint32 control, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -127,7 +127,7 @@ /* Function 0x06 */ WERROR svcctl_QueryServiceStatus( [in,ref] policy_handle *handle, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -197,7 +197,7 @@ WERROR svcctl_EnumDependentServicesW( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -248,7 +248,7 @@ WERROR svcctl_QueryServiceLockStatusW( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); @@ -326,7 +326,7 @@ WERROR svcctl_EnumDependentServicesA( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -376,7 +376,7 @@ WERROR svcctl_QueryServiceLockStatusA( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, +
svn commit: samba r23269 - in branches: SAMBA_3_0/source/librpc/gen_ndr SAMBA_3_0_26/source/librpc/gen_ndr
Author: jerry Date: 2007-05-31 15:46:01 + (Thu, 31 May 2007) New Revision: 23269 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23269 Log: Regenerate svcctl files after IDL fixes Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.h branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/srv_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/svcctl.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/cli_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/cli_svcctl.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/ndr_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/srv_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/svcctl.h Changeset: Sorry, the patch is too large (1327 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23269
svn commit: samba r23270 - in branches/SAMBA_3_0_26/source: . include libmsrpc rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 16:57:18 + (Thu, 31 May 2007) New Revision: 23270 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23270 Log: Replace hand code CloseServiceHandle() with the pidl generated stubs (client and server) Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_svcctl.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/libmsrpc/cac_svcctl.c branches/SAMBA_3_0_26/source/rpc_client/cli_svcctl.c branches/SAMBA_3_0_26/source/rpc_parse/parse_svcctl.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c branches/SAMBA_3_0_26/source/rpc_server/srv_svcctl.c branches/SAMBA_3_0_26/source/rpc_server/srv_svcctl_nt.c branches/SAMBA_3_0_26/source/utils/net_rpc_service.c Changeset: Sorry, the patch is too large (708 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23270
svn commit: samba r23271 - in branches/SAMBA_3_0/source: . include libmsrpc rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 17:24:30 + (Thu, 31 May 2007) New Revision: 23271 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23271 Log: merge service control pidl change for CloseServiceHandle() from SAMBA_3_0_26 Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c branches/SAMBA_3_0/source/rpc_client/cli_svcctl.c branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c branches/SAMBA_3_0/source/rpc_server/srv_svcctl.c branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c branches/SAMBA_3_0/source/utils/net_rpc_service.c Changeset: Sorry, the patch is too large (632 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23271
svn commit: samba r23272 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: jra
Date: 2007-05-31 17:26:30 + (Thu, 31 May 2007)
New Revision: 23272
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23272
Log:
Fix main event loop - reviewed by Volker.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0_26/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev
23271)
+++ branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev
23272)
@@ -418,8 +418,6 @@
timeval_is_zero(idle_timeout) ?
NULL : idle_timeout);
- run_events(smbd_event_context(), num, r_fds, w_fds);
-
if (num == -1 errno == EINTR) {
if (got_sig_term) {
exit_server_cleanly(NULL);
@@ -436,6 +434,10 @@
continue;
}
+ if (run_events(smbd_event_context(), num, r_fds, w_fds)) {
+ continue;
+ }
+
#if 0
Deactivated for now, this needs to become a timed event
vl
Modified: branches/SAMBA_3_0_26/source/smbd/server.c
===
--- branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev
23271)
+++ branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev
23272)
@@ -516,8 +516,6 @@
timeval_is_zero(idle_timeout) ?
NULL : idle_timeout);
- run_events(smbd_event_context(), num, r_fds, w_fds);
-
if (num == -1 errno == EINTR) {
if (got_sig_term) {
exit_server_cleanly(NULL);
@@ -534,6 +532,10 @@
continue;
}
+ if (run_events(smbd_event_context(), num, r_fds, w_fds)) {
+ continue;
+ }
+
/* check if we need to reload services */
check_reload(time(NULL));
svn commit: samba r23273 - in branches/SAMBA_3_0_26/source: . include rpc_parse rpc_server
Author: jerry Date: 2007-05-31 17:33:47 + (Thu, 31 May 2007) New Revision: 23273 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23273 Log: Replace hand written CloseEventlog() with pidl generated stub Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_eventlog.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 17:33:47 UTC (rev 23273) @@ -233,7 +233,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o librpc/gen_ndr/ndr_notify.o \ librpc/gen_ndr/ndr_lsa.o librpc/gen_ndr/ndr_echo.o \ -librpc/gen_ndr/ndr_svcctl.o +librpc/gen_ndr/ndr_svcctl.o librpc/gen_ndr/ndr_eventlog.o RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o @@ -338,6 +338,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wkssvc.o librpc/gen_ndr/cli_lsa.o \ librpc/gen_ndr/cli_echo.o librpc/gen_ndr/cli_svcctl.o \ + librpc/gen_ndr/cli_eventlog.o \ $(LIBNDR_GEN_OBJ) $(RPCCLIENT_NDR_OBJ) REGOBJS_OBJ = registry/reg_objects.o @@ -375,7 +376,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ + rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o Modified: branches/SAMBA_3_0_26/source/configure.in === --- branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:33:47 UTC (rev 23273) @@ -610,7 +610,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template +default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead @@ -6131,7 +6131,7 @@ SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), bin/librpc_netdfs.$SHLIBEXT, RPC) SMB_MODULE(rpc_srv, \$(RPC_SVC_OBJ), bin/librpc_svc.$SHLIBEXT, RPC) SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), bin/librpc_spoolss.$SHLIBEXT, RPC) -SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), bin/librpc_eventlog.$SHLIBEXT, RPC) +SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), bin/librpc_eventlog2.$SHLIBEXT, RPC) SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), bin/librpc_samr.$SHLIBEXT, RPC) SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), bin/librpc_rpcecho.$SHLIBEXT, RPC) SMB_SUBSYSTEM(RPC,smbd/server.o) Modified: branches/SAMBA_3_0_26/source/include/includes.h === --- branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -786,6 +786,7 @@ #include librpc/gen_ndr/srv_echo.h #include librpc/gen_ndr/srv_svcctl.h #include librpc/gen_ndr/srv_lsa.h +#include librpc/gen_ndr/srv_eventlog.h /* automatically generated prototypes */ #ifndef NO_PROTO_H Modified: branches/SAMBA_3_0_26/source/include/rpc_client.h === --- branches/SAMBA_3_0_26/source/include/rpc_client.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/rpc_client.h 2007-05-31 17:33:47 UTC
svn commit: samba r23274 - in branches/SAMBA_3_0/source: . include rpc_parse rpc_server
Author: jerry Date: 2007-05-31 17:59:04 + (Thu, 31 May 2007) New Revision: 23274 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23274 Log: merge CloseEventlog() pidl conversion from 3.0.26 fix a few init call renames for svcctl in the previous commit Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/rpc_eventlog.h branches/SAMBA_3_0/source/include/rpc_svcctl.h branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c branches/SAMBA_3_0/source/rpc_server/srv_pipe.c Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/Makefile.in 2007-05-31 17:59:04 UTC (rev 23274) @@ -395,7 +395,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ + rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/configure.in 2007-05-31 17:59:04 UTC (rev 23274) @@ -692,7 +692,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog rpc_unixinfo rpc_epmapper auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template +default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 rpc_unixinfo rpc_epmapper auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead @@ -6277,13 +6277,13 @@ SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), bin/librpc_initshutdown.$SHLIBEXT, RPC) SMB_MODULE(rpc_lsa_ds, \$(RPC_LSA_DS_OBJ), bin/librpc_lsa_ds.$SHLIBEXT, RPC) SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), bin/librpc_wkssvc.$SHLIBEXT, RPC) -SMB_MODULE(rpc_svcctl, \$(RPC_SVCCTL_OBJ), bin/librpc_svcctl.$SHLIBEXT, RPC) +SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), bin/librpc_svcctl2.$SHLIBEXT, RPC) SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), bin/librpc_ntsvcs.$SHLIBEXT, RPC) SMB_MODULE(rpc_net, \$(RPC_NETLOG_OBJ), bin/librpc_NETLOGON.$SHLIBEXT, RPC) SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), bin/librpc_netdfs.$SHLIBEXT, RPC) SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), bin/librpc_srvsvc.$SHLIBEXT, RPC) SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), bin/librpc_spoolss.$SHLIBEXT, RPC) -SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), bin/librpc_eventlog.$SHLIBEXT, RPC) +SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), bin/librpc_eventlog2.$SHLIBEXT, RPC) SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), bin/librpc_samr.$SHLIBEXT, RPC) SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), bin/librpc_echo.$SHLIBEXT, RPC) SMB_MODULE(rpc_unixinfo, \$(RPC_UNIXINFO_OBJ), bin/librpc_unixinfo.$SHLIBEXT, RPC) Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/include/includes.h2007-05-31 17:59:04 UTC (rev 23274) @@ -782,6 +782,7 @@ #include librpc/gen_ndr/srv_echo.h #include librpc/gen_ndr/srv_svcctl.h #include librpc/gen_ndr/srv_lsa.h +#include librpc/gen_ndr/srv_eventlog.h /* automatically generated prototypes */ #ifndef NO_PROTO_H Modified: branches/SAMBA_3_0/source/include/rpc_eventlog.h === --- branches/SAMBA_3_0/source/include/rpc_eventlog.h2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/include/rpc_eventlog.h2007-05-31 17:59:04 UTC (rev 23274) @@ -84,18 +84,6 @@ typedef
svn commit: samba r23275 - in branches/SAMBA_3_0_26/source: . include rpc_client rpc_parse rpc_server rpcclient
Author: jerry Date: 2007-05-31 18:53:32 + (Thu, 31 May 2007) New Revision: 23275 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23275 Log: Have not tested this (I don't think the dfs RPC code has even really been considered stable). merge the complete netdfs pipe support from SAMBA_3_0. Removed: branches/SAMBA_3_0_26/source/include/rpc_dfs.h branches/SAMBA_3_0_26/source/rpc_client/cli_dfs.c branches/SAMBA_3_0_26/source/rpc_parse/parse_dfs.c branches/SAMBA_3_0_26/source/rpc_server/srv_dfs.c Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_server/srv_dfs_nt.c branches/SAMBA_3_0_26/source/rpcclient/cmd_dfs.c Changeset: Sorry, the patch is too large (5245 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23275
svn commit: samba r23276 - in branches/SAMBA_3_0_26/source: . rpc_server
Author: jerry Date: 2007-05-31 20:32:02 + (Thu, 31 May 2007) New Revision: 23276 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23276 Log: File renames to reduce the diff between the 3.0 and 3.0.26 tree. Added: branches/SAMBA_3_0_26/source/rpc_server/srv_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg_nt.c Removed: branches/SAMBA_3_0_26/source/rpc_server/srv_reg.c branches/SAMBA_3_0_26/source/rpc_server/srv_reg_nt.c Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Sorry, the patch is too large (2040 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23276
svn commit: samba r23277 - in branches/SAMBA_3_0_26/source: . include libmsrpc rpc_client rpc_parse rpc_server rpcclient utils
Author: jerry Date: 2007-05-31 21:09:57 + (Thu, 31 May 2007) New Revision: 23277 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23277 Log: This might break the shutdown script functionality. I think it is safe for now. * Merge the initshutdown code from SAMBA_3_0 * Replace _reg_close() with the pidl generate winreg_CloseKey() client and server code Added: branches/SAMBA_3_0_26/source/rpc_server/srv_initshutdown_nt.c Removed: branches/SAMBA_3_0_26/source/include/rpc_shutdown.h branches/SAMBA_3_0_26/source/rpc_client/cli_shutdown.c branches/SAMBA_3_0_26/source/rpc_parse/parse_shutdown.c Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg_nt.c branches/SAMBA_3_0_26/source/rpcclient/cmd_shutdown.c branches/SAMBA_3_0_26/source/utils/net_rpc.c Changeset: Sorry, the patch is too large (1157 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23277
svn commit: samba r23278 - in branches/SAMBA_3_0_26/source: include libmsrpc rpc_client rpc_parse utils
Author: jerry
Date: 2007-05-31 21:15:53 + (Thu, 31 May 2007)
New Revision: 23278
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23278
Log:
remove vestiges of rpccli_reg_close()
Modified:
branches/SAMBA_3_0_26/source/include/rpc_reg.h
branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c
branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c
branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c
branches/SAMBA_3_0_26/source/utils/net_rpc_registry.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/include/rpc_reg.h
===
--- branches/SAMBA_3_0_26/source/include/rpc_reg.h 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/include/rpc_reg.h 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -348,19 +348,7 @@
/***/
typedef struct {
- POLICY_HND pol; /* policy handle */
-} REG_Q_CLOSE;
-
-typedef struct {
POLICY_HND pol;
- WERROR status;
-} REG_R_CLOSE;
-
-
-/***/
-
-typedef struct {
- POLICY_HND pol;
uint32 key_index;
uint16 key_name_len;
uint16 unknown_1; /* 0x0414 */
Modified: branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c
===
--- branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -93,7 +93,6 @@
POLICY_HND * key )
{
struct rpc_pipe_client *pipe_hnd = NULL;
- WERROR err;
if ( !hnd )
return CAC_FAILURE;
@@ -114,8 +113,7 @@
return CAC_FAILURE;
}
- err = rpccli_reg_close( pipe_hnd, mem_ctx, key );
- hnd-status = werror_to_ntstatus( err );
+ hnd-status = rpccli_winreg_CloseKey( pipe_hnd, mem_ctx, key );
if ( !NT_STATUS_IS_OK( hnd-status ) ) {
return CAC_FAILURE;
@@ -203,8 +201,7 @@
if ( !op-in.parent_key ) {
/*then close the one that we opened above */
- err = rpccli_reg_close( pipe_hnd, mem_ctx, parent_key );
- hnd-status = werror_to_ntstatus( err );
+ hnd-status = rpccli_winreg_CloseKey( pipe_hnd, mem_ctx,
parent_key );
if ( !NT_STATUS_IS_OK( hnd-status ) ) {
return CAC_FAILURE;
@@ -436,7 +433,7 @@
rpccli_reg_flush_key( pipe_hnd, mem_ctx, key );
/*close the key that we opened */
- rpccli_reg_close( pipe_hnd, mem_ctx, subkey );
+ rpccli_winreg_CloseKey( pipe_hnd, mem_ctx, subkey );
/*now we delete the subkey */
err = rpccli_reg_delete_key( pipe_hnd, mem_ctx, key,
Modified: branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c
===
--- branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -635,31 +635,6 @@
}
/
-/
-
-WERROR rpccli_reg_close(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd)
-{
- REG_Q_CLOSE in;
- REG_R_CLOSE out;
- prs_struct qbuf, rbuf;
-
- ZERO_STRUCT (in);
- ZERO_STRUCT (out);
-
- init_reg_q_close(in, hnd);
-
- CLI_DO_RPC_WERR( cli, mem_ctx, PI_WINREG, REG_CLOSE,
- in, out,
- qbuf, rbuf,
- reg_io_q_close,
- reg_io_r_close,
- WERR_GENERAL_FAILURE );
-
- return out.status;
-}
-
-/
do a REG Query Info
/
Modified: branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c
===
--- branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -685,66 +685,6 @@
}
/***
- Inits an REG_Q_CLOSE structure.
-/
-
-void init_reg_q_close(REG_Q_CLOSE *q_c, POLICY_HND *hnd)
-{
- DEBUG(5,(init_reg_q_close\n));
-
- memcpy(q_c-pol, hnd, sizeof(q_c-pol));
-}
-
-/***
-reads or writes a structure.
svn commit: samba r23279 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-05-31 22:02:49 + (Thu, 31 May 2007)
New Revision: 23279
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23279
Log:
Replace occurrence of sid_binstring inside lookup_groupmem
by sid_string_static.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 21:15:53 UTC
(rev 23278)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 22:02:49 UTC
(rev 23279)
@@ -901,7 +901,6 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- char *sidstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -914,7 +913,6 @@
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
-
DEBUG(10,(ads: lookup_groupmem %s sid=%s\n, domain-name,
sid_string_static(group_sid)));
@@ -933,19 +931,14 @@
goto done;
}
- if ((sidstr = sid_binstring(group_sid)) == NULL) {
- status = NT_STATUS_NO_MEMORY;
- goto done;
- }
-
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),sidstr))) {
- SAFE_FREE(sidstr);
- DEBUG(1, (ads: lookup_groupmem: tallloc_asprintf for ldap_exp
failed!\n));
+ if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),
+sid_string_static(group_sid
+ {
+ DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
- SAFE_FREE(sidstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
21:15:53 UTC (rev 23278)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
22:02:49 UTC (rev 23279)
@@ -901,7 +901,6 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- char *sidstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -914,7 +913,6 @@
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
-
DEBUG(10,(ads: lookup_groupmem %s sid=%s\n, domain-name,
sid_string_static(group_sid)));
@@ -933,19 +931,14 @@
goto done;
}
- if ((sidstr = sid_binstring(group_sid)) == NULL) {
- status = NT_STATUS_NO_MEMORY;
- goto done;
- }
-
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),sidstr))) {
- SAFE_FREE(sidstr);
- DEBUG(1, (ads: lookup_groupmem: tallloc_asprintf for ldap_exp
failed!\n));
+ if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),
+sid_string_static(group_sid
+ {
+ DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
- SAFE_FREE(sidstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
svn commit: samba r23280 - in branches/SAMBA_3_0_26/source: . include rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 22:41:27 + (Thu, 31 May 2007) New Revision: 23280 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23280 Log: Replace the NetFileClose() call with the pidl generated code. No risk since we don't support the call functionally anyways. Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_srvsvc.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_client/cli_srvsvc.c branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_26/source/utils/net_rpc.c Changeset: Sorry, the patch is too large (673 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23280
svn commit: samba r23281 - in branches/SAMBA_4_0/source: .
Author: abartlet Date: 2007-05-31 23:01:08 + (Thu, 31 May 2007) New Revision: 23281 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23281 Log: Ensure we wipe all the right things in distclean. Andrew Bartlett Modified: branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2007-05-31 22:41:27 UTC (rev 23280) +++ branches/SAMBA_4_0/source/main.mk 2007-05-31 23:01:08 UTC (rev 23281) @@ -269,7 +269,7 @@ -rm -f config.status -rm -f config.log config.cache -rm -f config.pm config.mk - -rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache + -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache -rm -f $(PC_FILES) removebackup: @@ -417,7 +417,7 @@ DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d -dist:: distclean idl_full manpages configure +dist:: idl_full manpages configure distclean configure: ./autogen.sh
svn commit: samba r23282 - in branches/SAMBA_4_0_RELEASE/source: . script
Author: abartlet Date: 2007-05-31 23:03:47 + (Thu, 31 May 2007) New Revision: 23282 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23282 Log: Merge mkrelease.sh and fixes for make distclean from SAMBA_4_0 Andrew Bartlett Modified: branches/SAMBA_4_0_RELEASE/source/main.mk branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh Changeset: Modified: branches/SAMBA_4_0_RELEASE/source/main.mk === --- branches/SAMBA_4_0_RELEASE/source/main.mk 2007-05-31 23:01:08 UTC (rev 23281) +++ branches/SAMBA_4_0_RELEASE/source/main.mk 2007-05-31 23:03:47 UTC (rev 23282) @@ -269,7 +269,7 @@ -rm -f config.status -rm -f config.log config.cache -rm -f config.pm config.mk - -rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache + -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache -rm -f $(PC_FILES) removebackup: @@ -417,7 +417,7 @@ DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d -dist:: distclean idl_full manpages configure +dist:: idl_full manpages configure distclean configure: ./autogen.sh Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh === --- branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-05-31 23:01:08 UTC (rev 23281) +++ branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-05-31 23:03:47 UTC (rev 23282) @@ -4,9 +4,8 @@ svn export . samba-$VERSION || exit 1 -cd samba-$VERSION/source -./autogen.sh || exit 1 -./configure || exit 1 -make dist || exit 1 - -tar -zcf samba-$VERSION.tar.gz samba-$VERSION +( cd samba-$VERSION/source + ./autogen.sh || exit 1 + ./configure || exit 1 + make dist || exit 1 +) tar -zcf samba-$VERSION.tar.gz samba-$VERSION
svn commit: samba r23283 - in branches/SAMBA_3_0/source/nsswitch: .
Author: obnox
Date: 2007-05-31 23:55:37 + (Thu, 31 May 2007)
New Revision: 23283
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23283
Log:
Use a temporary talloc context in ads:lookup_groupmem.
And clean up unused stuff at the end.
Daringly, I use talloc_steal at some point, where it
appears natural to me.
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:03:47 UTC
(rev 23282)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:55:37 UTC
(rev 23283)
@@ -912,12 +912,20 @@
uint32 *name_types_nocache = NULL;
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
+ TALLOC_CTX *tmp_ctx = NULL;
DEBUG(10,(ads: lookup_groupmem %s sid=%s\n, domain-name,
sid_string_static(group_sid)));
*num_names = 0;
+ tmp_ctx = talloc_new(mem_ctx);
+ if (!tmp_ctx) {
+ DEBUG(1, (ads: lookup_groupmem: talloc failed\n));
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
if ( !winbindd_can_contact_domain( domain ) ) {
DEBUG(10,(lookup_groupmem: No incoming trust for domain %s\n,
domain-name));
@@ -932,7 +940,7 @@
}
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
sid_string_static(group_sid
{
DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
@@ -944,7 +952,7 @@
args.val = ADS_EXTENDED_DN_HEX_STRING;
args.critical = True;
- rc = ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_SUBTREE,
ads-config.bind_path,
+ rc = ads_ranged_search(ads, tmp_ctx, LDAP_SCOPE_SUBTREE,
ads-config.bind_path,
ldap_exp, args, member, members,
num_members);
if (!ADS_ERR_OK(rc)) {
@@ -971,13 +979,13 @@
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
- (sid_mem_nocache) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID,
num_members);
+ (sid_mem_nocache) = TALLOC_ZERO_ARRAY(tmp_ctx, DOM_SID,
num_members);
if ((members == NULL) || (*sid_mem == NULL) ||
(*names == NULL) || (*name_types == NULL) ||
(sid_mem_nocache == NULL))
{
- DEBUG(1, (talloc failed\n));
+ DEBUG(1, (ads: lookup_groupmem: talloc failed\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
@@ -993,7 +1001,7 @@
char *name, *domain_name;
DOM_SID sid;
- if (!ads_get_sid_from_extended_dn(mem_ctx, members[i],
args.val, sid)) {
+ if (!ads_get_sid_from_extended_dn(tmp_ctx, members[i],
args.val, sid)) {
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
@@ -1019,13 +1027,13 @@
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
- status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);
+ status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- status = rpccli_lsa_lookup_sids_all(cli, mem_ctx,
+ status = rpccli_lsa_lookup_sids_all(cli, tmp_ctx,
lsa_policy,
num_nocache,
sid_mem_nocache,
@@ -1046,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] = names_nocache[i];
+ (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
@@ -1073,11 +1081,7 @@
done:
- /* free intermediate lists. - a temp talloc ctx might be better. */
- TALLOC_FREE(sid_mem_nocache);
-
svn commit: samba r23284 - in branches/SAMBA_3_0/source/nsswitch: .
Author: obnox
Date: 2007-05-31 23:58:56 + (Thu, 31 May 2007)
New Revision: 23284
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23284
Log:
Oh what a nasty typo! This gave me some headache,
with talloc randomly failing.
Hey, shouldn't TALLOC_ARRAY _not_ return NULL when
requested to allocate an array with zero entries? :-)
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:55:37 UTC
(rev 23283)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:58:56 UTC
(rev 23284)
@@ -975,7 +975,7 @@
* we try to resolve as many sids as possible from the
* cache. Only the rest is passed to the lsa_lookup_sids call. */
- if (num_names) {
+ if (num_members) {
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
Build status as of Fri Jun 1 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-05-31 00:01:49.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-01 00:00:37.0 + @@ -1,25 +1,25 @@ -Build status as of Thu May 31 00:00:02 2007 +Build status as of Fri Jun 1 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 33 6 0 +ccache 34 6 0 ctdb 0 0 0 distcc 2 0 0 -ldb 32 9 0 -libreplace 31 12 0 -lorikeet-heimdal 27 17 0 -pidl 16 2 0 -ppp 12 0 0 +ldb 33 9 0 +libreplace 32 12 0 +lorikeet-heimdal 28 17 0 +pidl 17 2 0 +ppp 13 0 0 python 0 0 0 -rsync33 13 0 +rsync34 13 0 samba0 0 0 samba-docs 0 0 0 -samba-gtk2 2 0 -samba4 30 21 3 -samba_3_033 18 0 -smb-build30 30 0 -talloc 33 7 0 -tdb 32 3 0 +samba-gtk3 3 0 +samba4 31 22 1 +samba_3_033 17 0 +smb-build31 31 0 +talloc 34 7 0 +tdb 33 3 0
svn commit: samba r23285 - in branches/SAMBA_3_0_26/source/nsswitch: .
Author: obnox
Date: 2007-06-01 00:04:13 + (Fri, 01 Jun 2007)
New Revision: 23285
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23285
Log:
r23283 and r23284 also for SAMBA_3_0_26.
Use a temporary talloc context in ads:lookup_groupmem and clean up
at the end. And fix one nasty typo.
Modified:
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
23:58:56 UTC (rev 23284)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
00:04:13 UTC (rev 23285)
@@ -912,12 +912,20 @@
uint32 *name_types_nocache = NULL;
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
+ TALLOC_CTX *tmp_ctx = NULL;
DEBUG(10,(ads: lookup_groupmem %s sid=%s\n, domain-name,
sid_string_static(group_sid)));
*num_names = 0;
+ tmp_ctx = talloc_new(mem_ctx);
+ if (!tmp_ctx) {
+ DEBUG(1, (ads: lookup_groupmem: talloc failed\n));
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
if ( !winbindd_can_contact_domain( domain ) ) {
DEBUG(10,(lookup_groupmem: No incoming trust for domain %s\n,
domain-name));
@@ -932,8 +940,8 @@
}
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, (objectSid=%s),
-sid_string_static(group_sid
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
+sid_string_static(group_sid
{
DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
status = NT_STATUS_NO_MEMORY;
@@ -944,7 +952,7 @@
args.val = ADS_EXTENDED_DN_HEX_STRING;
args.critical = True;
- rc = ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_SUBTREE,
ads-config.bind_path,
+ rc = ads_ranged_search(ads, tmp_ctx, LDAP_SCOPE_SUBTREE,
ads-config.bind_path,
ldap_exp, args, member, members,
num_members);
if (!ADS_ERR_OK(rc)) {
@@ -967,17 +975,17 @@
* we try to resolve as many sids as possible from the
* cache. Only the rest is passed to the lsa_lookup_sids call. */
- if (num_names) {
+ if (num_members) {
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
- (sid_mem_nocache) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID,
num_members);
+ (sid_mem_nocache) = TALLOC_ZERO_ARRAY(tmp_ctx, DOM_SID,
num_members);
if ((members == NULL) || (*sid_mem == NULL) ||
(*names == NULL) || (*name_types == NULL) ||
(sid_mem_nocache == NULL))
{
- DEBUG(1, (talloc failed\n));
+ DEBUG(1, (ads: lookup_groupmem: talloc failed\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
@@ -993,7 +1001,7 @@
char *name, *domain_name;
DOM_SID sid;
- if (!ads_get_sid_from_extended_dn(mem_ctx, members[i],
args.val, sid)) {
+ if (!ads_get_sid_from_extended_dn(tmp_ctx, members[i],
args.val, sid)) {
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
@@ -1019,13 +1027,13 @@
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
- status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);
+ status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- status = rpccli_lsa_lookup_sids_all(cli, mem_ctx,
+ status = rpccli_lsa_lookup_sids_all(cli, tmp_ctx,
lsa_policy,
num_nocache,
sid_mem_nocache,
@@ -1046,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] = names_nocache[i];
+ (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
Re: svn commit: samba r23284 - in branches/SAMBA_3_0/source/nsswitch: .
On Thu, May 31, 2007 at 11:58:57PM +, [EMAIL PROTECTED] wrote: Author: obnox Date: 2007-05-31 23:58:56 + (Thu, 31 May 2007) New Revision: 23284 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23284 Log: Oh what a nasty typo! This gave me some headache, with talloc randomly failing. Hey, shouldn't TALLOC_ARRAY _not_ return NULL when requested to allocate an array with zero entries? :-) Yes it should at the moment. It should be calling _talloc_array_zeronull() under the covers in lib/util.c which explicitly does this. Was this not happening for you ? I'd like you to debug that as I can't see a codepath for this not to happen. Jeremy.
svn commit: samba r23286 - in branches/SAMBA_4_0/webapps/install: .
Author: abartlet
Date: 2007-06-01 03:47:35 + (Fri, 01 Jun 2007)
New Revision: 23286
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23286
Log:
In SWAT, it was not possible to use a domain name other than the default.
Fix this in the same way the setup/provision script does.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/webapps/install/provision.esp
Changeset:
Modified: branches/SAMBA_4_0/webapps/install/provision.esp
===
--- branches/SAMBA_4_0/webapps/install/provision.esp2007-06-01 00:04:13 UTC
(rev 23285)
+++ branches/SAMBA_4_0/webapps/install/provision.esp2007-06-01 03:47:35 UTC
(rev 23286)
@@ -47,7 +47,10 @@
}
if (form['submit'] == Provision) {
+/* overcome an initially blank smb.conf */
lp.set(realm, subobj.REALM);
+ lp.set(workgroup, subobj.DOMAIN);
+ lp.reload()
var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
if (!goodpass) {
Rev 411: added CTDB_WAIT_DIRECTORIES support in http://samba.org/~tridge/ctdb
revno: 411
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 13:50:18 +1000
message:
added CTDB_WAIT_DIRECTORIES support
modified:
packaging/RHEL/setup/ctdb.sysconfig
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig 2007-05-31 01:09:45 +
+++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 03:50:18 +
@@ -47,6 +47,11 @@
# the default is not to wait for any local services
# CTDB_WAIT_TCP_PORTS=445 139
+# use this to specify any local directories to wait on before starting
+# ctdb. You should list any critical Samba or NFS shared directories
+# the default is not to wait for any local directories
+# CTDB_WAIT_DIRECTORIES=/some/directory
+
# the shared directory where you want to put statd information on
# which clients to notify on a NFS restart
# there is no default
=== modified file 'tools/events'
--- a/tools/events 2007-06-01 03:26:14 +
+++ b/tools/events 2007-06-01 03:50:18 +
@@ -8,10 +8,10 @@
case $cmd in
startup)
- # wait for local services to come up
+ # wait for local services to come up.
[ -z $CTDB_WAIT_TCP_PORTS ] || {
all_ok=0
- echo Waiting for tcp services on $CTDB_WAIT_TCP_PORTS to come up
+ echo Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS
while [ $all_ok -eq 0 ]; do
all_ok=1
for p in $CTDB_WAIT_TCP_PORTS; do
@@ -23,7 +23,24 @@
exit 1
}
done
- echo Local tcp services on $CTDB_WAIT_TCP_PORTS are up
+ echo Local tcp services are up
+ }
+ # wait for local directories to becomes available (could be slow to
mount)
+ [ -z $CTDB_WAIT_DIRECTORIES ] || {
+ all_ok=0
+ echo Waiting for local directories $CTDB_WAIT_DIRECTORIES
+ while [ $all_ok -eq 0 ]; do
+ all_ok=1
+ for d in $CTDB_WAIT_DIRECTORIES; do
+ [ -d $d ] || all_ok=0
+ done
+ [ $all_ok -eq 1 ] || sleep 1
+ /usr/bin/ctdb status /dev/null 21 || {
+ echo ctdb daemon has died. Exiting event startup
+ exit 1
+ }
+ done
+ echo Local directories are available
}
exit 0;
;;
Rev 410: merged from ronnie in http://samba.org/~tridge/ctdb
revno: 410
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 13:29:11 +1000
message:
merged from ronnie
modified:
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
tools/statd-calloutstatdcallout-20070531010857-6sdlz455vusye5y5-1
revno: 393.1.3
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Fri 2007-06-01 13:26:14 +1000
message:
it is -f not -x to check if a file exists
revno: 393.1.2
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Fri 2007-06-01 13:14:05 +1000
message:
- create /etc/ctdb/taken_ips and /etc/ctdb/changed_ips analog to the
existing /etc/ctdb/released_ips
- only call the statd-callout script if the ips have changed and call
it with a notify argument.we need to restart nfslock service in
both cases
- change statd-callout to explicitely restart the lock manager and statd
when notify is called. copy the state directory for each held ip
from shared storage to /tmp then use sm-notify to send notifications to
all monitored clients
revno: 393.1.1
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Fri 2007-06-01 13:03:53 +1000
message:
new branch from tridges tree
=== modified file 'tools/events'
--- a/tools/events 2007-05-31 01:09:45 +
+++ b/tools/events 2007-06-01 03:26:14 +
@@ -41,6 +41,9 @@
echo Failed to add $ip/$maskbits on dev $iface
exit 1
}
+ echo $ip /etc/ctdb/taken_ips
+ echo $ip /etc/ctdb/changed_ips
+
# if we have a local arp entry for this IP then remove it
/sbin/arp -d $ip 2 /dev/null
@@ -65,19 +68,27 @@
# if we have a local arp entry for this IP then remove it
/sbin/arp -d $ip 2 /dev/null
echo $ip /etc/ctdb/released_ips
+ echo $ip /etc/ctdb/changed_ips
/bin/rm -f /etc/ctdb/ip.$ip
exit 0
;;
recovered)
-# restart any services as necessary, like NFS
- #
- [ -x /etc/ctdb/statd-callout ] /etc/ctdb/statd-callout copy
+ # if we have taken or released any ips we must send out
+ # statd notifications to recover lost nfs locks
+ [ -x /etc/ctdb/statd-callout ] [ -f /etc/ctdb/changed_ips ] {
+ /etc/ctdb/statd-callout notify
+ } /dev/null 21
+
+# restart NFS to ensure that all TCP connections to the released ip
+ # are closed
[ -f /etc/ctdb/released_ips ] {
( /sbin/service nfs status /dev/null 21
/sbin/service nfs restart /dev/null 21 )
} /dev/null 21
+ /bin/rm -f /etc/ctdb/changed_ips
/bin/rm -f /etc/ctdb/released_ips
+ /bin/rm -f /etc/ctdb/taken_ips
exit 0
;;
=== modified file 'tools/statd-callout'
--- a/tools/statd-callout 2007-05-31 01:14:07 +
+++ b/tools/statd-callout 2007-06-01 03:14:05 +
@@ -22,23 +22,23 @@
/bin/rm -f $STATD_SHARED_DIRECTORY/$ip/$2
done
;;
- copy)
- restart_needed=0
+ notify)
+ # restart the local lock manager and statd
+ /sbin/service nfslock stop /dev/null 21
+ /sbin/service nfslock start /dev/null 21
+ # send out notifications to any additional ips we now serve
for f in `/bin/ls /etc/ctdb/ip.*`; do
fname=`/bin/basename $f`
ip=`echo $fname | cut -d. -f2-`
[ -d $STATD_SHARED_DIRECTORY/$ip ] {
- /bin/mv $STATD_SHARED_DIRECTORY/$ip
$STATD_SHARED_DIRECTORY/$ip.$$
- /bin/cp -a $STATD_SHARED_DIRECTORY/$ip.$$/.
/var/lib/nfs/statd/sm/
- /bin/rm -rf $STATD_SHARED_DIRECTORY/$ip.$$
- restart_needed=1
+ # we must copy to a different directory since rpc.statd gets
+ # upset if sm-notify touches the files.
+ /bin/rm -rf /tmp/statd/$ip
+ /bin/mkdir -p /tmp/statd/$ip
+ /bin/cp -apr $STATD_SHARED_DIRECTORY/$ip/* /tmp/statd/$ip
+ /usr/sbin/sm-notify -P /tmp/statd/$ip -v $ip -n
}
done
- # restart lockd if necessary
- [ $restart_needed -eq 1 ] {
- ( /sbin/service nfslock status /dev/null 21
-
Rev 412: log dates/time in event startup messages in http://samba.org/~tridge/ctdb
revno: 412
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 15:23:16 +1000
message:
log dates/time in event startup messages
modified:
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'tools/events'
--- a/tools/events 2007-06-01 03:50:18 +
+++ b/tools/events 2007-06-01 05:23:16 +
@@ -11,7 +11,7 @@
# wait for local services to come up.
[ -z $CTDB_WAIT_TCP_PORTS ] || {
all_ok=0
- echo Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS
+ echo `/bin/date` Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS
while [ $all_ok -eq 0 ]; do
all_ok=1
for p in $CTDB_WAIT_TCP_PORTS; do
@@ -23,12 +23,12 @@
exit 1
}
done
- echo Local tcp services are up
+ echo `/bin/date` Local tcp services are up
}
# wait for local directories to becomes available (could be slow to
mount)
[ -z $CTDB_WAIT_DIRECTORIES ] || {
all_ok=0
- echo Waiting for local directories $CTDB_WAIT_DIRECTORIES
+ echo `/bin/date` Waiting for local directories
$CTDB_WAIT_DIRECTORIES
while [ $all_ok -eq 0 ]; do
all_ok=1
for d in $CTDB_WAIT_DIRECTORIES; do
@@ -40,7 +40,7 @@
exit 1
}
done
- echo Local directories are available
+ echo `/bin/date` Local directories are available
}
exit 0;
;;
@@ -55,7 +55,7 @@
maskbits=$3
/sbin/ip addr add $ip/$maskbits dev $iface || {
-echo Failed to add $ip/$maskbits on dev $iface
+echo `/bin/date` Failed to add $ip/$maskbits on dev $iface
exit 1
}
echo $ip /etc/ctdb/taken_ips
@@ -72,14 +72,14 @@
releaseip)
if [ $# != 3 ]; then
- echo must supply interface, IP and maskbits
+ echo `/bin/date` must supply interface, IP and maskbits
exit 1
fi
iface=$1
ip=$2
maskbits=$3
/sbin/ip addr del $ip dev $iface || {
-echo Failed to del $ip on dev $iface
+echo `/bin/date` Failed to del $ip on dev $iface
exit 1
}
# if we have a local arp entry for this IP then remove it
@@ -115,5 +115,5 @@
;;
esac
-echo Invalid command $cmd
+echo `/bin/date` Invalid command $cmd
exit 1
Rev 413: merge initial web site from ronnie in http://samba.org/~tridge/ctdb
revno: 413 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 15:33:45 +1000 message: merge initial web site from ronnie added: web/ web-20070601052353-vgod9lfo4an4o83j-1 web/ctdb.html ctdb.html-20070601052353-vgod9lfo4an4o83j-2 revno: 393.1.5 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Fri 2007-06-01 15:31:23 +1000 message: add a developers section revno: 393.1.4 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Fri 2007-06-01 15:23:57 +1000 message: initial webpage === added directory 'web' === added file 'web/ctdb.html' --- a/web/ctdb.html 1970-01-01 00:00:00 + +++ b/web/ctdb.html 2007-06-01 05:31:23 + @@ -0,0 +1,47 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2//EN +HTML +HEAD +TITLEctdb/TITLE +/HEAD +BODY BGCOLOR=#ff TEXT=#00 VLINK=#292555 LINK=#292555 ALINK=#cc0033 + +h1ctdb/h1 + +ctdb is a fast cluster database for temporary data. +ctdb also provides HA features such as IP failover between nodes. + +It is the core component for samba3/4 clustering. + +To get started with ctdb, I would recommend you read a +href=http://wiki.samba.org/CTDB_Setup;the ctdb wiki/a. + +h2Discussion and bug reports/h2 + +ctdb does not currently have its own mailing list or bug tracking +system. For now, please use the ahref=https://lists.samba.org/mailman/listinfo/samba-technical;samba-technical/a +mailing list, and the a href=http://bugzilla.samba.org/;Samba +bugzilla/a bug tracking system. + +h2Download/h2 + +You can download the latest release either via rsync or anonymous +svn. To fetch via svn use the following command: + +pre + svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/cluster/ctdb ctdb +/pre + +To fetch via rsync use this command: + +pre + rsync -Pavz samba.org::ftp/unpacked/samba4/source/cluster/ctdb . +/pre + +hr +h2Developers/h2 +a href=http://samba.org/~tridge/;Andrew Tridgell/abr +Ronnie Sahlbergbr + + +/BODY +/HTML
