[Samba] Ftp login
Dear All, Can you help me to login into the ftp server using a shell script. My ftp server is secured. Need username and password for login. Pls help me to get thru. -- M.Saravanan CCAT LTD 302, Koon Fook Centre, 9, Knutsford Terrace, T.S.T, Kowloon, Hong Kong. Phone: 28516318 Mobile : 61000856 Fax: 37434866 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Export groups, users, all objects in Samba domain a nutshell
Greetings, I want to set a lab and ant to use all the objects in my Samba Domain so that I can play with. Obviously, if some users are members of groups and that these groups are themselves members of other groups, I would need this as well. In a nutshell, I am attempting to make a full export that I can manipulate, “redesign” and re-inject afterwards. Best, Jimmy -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba LDAP troubleshooting
Brad C wrote: Hi There, Yep, Ok now I understand the SID needs to be the same as the server the client formed the initial security relationship with, Is this correct? Kind Regards Brad yes. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Ftp login
From: Muthukumaran Saravanan sarava...@ccatgroup.com Can you help me to login into the ftp server using a shell script. My ftp server is secured. Need username and password for login. Pls help me to get thru. Since you did not give any context, maybe try something like: wget --user=user --password=password ftp://ftp.ccatgroup.com/... JD -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] ADS Authentication - CLDAP request failed
I have a RHEL 5 system, with Samba 3.0.33 installed, that _used_ to authenticate against the corporate Active Directory system without any problems. However, about a month ago the connection broke, but the users didn't complain until some time went buy. I've spent quite a few hours trying to reconnect this system, but nothing works. I do not believe it is a simple configuration problem, as it used to work... and am afraid that something changed on the corporate domain controllers. Unfortunately, corporate doesn't believe in non-Windows solutions to anything and will not support me in this effort. They also don't support an NFS services, which are critical for my user community. sigh... Kerberos authentication still works; -- # kinit -V username Password for usern...@wkg.company.com: Authenticated to Kerberos v5 [r...@palsrv6] klist Ticket cache: *FILE:/tmp/krb5cc_0* Default principal: usern...@wkg.company.com Valid starting ExpiresService principal 03/16/09 09:42:42 03/16/09 19:42:51 krbtgt/wkg.company@wkg.company.com renew until 03/17/09 09:42:42 -- Samba can talk to the Primary Domain Controller as a client, but doesn't seem to recognize the PDC as a server. -- # smbclient -L /pdc01 -k OS=[Windows Server 2003 R2 3790 Service Pack 2] Server=[Windows Server 2003 R2 5.2] Sharename Type Comment - --- C$ Disk Default share H$ Disk Default share F$ DiskDefault share IPC$IPC Remote IPC G$ Disk Default share ADMIN$ Disk Remote Admin D$ Disk Default share E$ Disk Default share SYSVOL Disk Logon server share NETLOGONDisk Logon server share OS=[Windows Server 2003 R2 3790 Service Pack 2] Server=[Windows Server 2003 R2 5.2] [snipping noise] -- # net ads join -U usern...@wkg.company.com usern...@wkg.company.com's password: [2009/03/16 09:58:23, 0] utils/net_ads.c:ads_startup_int(286) ads_connect: No logon servers Failed to join domain: No logon servers -- -sh-3.2# net rpc testjoin Unable to find a suitable server Join to domain 'WKG' is not valid -sh-3.2# net -d5 ads testjoin [2009/03/18 09:07:16, 5] lib/debug.c:debug_dump_status(391) INFO: Current debug levels: all: True/5 tdb: False/0 printdrivers: False/0 lanman: False/0 smb: False/0 rpc_parse: False/0 rpc_srv: False/0 rpc_cli: False/0 passdb: False/0 sam: False/0 auth: False/0 winbind: False/0 vfs: False/0 idmap: False/0 quota: False/0 acls: False/0 locking: False/0 msdfs: False/0 dmapi: False/0 [2009/03/18 09:07:16, 3] param/loadparm.c:lp_load(5064) lp_load: refreshing parameters [2009/03/18 09:07:16, 3] param/loadparm.c:init_globals(1440) Initialising global parameters [2009/03/18 09:07:16, 3] param/params.c:pm_process(572) params.c:pm_process() - Processing configuration file /etc/samba/smb.conf [2009/03/18 09:07:16, 3] param/loadparm.c:do_section(3803) Processing section [global] doing parameter workgroup = wks doing parameter password server = pdc01.wks.company.com doing parameter realm = WKS.COMPANY.COM #[GLOBAL] doing parameter security = ads doing parameter idmap uid = 16777216-33554431 doing parameter idmap gid = 16777216-33554431 doing parameter winbind use default domain = Yes doing parameter winbind offline logon = false doing parameter server string = Samba Server Version %v doing parameter passdb backend = tdbsam doing parameter cups options = raw [2009/03/18 09:07:16, 4] param/loadparm.c:lp_load(5095) pm_process() returned Yes [2009/03/18 09:07:16, 5] lib/iconv.c:smb_register_charset(105) Attempting to register new charset UCS-2LE [snipping noise] [2009/03/18 09:07:16, 5] lib/charcnv.c:charset_name(82) Substituting charset 'UTF-8' for LOCALE [snipping noise] [2009/03/18 09:07:16, 5] lib/util.c:init_names(309) Netbios name list:- my_netbios_names[0]=HOSTNAME [2009/03/18 09:07:16, 2] lib/interface.c:add_interface(81) added interface ip=10.20.30.99 bcast=10.20.30.255 nmask=255.255.254.0 [snipping noise] [2009/03/18 09:07:16, 5] lib/gencache.c:gencache_init(61) Opening cache file at /var/cache/samba/gencache.tdb [2009/03/18 09:07:16, 5] libads/dns.c:sitename_fetch(706) sitename_fetch: No stored sitename for WKS.COMPANY.COM #[GLOBAL] [2009/03/18
[Samba] Server 2008 and Samba 3.0.25b
Hi Folks - I'm experiencing a very strange problem with Server 2008 machines (for all intents and purposes related to Samba, it's Vista) connecting to a Samba Server. The Samba machine is a RHEL4.6 machine running Samba 3.0.25b. I am joined to the mixed mode AD domain via the command net rpc join -U administrator domain. I am not using winbind or kerberos. Or at least, I am not trying to. The smb.conf file is at the bottom of this email. I've removed things like disallowed users from the file to keep it brief. I have another samba machine with the very same OS and release, and it works fine. When I try to connect to the Samba machine from the 2k8 machine using the UNC path, I get a network path not found message. Oddly, if I use '\\ipaddress' it works just fine. I used Wireshark to look at the packets, and there is one glaring difference between the working samba install and the non-working samba install: in the Session Setup andX Request packet (under the security blob) that the client sends to the samba server, the working one lists one mechtype: NTLMSSP. The non-working one lists three mechtypes: MS KRB5, KRB5, NTLMSSP, in that order. The non-working one has a krb5 ticket further down in the packet. Samba logs show an error: Failed to parse NTLMSSP packet, could not extract NTLMSSP command [2009/03/18 10:39:36, 1] libsmb/ntlmssp.c:ntlmssp_update(327) I don't think it should be able to parse the NTLMSSP packet, since it isn't an NTLMSSP packet. It's a KRB5 ticket. At least, to the best that I can understand I have tried copying the working SMB.CONF file to the non-working host, and that didn't help at all. To me it seems like the client is requesting KRB5 authentication. I'm not good enough with network packets to see if the server requested that type of session, but as far as I can tell it did not. Any help would be greatly appreciated. Thanks, Alainna SMB.CONF--- [global] hosts allow = xxx.xxx.xxx. workgroup = dss security = domain password server = * encrypt passwords = yes wins support = no debug level = 1 guest ok = no inherit permissions = yes username map = /etc/samba/smbusers - -- Alainna C. White Johns Hopkins University Physics Astronomy, 3701 San Martin Drive, Baltimore MD 21218 Voice: 410 516 4536 | Email: alai...@pha.jhu.edu http://skysrv.pha.jhu.edu/~alainna -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Server 2008 and Samba 3.0.25b
Hi folks - Not fifteen minutes after I sent this message, I've solved the problem. I've been fighting with this for a while now (over a year; I've been delaying Vista deployments because of this). I never would've guessed that taking the RPC out of the net join command would fix it. But it did. This is the fix (at least for me): join the domain with, net join -U administrator domain, not, net join RPC -U administrator domain. Thanks and sorry for the spam! Alainna Alainna C. White wrote: Hi Folks - I'm experiencing a very strange problem with Server 2008 machines (for all intents and purposes related to Samba, it's Vista) connecting to a Samba Server. The Samba machine is a RHEL4.6 machine running Samba 3.0.25b. I am joined to the mixed mode AD domain via the command net rpc join -U administrator domain. I am not using winbind or kerberos. Or at least, I am not trying to. The smb.conf file is at the bottom of this email. I've removed things like disallowed users from the file to keep it brief. I have another samba machine with the very same OS and release, and it works fine. When I try to connect to the Samba machine from the 2k8 machine using the UNC path, I get a network path not found message. Oddly, if I use '\\ipaddress' it works just fine. I used Wireshark to look at the packets, and there is one glaring difference between the working samba install and the non-working samba install: in the Session Setup andX Request packet (under the security blob) that the client sends to the samba server, the working one lists one mechtype: NTLMSSP. The non-working one lists three mechtypes: MS KRB5, KRB5, NTLMSSP, in that order. The non-working one has a krb5 ticket further down in the packet. Samba logs show an error: Failed to parse NTLMSSP packet, could not extract NTLMSSP command [2009/03/18 10:39:36, 1] libsmb/ntlmssp.c:ntlmssp_update(327) I don't think it should be able to parse the NTLMSSP packet, since it isn't an NTLMSSP packet. It's a KRB5 ticket. At least, to the best that I can understand I have tried copying the working SMB.CONF file to the non-working host, and that didn't help at all. To me it seems like the client is requesting KRB5 authentication. I'm not good enough with network packets to see if the server requested that type of session, but as far as I can tell it did not. Any help would be greatly appreciated. Thanks, Alainna SMB.CONF--- [global] hosts allow = xxx.xxx.xxx. workgroup = dss security = domain password server = * encrypt passwords = yes wins support = no debug level = 1 guest ok = no inherit permissions = yes username map = /etc/samba/smbusers - -- Alainna C. White Johns Hopkins University Physics Astronomy, 3701 San Martin Drive, Baltimore MD 21218 Voice: 410 516 4536 | Email: alai...@pha.jhu.edu http://skysrv.pha.jhu.edu/~alainna -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Server 2008 and Samba 3.0.25b
On Thu, Mar 19, 2009 at 11:11:18AM -0400, Alainna C. White wrote: I'm experiencing a very strange problem with Server 2008 machines (for all intents and purposes related to Samba, it's Vista) connecting to a Samba Server. The Samba machine is a RHEL4.6 machine running Samba 3.0.25b. I am joined to the mixed mode AD domain via the command net rpc join -U administrator domain. I am not using winbind or kerberos. Or at least, I am not trying to. The smb.conf file is at the bottom of this email. I've removed things like disallowed users from the file to keep it brief. I have another samba machine with the very same OS and release, and it works fine. When I try to connect to the Samba machine from the 2k8 machine using the UNC path, I get a network path not found message. Oddly, if I use '\\ipaddress' it works just fine. Please update to Samba 3.3.2, there have been fixes for 2k8 interoperability. Volker pgpGkiVEvJNwX.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba Password Question.
mpars...@uk.ey.com wrote: Hi David, Its Samba Release 3 on an HP-UX 11.11 machine. We are allowing users to map folders from the unix box as shares on their windows laptops. Mark - I posted this on ITRC too: I assume that you have a Samba PDC (security = user) with a passdb backend of tdbsam or ldapsam. If so, then you set domain policies with pdbedit. I believe that you have to set the user must change password attribute *and* the password age attribute to 0 (for each user) to make it happen at the next logon. Have you already tried this and it did not work? http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/passdb.html#pdbeditthing I think it's: pdbedit -P maximum password age -C value pdbedit -u user --pwd-must-change-time 0 Eric Roseme Hewlett-Packard -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba Password Question.
Hallo, Eric, Du meintest am 19.03.09: Have you already tried this and it did not work? http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/passdb.htm l#pdbeditthing I think it's: pdbedit -P maximum password age -C value pdbedit -u user --pwd-must-change-time 0 Here: Samba 3.2.5, security=user # (no PDC) With value = -1 or 0: pdbedit -Lwv -u user always shows Password must change: never Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba not using nearest ADS server
Hello, we integrated an samba v3.2.8 into a bigger ADS environment which is connected via MPLS world wide. Everything works as expected, but the login via SSH is slow: After entering the login name in ssh we can see via tcpdump network traffic to different ADS controllers: First a connection from Germany to UK: 17:16:43.867219 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:44.092774 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:44.092785 IP 10.49.x.y.37722 10.44.x.y.389: . 17:16:44.093054 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:44.265776 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:44.265987 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:44.647671 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:44.693567 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:44.693840 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:44.922527 IP 10.44.x.y.389 10.49.x.y.37722: . 17:16:44.997865 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:44.998074 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:45.314621 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:45.314831 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:45.577894 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:45.578100 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:45.791494 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:45.791702 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:45.982034 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:45.982240 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:46.189828 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:46.190037 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:46.365426 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:46.365633 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:46.596653 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:46.596900 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:46.802280 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:46.802487 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:47.006571 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:47.006783 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:47.325662 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:47.325868 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:47.577930 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:47.578140 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:47.775371 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:47.775577 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:47.971495 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:47.971704 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:48.186311 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:48.186521 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:48.430837 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:48.431043 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:48.622070 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:48.622274 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:48.816862 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:48.817100 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:49.061838 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:49.062951 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:49.268437 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:49.268634 IP 10.49.x.y.37722 10.44.x.y.389: P 17:16:49.426980 IP 10.44.x.y.389 10.49.x.y.37722: P 17:16:49.466643 IP 10.49.x.y.37722 10.44.x.y.389: . then a connection from Germany to the United States: 17:16:49.547138 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:49.693649 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:49.693662 IP 10.49.x.y.37731 10.3.x.y.389: . 17:16:49.693849 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:49.843729 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:49.843918 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:49.992361 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:49.992553 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.129522 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.129715 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.298217 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.298406 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.447220 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.447408 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.589299 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.589487 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.748952 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.749139 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:50.902596 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:50.902787 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.048477 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.048669 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.16 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.200183 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.343439 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.343626 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.509961 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.510146 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.666507 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.96 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.809460 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.809759 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:51.950416 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:51.950732 IP 10.49.x.y.37731 10.3.x.y.389: P 17:16:52.097813 IP 10.3.x.y.389 10.49.x.y.37731: P 17:16:52.098022 IP 10.49.x.y.37731 10.3.x.y.389:
[Samba] Can join ADS domain, all accounts/auth work fine, but leaving domain fails
Hello all, As the subject says, as far as I can tell everything works on my ads integrated samba server. Domain accounts can be used for ssh, and accessing shares, I just can't leave the domain. Here is a successful join command followed by an unsuccessful leave command at debug level 4. Any ideas? TIA, Mark u...@dordal:~$ sudo net ads join -U administra...@mydomain.com -d 4 [2009/03/19 14:00:07, 3] param/loadparm.c:lp_load(5063) lp_load: refreshing parameters [2009/03/19 14:00:07, 3] param/loadparm.c:init_globals(1448) Initialising global parameters [2009/03/19 14:00:07, 3] param/params.c:pm_process(572) params.c:pm_process() - Processing configuration file /etc/samba/smb.conf [2009/03/19 14:00:07, 3] param/loadparm.c:do_section(3802) Processing section [global] doing parameter workgroup = MYDOMAIN doing parameter realm = MYDOMAIN.COM doing parameter security = ADS doing parameter password server = dal-dc1.mydomain.com, den-dc1.mydomain.com doing parameter client schannel = Yes doing parameter server schannel = Yes doing parameter username map = /etc/samba/smbusers doing parameter obey pam restrictions = Yes doing parameter enable privileges = Yes doing parameter restrict anonymous = 2 doing parameter allow trusted domains = No doing parameter lanman auth = No doing parameter ntlm auth = No doing parameter client NTLMv2 auth = Yes doing parameter log level = 1 doing parameter syslog = 0 doing parameter min protocol = NT1 doing parameter client signing = Yes doing parameter server signing = Yes doing parameter load printers = No doing parameter preferred master = No doing parameter local master = No doing parameter domain master = No doing parameter dns proxy = No doing parameter ldap ssl = no doing parameter host msdfs = No doing parameter idmap domains = MYDOMAIN doing parameter idmap alloc backend = ldap doing parameter template shell = /bin/false doing parameter winbind enum users = Yes doing parameter winbind enum groups = Yes doing parameter winbind use default domain = Yes doing parameter winbind refresh tickets = Yes doing parameter idmap alloc config:range = 10 - 50 doing parameter idmap alloc config:ldap_url = ldap://dal-dc1.mydomain.com ldap://den-dc1.mydomain.com doing parameter idmap alloc config:ldap_user_dn = cn=idmapmgr,cn=users,dc=mydomain,dc=com doing parameter idmap alloc config:ldap_base_dn = ou=idmap,dc=sambaidmap,dc=mydomain,dc=com doing parameter idmap config MYDOMAIN:range = 10 - 50 doing parameter idmap config MYDOMAIN:ldap_url = ldap://dal-dc1.mydomain.com ldap://den-dc1.mydomain.com doing parameter idmap config MYDOMAIN:ldap_user_dn = cn=idmapmgr,cn=users,dc=mydomain,dc=com doing parameter idmap config MYDOMAIN:ldap_base_dn = ou=idmap,dc=sambaidmap,dc=mydomain,dc=com doing parameter idmap config MYDOMAIN:backend = ldap doing parameter idmap config MYDOMAIN:default = yes doing parameter hosts allow = 10.0.0.0/255.255.254.0 10.1.0.0/255.255.254.0 doing parameter map acl inherit = No doing parameter hide special files = Yes doing parameter map archive = No doing parameter map readonly = No doing parameter map system = No doing parameter map hidden = No doing parameter ea support = No doing parameter store dos attributes = No doing parameter wide links = No doing parameter follow symlinks = No doing parameter dos filemode = No doing parameter add share command = /etc/samba/command.pl doing parameter delete share command = /etc/samba/command.pl doing parameter change share command = /etc/samba/command.pl [2009/03/19 14:00:07, 4] param/loadparm.c:lp_load(5094) pm_process() returned Yes [2009/03/19 14:00:07, 2] lib/interface.c:add_interface(81) added interface ip=10.0.1.35 bcast=10.0.1.255 nmask=255.255.254.0 [2009/03/19 14:00:07, 4] libsmb/namequery_dc.c:ads_dc_name(73) ads_dc_name: domain=MYDOMAIN [2009/03/19 14:00:07, 3] libsmb/namequery.c:get_dc_list(1489) get_dc_list: preferred server list: 10.0.1.30, dal-dc1.mydomain.com, den-dc1.mydomain.com [2009/03/19 14:00:07, 4] libsmb/namequery.c:get_dc_list(1599) get_dc_list: returning 2 ip addresses in an ordered list [2009/03/19 14:00:07, 4] libsmb/namequery.c:get_dc_list(1600) get_dc_list: 10.0.1.30:389 10.1.1.30:389 [2009/03/19 14:00:07, 3] libads/ldap.c:ads_connect(394) Connected to LDAP server 10.0.1.30 [2009/03/19 14:00:07, 3] libsmb/namequery.c:get_dc_list(1489) get_dc_list: preferred server list: 10.0.1.30, dal-dc1.mydomain.com, den-dc1.mydomain.com [2009/03/19 14:00:07, 4] libsmb/namequery.c:get_dc_list(1599) get_dc_list: returning 2 ip addresses in an ordered list [2009/03/19 14:00:07, 4] libsmb/namequery.c:get_dc_list(1600) get_dc_list: 10.0.1.30:389 10.1.1.30:389 [2009/03/19 14:00:07, 3] libsmb/namequery.c:get_dc_list(1489) get_dc_list: preferred server list: 10.0.1.30, dal-dc1.mydomain.com, den-dc1.mydomain.com [2009/03/19 14:00:07, 4] libsmb/namequery.c:get_dc_list(1599) get_dc_list: returning 2 ip addresses
[Samba] Updated sources and clean build gives linker error in cldapd.o
Hi all, This is my first week with Samba. I got sources and compiled them fine till yesterday. Today I did a git pull and am getting the following linker errors- Compiling smbd/process_standard.c Partially linking bin/mergedobj/process_model_standard.o Linking bin/samba bin/mergedobj/cldapd.o: In function `cldapd_request_handler': cldap_server.c:(.text+0x79): undefined reference to `tsocket_address_string' cldap_server.c:(.text+0xca): undefined reference to `cldap_error_reply' cldap_server.c:(.text+0x13b): undefined reference to `tsocket_address_string' cldap_server.c:(.text+0x188): undefined reference to `cldap_error_reply' cldap_server.c:(.text+0x1e6): undefined reference to `tsocket_address_string' cldap_server.c:(.text+0x233): undefined reference to `cldap_error_reply' bin/mergedobj/cldapd.o: In function `cldapd_add_socket': cldap_server.c:(.text+0x337): undefined reference to `_tsocket_address_inet_from_strings' cldap_server.c:(.text+0x3f6): undefined reference to `cldap_socket_init' cldap_server.c:(.text+0x448): undefined reference to `tsocket_address_string' cldap_server.c:(.text+0x496): undefined reference to `cldap_set_incoming_handler' bin/mergedobj/cldapd.o: In function `cldapd_netlogon_request': (.text+0x1ccb): undefined reference to `tsocket_address_inet_addr_string' bin/mergedobj/cldapd.o: In function `cldapd_netlogon_request': (.text+0x1d74): undefined reference to `cldap_netlogon_reply' bin/mergedobj/cldapd.o: In function `cldapd_netlogon_request': (.text+0x1df8): undefined reference to `cldap_empty_reply' bin/mergedobj/cldapd.o: In function `cldapd_rootdse_request': (.text+0x23d0): undefined reference to `cldap_reply_send' bin/mergedobj/samba-net.o: In function `libnet_FindSite': (.text+0x6e4d): undefined reference to `cldap_socket_init' bin/mergedobj/samba-net.o: In function `libnet_FindSite': (.text+0x6ea7): undefined reference to `cldap_netlogon' bin/mergedobj/samba-net.o: In function `becomeDC_send_cldap': libnet_become_dc.c:(.text+0x7747): undefined reference to `cldap_socket_init' libnet_become_dc.c:(.text+0x7779): undefined reference to `cldap_netlogon_send' bin/mergedobj/samba-net.o: In function `becomeDC_recv_cldap': libnet_become_dc.c:(.text+0x780e): undefined reference to `cldap_netlogon_recv' bin/mergedobj/samba-net.o: In function `unbecomeDC_send_cldap': libnet_unbecome_dc.c:(.text+0xd8d5): undefined reference to `cldap_socket_init' libnet_unbecome_dc.c:(.text+0xd907): undefined reference to `cldap_netlogon_send' bin/mergedobj/samba-net.o: In function `unbecomeDC_recv_cldap': libnet_unbecome_dc.c:(.text+0xd99c): undefined reference to `cldap_netlogon_recv' collect2: ld returned 1 exit status make: *** [bin/samba] Error 1 r...@harsha-amd64:/home/harsha/mapi/samba-master/source4# I deleted /usr/local/samba, did make clean and tried compiling, but I still see the problem. Can anyone please tell me why this may be happening ? Many thanks, Harsha -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] root ownership on all new files for admin users
Hello, I have samba server on windows domain, in ADS mode but have problem tracking files that belong to admin users, anytime new file created the default owner is root. For non-admin users its normal, newly created files have correct ownership permissions. Its possible for a user to go and take ownership manually from windows machine but its just inconvenient. Is there anyway to change default behavior to create files with correct ownership of original user rather than mapping to root for admin users? Thank you, Vladimir Shved My setup: Ubuntu 8.04 Hardy Samba 3.0.28a ext3 fs w/ ACLs censored smb.conf: [global] workgroup = MYDOMAIN realm = MYDOMAIN.LOCAL server string = File Server security = ADS syslog = 0 log file = /var/log/samba/log.%m log level = 1 ads:10 auth:10 sam:10 rpc:10 max log size = 1000 local master = No dns proxy = No socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 wins server = 192.168.1.2 winbind enum users = no winbind enum groups = no winbind use default domain = yes winbind nested groups = yes passdb backend = tdbsam ldap ssl = on idmap domains = MYDOMAIN idmap config MYDOMAIN:backend = ldap idmap config MYDOMAIN:readonly = yes idmap config MYDOMAIN:default = yes idmap config MYDOMAIN:ldap_base_dn = ou=idmap,dc=mydomain,dc=local idmap config MYDOMAIN:ldap_url = ldaps://ldapmachine idmap config MYDOMAIN:ldap_anon = yes idmap alloc backend = tdb idmap alloc config:range = 3-4 template shell = /bin/bash admin users = @BUILTIN\administrators write list = @BUILTIN\administrators client use spnego = yes domain master = no load printers = no printing = bsd printcap name = /dev/null show add printer wizard = no disable spoolss = yes guest account = nobody map to guest = bad user invalid users = root map to guest = bad password [share] path = /share guest ok = Yes create mask = 0664 directory mode = 0775 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Re: Updated sources and clean build gives linker error in cldapd.o
I'm sorry to first post this message here. I just figured that samba-technical is the relevant list for my question. Sincerely, Harsha -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] root ownership on all new files for admin users
On Thu, Mar 19, 2009 at 03:28:07PM -0600, Vladimir Shved wrote: I have samba server on windows domain, in ADS mode but have problem tracking files that belong to admin users, anytime new file created the default owner is root. For non-admin users its normal, newly created files have correct ownership permissions. Its possible for a user to go and take ownership manually from windows machine but its just inconvenient. Is there anyway to change default behavior to create files with correct ownership of original user rather than mapping to root for admin users? Remove the @BUILTIN\administrators line from your smb.conf. Volker pgpsDox9HekEV.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] root ownership on all new files for admin users
Hi, I'm dealing with the same issue so I thought I'd share a few ideas I've found so far. write users= should just be letting those users write as themselves. Its the admin users= line that is intervening and mapping them to root. If its just the need for admin rights, I know that there is a privileges system built into samba. Most of the things you would want for an admin user to be able to do can actually be enabled for that user instead of mapping them to root. I've read that while no account has any privileges by default, the Domain Admins group is automatically given the right to hand out new privileges. Just search for samba privileges online, I think this is the preferred way to accomplish what you want, removing the need for the admin users parameter. Another thing you may consider is just make a new user in AD, and then change the admin users line so that it only lists that account. I don't even imagine that account would have to be an admin as far as Windows is concerned, but it could be made one if the situation arises to warrant it. Then your write list can write as themselves, and the new user can be mapped to root and not used to edit user's files. They could share the password if more than one person needs access, which is no worse than having them all mapped to root anyway (possibly better). I don't quite have it figured yet so double check me if you go with one of those, but I HTH. -Mark Vladimir Shved wrote: Hello, I have samba server on windows domain, in ADS mode but have problem tracking files that belong to admin users, anytime new file created the default owner is root. For non-admin users its normal, newly created files have correct ownership permissions. Its possible for a user to go and take ownership manually from windows machine but its just inconvenient. Is there anyway to change default behavior to create files with correct ownership of original user rather than mapping to root for admin users? Thank you, Vladimir Shved My setup: Ubuntu 8.04 Hardy Samba 3.0.28a ext3 fs w/ ACLs censored smb.conf: [global] workgroup = MYDOMAIN realm = MYDOMAIN.LOCAL server string = File Server security = ADS syslog = 0 log file = /var/log/samba/log.%m log level = 1 ads:10 auth:10 sam:10 rpc:10 max log size = 1000 local master = No dns proxy = No socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 wins server = 192.168.1.2 winbind enum users = no winbind enum groups = no winbind use default domain = yes winbind nested groups = yes passdb backend = tdbsam ldap ssl = on idmap domains = MYDOMAIN idmap config MYDOMAIN:backend = ldap idmap config MYDOMAIN:readonly = yes idmap config MYDOMAIN:default = yes idmap config MYDOMAIN:ldap_base_dn = ou=idmap,dc=mydomain,dc=local idmap config MYDOMAIN:ldap_url = ldaps://ldapmachine idmap config MYDOMAIN:ldap_anon = yes idmap alloc backend = tdb idmap alloc config:range = 3-4 template shell = /bin/bash admin users = @BUILTIN\administrators write list = @BUILTIN\administrators client use spnego = yes domain master = no load printers = no printing = bsd printcap name = /dev/null show add printer wizard = no disable spoolss = yes guest account = nobody map to guest = bad user invalid users = root map to guest = bad password [share] path = /share guest ok = Yes create mask = 0664 directory mode = 0775 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] smbd cannot be killed
Hello folks, I'm new to this list. Before posting this I tried to search the archives, but couldn't find anything relevant - so excuse me if it's been discussed already. I run a server with Archlinux and Samba 3.2.5 as PDC for ~30 Windows workstations. I have a share containing a CRM-like system with whole bunch of DB files and Windows executables (GoldMine). People run the executables remotely from that share, and regularly it works properly. But once in a week it stops working - the DB program cannot access some files in the share, and also I cannot restart the Samba - several instances of smbd continue running and even kill -9 smbd doesn't help. After I restart the system in such cases everything starts working properly. I've checked the number of open files - it doesn't seem to be too large, and only 5-6 people can run that DB interface simultaneously. Could somebody point the direction I should go to catch the actual problem? Thanks, Sergey -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] smbldap and samba as a PDC
Hi people, I have a problem with samba, openldap and the creation of machine accounts. I don't know if here is a good place to ask but I don't receive help in other places.. I read many guides, howto's, etc. but I can't get around with the solution... I have seen an older message to another list (mail.gna.org) asking for the same problem that I have, it was: - [Smbldap-tools-tech] Problem creating machine accountshttps://mail.gna.org/public/smbldap-tools-tech/2008-09/msg1.html, *Jonathan Warrington (September 24, 2008 - 19:24)* I didn't know if Jonathan received a response, but I have two problems, one is exactly the same that's described there, and the other is explained as follows: I have samba + ldap PDC with smbldap-tools, and when I try to join the domain I get these error: r...@patata:/# net rpc join -U administrador Password: Creation of workstation account failed Unable to join domain TESTING. If I take a look to the logs...: 2009/03/19 20:18:42, 0] passdb/pdb_interface.c:pdb_ default_create_user(329) _samr_create_user: Running the command `/usr/sbin/smbldap-useradd -w patata$' gave 127 Then manually, smbldap-useradd -w patata$: Error: modifications require authentication at /usr/share/perl5/ smbldap_tools.pm line 1083. And if I create the machine account from phpldapadmin, it works perfectly. What can I do? I tried: net -U administrador% rpc rights grant 'TESTING\smbadmins' SeMachineAccountPrivilege, also tried to modify smbldap.conf and smbldap_bind.conf, and I got nothing... I followed many howto's and surelly there is something that i'm not understanding, but I don't know what. Any suggestion would surely be helpful. getent passwd and getent group works well. If I try to add a machine account from phpldapadmin, all goes right. This is my smbldap config: http://pastebin.ca/1365687 And this my smb.conf: http://pastebin.ca/1365698 Thank you all. LiPi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] smbd cannot be killed
On Thu, March 19, 2009 3:58 pm, Sergey Manucharian wrote: But once in a week it stops working - the DB program cannot access some files in the share, and also I cannot restart the Samba - several instances of smbd continue running and even kill -9 smbd doesn't help. After I restart the system in such cases everything starts working properly. Could somebody point the direction I should go to catch the actual problem? Samba logs? What does 'ps auxww | grep mbd' say? -- o__ ,/'_ o__ (_)\(_),/'_o__ Yan Seiner (_)\(_) ,/'_ o__ Personal Trainer (_)\(_),/'_o__ Professional Engineer (_)\(_) ,/'_ Who says engineers have to be pencil necked geeks? (_)\(_) You are an adult when you realize that everyone's an idiot sometimes. You are wise when you include yourself. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] smbd cannot be killed
On Thu, 19 Mar 2009 16:47:36 -0700 (PDT) Yan Seiner y...@seiner.com wrote: On Thu, March 19, 2009 3:58 pm, Sergey Manucharian wrote: But once in a week it stops working - the DB program cannot access some files in the share, and also I cannot restart the Samba - several instances of smbd continue running and even kill -9 smbd doesn't help. After I restart the system in such cases everything starts working properly. Could somebody point the direction I should go to catch the actual problem? Samba logs? What does 'ps auxww | grep mbd' say? Thanks for reply, Yan. Well, I need to catch such an event one more time... Both log.smbd and log.smbd.old already do not include the time period of the failure, log.nmbd contains nothing suspicious (during that time), just a lot of stuff like: process_name_query_request: ... process_host_announce: ... process_logon_packet: ... write_browse_list: ... Process list at the moment shows 1 nmbd and 12 smbd processes, all sleeping - again, I need to capture it during the failure. The bad thing is that when such a failure happens, I do not have much time, since the users cannot wait - I restart the server ASAP :) Sergey. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-562-g2d1fcdc
The branch, master has been updated via 2d1fcdc8072d53dfdb0f0a30911cdeac4aa06f35 (commit) from c5394cd7cfd5a234d9ece5bcdf0166652f69234e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2d1fcdc8072d53dfdb0f0a30911cdeac4aa06f35 Author: Björn Jacke b...@sernet.de Date: Wed Mar 18 19:05:52 2009 +0100 fix some typos Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/idmap_hash.8.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml index fbafd71..dfaece2 100644 --- a/docs-xml/manpages-3/idmap_hash.8.xml +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -18,11 +18,11 @@ refsynopsisdiv titleDESCRIPTION/title - paraThe idmap_hash plugin implements a hashing algorithm used - map SIDs for domain users and groups to a 31-bit uid and gid. + paraThe idmap_hash plugin implements a hashing algorithm used to map + SIDs for domain users and groups to 31-bit uids and gids, respectively. This plugin also implements the nss_info API and can be used to support a local name mapping files if enabled via the - quot;winbind normlaize namesquot; and quot;winbind nss infoquot; + quot;winbind normalize namesquot; and quot;winbind nss infoquot; parameters in smb.conf. /para /refsynopsisdiv -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-531-g4ce4391
The branch, v3-4-test has been updated via 4ce43918e6e942c4e50d30283e5a542f5f8465ad (commit) from 69093de0a3ae958c214542bb4f374ed90ff1c82d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 4ce43918e6e942c4e50d30283e5a542f5f8465ad Author: Björn Jacke b...@sernet.de Date: Wed Mar 18 19:05:52 2009 +0100 fix some typos Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/idmap_hash.8.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml index fbafd71..dfaece2 100644 --- a/docs-xml/manpages-3/idmap_hash.8.xml +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -18,11 +18,11 @@ refsynopsisdiv titleDESCRIPTION/title - paraThe idmap_hash plugin implements a hashing algorithm used - map SIDs for domain users and groups to a 31-bit uid and gid. + paraThe idmap_hash plugin implements a hashing algorithm used to map + SIDs for domain users and groups to 31-bit uids and gids, respectively. This plugin also implements the nss_info API and can be used to support a local name mapping files if enabled via the - quot;winbind normlaize namesquot; and quot;winbind nss infoquot; + quot;winbind normalize namesquot; and quot;winbind nss infoquot; parameters in smb.conf. /para /refsynopsisdiv -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5141-gdb367c3
The branch, v3-3-test has been updated via db367c32756fcdf669a2ea7dad51d4daf40770e0 (commit) via 0045eb93bfb8285bcf8165b9cb2c39ade59a0782 (commit) via e574048770d8e40490f949b6e0673f1f44b6e644 (commit) via 5ad50bd6c0f5e030105b225f15a4e8e1d5c18999 (commit) via eced96cf26b08b1fd606381eeced5abec9fac3c4 (commit) via 4c0a996876115e2877c3903b7b9953b527175a16 (commit) via 5446e47968f1c0ff2f6390e00b5483b6163be78f (commit) via 22c71fc6f054ffbe73346a8c20cc48b141312d95 (commit) via ce1051dd5498fb864e959c66b15a16d6d0cadd31 (commit) via da272a52894314bd12f43fbb52a24c8b9cc024e8 (commit) via 0b99c03824886432a86dcdc161a219a5dbad7c58 (commit) via 049d5745cbf2bba954e9a06cc0f255506805ae0f (commit) via 453c7e1503f814034765ebc6aac06dd11f89b381 (commit) via d316cab3cb5037909121494d57cc2173e4c66a23 (commit) via 76a460aecab6d5a03af9b8b5d97cba15d364cfde (commit) via 7679a4b9179dd32599d3799fa02f42e1acfce3ef (commit) via 1eaff4f96768912b31795c1c8b6a4741e2e746e1 (commit) via ed8e84dbda344b19f1c6037a630e60885f722f13 (commit) via 5fc572e9e9ddc1c87ddd4622428e41d3503ccc4b (commit) via a6c9cd899a52cf093f557ddac9a7fb42cbae35d0 (commit) via 3e8393af5fc40116305af6f155de9bad203e0a8d (commit) via bcbe20b30017f22f1f01d9620f149fdeefe3a9e0 (commit) via 3a0f670d425a37e435fecf575730834017e30940 (commit) via 3f2255ad1c67bcea2d812eedbb4def8c35ff110a (commit) via f1c0b65da5cf90740c2013e20991a87f5a16fc2c (commit) via 811b3fefab29c109c6c134339a438c7e4ffb13fe (commit) via d119cd129c6acd2f0eb16fcf3281744d717cd291 (commit) via b26f384649b4285748bf0fb78d826651882208e7 (commit) via 391027d79eeb897c539d35877f5b27ea90efb40b (commit) via 078d121b4d4d74237ea11c39754fb2ba0dc496a9 (commit) via c861f55a35e315f3561bc9b5a4d4d2e1b782fa31 (commit) via 128f91d4c26dd4635a88c4bc8939061300cf81b7 (commit) via 6a9c73e5c58837c1a6e0abc03e90e616520cdd91 (commit) via 9ca48a86fb6cf5fa30b622162877859b0c335f7e (commit) via abc457fe4c167bfcd7c8a4a654e13884b8e1ef90 (commit) via 026b72903c852e46012ac60d9d42b14c6860a159 (commit) via e95bcaefc98f4ddc461d60d2f6f812ef24c2f234 (commit) via 8dd46903944c48e171837729cbe937f54d9554b7 (commit) via 8353d9b764ec90948fb8a5cb39689ea39acc7f9f (commit) via 0509eee47ac2da1042bd1bb0d98695abc8ee44a3 (commit) via 4ddeed513ce5e2bb839570212d046145da70768b (commit) via caa654d31fc65e3a08327e430ba5332776a21f11 (commit) via 32524d865158080421867b36f9b64bdc98ff07c9 (commit) via e5936d910cfc3590a3b015e627a5fa308861eaf4 (commit) via 68d4e25aad23b670e4ff735377de59ba396940cd (commit) via a470af9a18b328548f241dca4f744d25c7cdc13e (commit) via 11ed4d41906084a604797e761ffd27caf5c67ac3 (commit) via f8fa246bbae0db96e16e8f3e327577920c6ecec5 (commit) via c4a1fc734b70efa932df4d4f8d9c66ea4f83ad0b (commit) via 36f2aa636d1eb5394469c09f76fe2fb676dfcac7 (commit) via 6facbbb4020369c18b4312115fab9b8d6eceaf80 (commit) via d5750eca159e0bf1095b102545838d771f26a7f7 (commit) via 5887fa35156df68416b4da4a45ef0576d8b203c1 (commit) via 8589fa2cfe8fb549b013d2f15a598e43e28b64d7 (commit) via dc0583613dfd8ce8f9209a8fb56e6c41a14efd0a (commit) via 9dfc6c9de92e58173e73d67a6dd56b4b4336909b (commit) via a077a710b9d402ed7ac86ab98dc2a98776b8f9bc (commit) via 9685cbd3ab0304c0439f668d7b4963ab264729b2 (commit) via defb4430114091474dfef0114ebb176bfb5026ea (commit) via 13521c9c1e0f93ea956c1d0b22f1979e7124c72e (commit) via 4a6c0a234ddfa545f137f8842a7e92224e72bcad (commit) via 8dd78e82ef694f35604f5328378f2422dcd561f5 (commit) via e035a2d419cab20e8cd8efd532b8388d4cc364a6 (commit) via 85a90a26baaf916862b45ab2114edf9bf6f2e46d (commit) via 7deb120bf22dc5857af9051eeba7b8dabe4016e5 (commit) via 9cb280f7d721c71c5cecc2fd56cc75ce4b4a7e5b (commit) via 5d2255e13cf2e468887a61fb9a7e99d2ba665333 (commit) from bf1474aee37976f0d7e3cece8f39b0046ee54209 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit db367c32756fcdf669a2ea7dad51d4daf40770e0 Author: Michael Adam ob...@samba.org Date: Thu Feb 26 02:59:07 2009 +0100 s3:registry: tighten the subkey loop in reg_deletekey_recursive() and loop from the end to the beginning so that we don't need to rehash the subkeys... This gets net conf drop with 2000 shares down to 14 seconds on my box. Michael Signed-off-by: Michael Adam ob...@samba.org commit 0045eb93bfb8285bcf8165b9cb2c39ade59a0782 Author: Michael Adam ob...@samba.org Date: Thu Feb 26 02:57:59 2009 +0100 s3:registry: use
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5144-gddcf947
The branch, v3-3-test has been updated via ddcf94787f59cf682c51010b87d3624bbdd6b4a3 (commit) via 9baa0c3b119f41c7d65bc13f4f34c6e242ea1abc (commit) from e1a79d063de536969732b63ed9be24c4fd2aa505 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit ddcf94787f59cf682c51010b87d3624bbdd6b4a3 Author: Timur ti...@freebsd.org Date: Tue Mar 17 22:46:53 2009 +0100 build: fix detection of netinet/ip.h on FreeBSD Signed-off-by: Michael Adam ob...@samba.org (cherry picked from commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041) commit 9baa0c3b119f41c7d65bc13f4f34c6e242ea1abc Author: Timur ti...@freebsd.org Date: Tue Mar 17 22:45:28 2009 +0100 build: format the header check for netinet/ip.h more nicely Signed-off-by: Michael Adam ob...@samba.org (cherry picked from commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc) --- Summary of changes: source/lib/replace/libreplace_network.m4 | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4 index 9b921a0..a520c73 100644 --- a/source/lib/replace/libreplace_network.m4 +++ b/source/lib/replace/libreplace_network.m4 @@ -8,12 +8,15 @@ LIBREPLACE_NETWORK_LIBS= AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h) AC_CHECK_HEADERS(netinet/in_systm.h) -AC_CHECK_HEADERS([netinet/ip.h], [], [], [#ifdef HAVE_NETINET_IN_H -#include netinet/in.h -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -#include netinet/in_systm.h -#endif]) +AC_CHECK_HEADERS([netinet/ip.h], [], [],[ + #include sys/types.h + #ifdef HAVE_NETINET_IN_H + #include netinet/in.h + #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + #include netinet/in_systm.h + #endif +]) AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h) AC_CHECK_HEADERS(sys/sockio.h sys/un.h) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5142-ge1a79d0
The branch, v3-3-test has been updated via e1a79d063de536969732b63ed9be24c4fd2aa505 (commit) from db367c32756fcdf669a2ea7dad51d4daf40770e0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit e1a79d063de536969732b63ed9be24c4fd2aa505 Author: Steve Langasek vor...@debian.org Date: Tue Mar 17 22:08:28 2009 +0100 s3: Fix bugs in the detection of the GNU ld version (Bug #6147) This bug results in a failure to use linker scripts to limit the set of symbols exported by our shared libraries. Signed-off-by: Michael Adam ob...@samba.org (cherry picked from commit c6b570ce30b5cc3631c0ed780826d5450f681800) --- Summary of changes: source/configure.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.in b/source/configure.in index fee3ac1..6d8a387 100644 --- a/source/configure.in +++ b/source/configure.in @@ -250,7 +250,7 @@ if test $ac_cv_prog_gnu_ld = yes; then else AC_MSG_CHECKING(GNU ld release version) changequote(,)dnl - ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'` + ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'` ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1` ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2` changequote([,])dnl @@ -262,7 +262,7 @@ if test $ac_cv_prog_gnu_ld = yes; then if test $ac_cv_gnu_ld_vernr_major -lt 2 || test $ac_cv_gnu_ld_vernr_minor -lt 14; then ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes fi - if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_ld_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then + if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_ld_vernr_major = 2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then ac_cv_gnu_ld_version_script=yes fi fi -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-557-gd380c49
Hi Tridge, - Log - commit d380c49791d1010d759369cab12d93b6fbd48dc7 Author: Andrew Tridgell tri...@samba.org Date: Thu Mar 19 11:23:49 2009 +1100 use the tevent nesting code to avoid the uid problem in the VFS backend The vfs_unixuid module changes the uid of the process when executing operations on behalf of the user. Within the VFS backend we may rely on semi-async calls, such as winbind calls, which will call the event loop again. To cope with this we need to ensure that while inside those calls we revert the uid to root, then revert back to the connected user when we have finished with the semi-async calls. commit 13b6663e23a424473d14324ac229a21e1e90580a Author: Andrew Tridgell tri...@samba.org Date: Thu Mar 19 11:21:36 2009 +1100 fixed a logic bug in the tevent nesting code The event nesting code never triggered as nesting.level was never greater than 1. The main event loop needs to increase the nesting level by 1. That was desired, why do you want to be called if there's no nesting? you do if (unixuid_nesting_level == 0) return; anyway. If we change it to call the hook at level 0, we should change that in tevent_loop_once() and not in tevent_loop_wait(). I also added a paranoia check to the nesting setup call. The API as currently written cannot support multiple nesting hooks, so we need to abort if multiple hooks are tried. I think we should have global in vfs_unixid.c which remembers that we already set the hook and not reset it on each tree connect. metze signature.asc Description: OpenPGP digital signature
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-565-g88dd6af
The branch, master has been updated
via 88dd6af605dc5754b7e146a068272d37651da710 (commit)
via 880fbc4e8cd67de73c4bcda94489eb1e1422a04b (commit)
via 0dfdb7b911ed4fe013fc4a22a8c3a28620277a67 (commit)
from 2d1fcdc8072d53dfdb0f0a30911cdeac4aa06f35 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 88dd6af605dc5754b7e146a068272d37651da710
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 08:46:38 2009 +0100
s3:libsmb: always create bytes array in cli_trans code
Otherwise we return NO_MEMORY without a reason for fragmented trans
requests, as talloc_append_blob() returns buf if we append a 0 length
blob. When we pass buf = NULL we'll get back NULL and then assume
NO_MEMORY...
metze
commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 07:56:51 2009 +0100
s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
Before we send the secondary requests we need to remove the
old mid=seqnum mapping and reset cli-mid and make the new
mid=seqnum mapping persistent.
The bug we had in cli_send_trans was this:
The first cli_send_smb() incremented cli-mid
and the secondary requests used the incremented mid,
but as cli-outbuf still had the correct mid,
we send the correct mid to the server. The real problem
was that the cli_send_smb() function stored the seqnum
under the wrong mid.
cli_send_nttrans() was totally broken and now follows the
same logic as cli_send_trans().
The good thing is that in practice the problem is unlikely to happen,
because max_xmit is large enough to avoid secondary requests.
metze
commit 0dfdb7b911ed4fe013fc4a22a8c3a28620277a67
Author: Stefan Metzmacher me...@samba.org
Date: Thu Mar 19 09:06:38 2009 +0100
s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets
This ways the pcap support in socket wrapper sees the received data.
metze
---
Summary of changes:
source3/lib/util_sock.c |4 +-
source3/libsmb/clitrans.c | 49 +++-
2 files changed, 23 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index de5b232..a0dbca1 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -519,7 +519,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
}
while (nread mincnt) {
- readret = sys_read(fd, buf + nread, maxcnt - nread);
+ readret = sys_recv(fd, buf + nread, maxcnt - nread, 0);
if (readret == 0) {
DEBUG(5,(read_socket_with_timeout:
@@ -588,7 +588,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
return NT_STATUS_IO_TIMEOUT;
}
- readret = sys_read(fd, buf+nread, maxcnt-nread);
+ readret = sys_recv(fd, buf+nread, maxcnt-nread, 0);
if (readret == 0) {
/* we got EOF on the file descriptor */
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 69e2be3..0266c03 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -112,9 +112,6 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
- client_set_trans_sign_state_off(cli, mid);
- client_set_trans_sign_state_on(cli, mid);
-
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,20 +135,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
- client_set_trans_sign_state_off(cli, mid);
return False;
}
-
- /* Ensure we use the same mid for the secondaries. */
-
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-534-g5bbf96d
The branch, v3-4-test has been updated
via 5bbf96dd63227a19fe1f95ff8d8f2b3c75a5a497 (commit)
via 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3 (commit)
via 6ec3d902e16edd6d911b6883f565ddf1938b47bf (commit)
from 4ce43918e6e942c4e50d30283e5a542f5f8465ad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 5bbf96dd63227a19fe1f95ff8d8f2b3c75a5a497
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 08:46:38 2009 +0100
s3:libsmb: always create bytes array in cli_trans code
Otherwise we return NO_MEMORY without a reason for fragmented trans
requests, as talloc_append_blob() returns buf if we append a 0 length
blob. When we pass buf = NULL we'll get back NULL and then assume
NO_MEMORY...
metze
(cherry picked from commit 88dd6af605dc5754b7e146a068272d37651da710)
commit 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 07:56:51 2009 +0100
s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
Before we send the secondary requests we need to remove the
old mid=seqnum mapping and reset cli-mid and make the new
mid=seqnum mapping persistent.
The bug we had in cli_send_trans was this:
The first cli_send_smb() incremented cli-mid
and the secondary requests used the incremented mid,
but as cli-outbuf still had the correct mid,
we send the correct mid to the server. The real problem
was that the cli_send_smb() function stored the seqnum
under the wrong mid.
cli_send_nttrans() was totally broken and now follows the
same logic as cli_send_trans().
The good thing is that in practice the problem is unlikely to happen,
because max_xmit is large enough to avoid secondary requests.
metze
(cherry picked from commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b)
commit 6ec3d902e16edd6d911b6883f565ddf1938b47bf
Author: Stefan Metzmacher me...@samba.org
Date: Thu Mar 19 09:06:38 2009 +0100
s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets
This ways the pcap support in socket wrapper sees the received data.
metze
(cherry picked from commit 0dfdb7b911ed4fe013fc4a22a8c3a28620277a67)
---
Summary of changes:
source3/lib/util_sock.c |4 +-
source3/libsmb/clitrans.c | 49 +++-
2 files changed, 23 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index de5b232..a0dbca1 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -519,7 +519,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
}
while (nread mincnt) {
- readret = sys_read(fd, buf + nread, maxcnt - nread);
+ readret = sys_recv(fd, buf + nread, maxcnt - nread, 0);
if (readret == 0) {
DEBUG(5,(read_socket_with_timeout:
@@ -588,7 +588,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
return NT_STATUS_IO_TIMEOUT;
}
- readret = sys_read(fd, buf+nread, maxcnt-nread);
+ readret = sys_recv(fd, buf+nread, maxcnt-nread, 0);
if (readret == 0) {
/* we got EOF on the file descriptor */
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 69e2be3..0266c03 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -112,9 +112,6 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
- client_set_trans_sign_state_off(cli, mid);
- client_set_trans_sign_state_on(cli, mid);
-
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,20 +135,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-566-g36e7045
The branch, master has been updated
via 36e7045340bbc7d6567008bdd87c4cdf717835bd (commit)
from 88dd6af605dc5754b7e146a068272d37651da710 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 36e7045340bbc7d6567008bdd87c4cdf717835bd
Author: Stefan Metzmacher me...@samba.org
Date: Thu Mar 19 14:31:43 2009 +0100
tevent: fix the nesting logic
Only tevent_loop_once and tevent_loop_until() should care
about the nesting level.
This fixes the samba3 printing code where we use tevent_loop_wait()
and don't allow nested events.
We still call the nesting hook for all levels, we need to decide
if we really want this...
metze
---
Summary of changes:
lib/tevent/tevent.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 56fd6ae..0c02e46 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -468,6 +468,8 @@ int _tevent_loop_once(struct tevent_context *ev, const char
*location)
errno = ELOOP;
return -1;
}
+ }
+ if (ev-nesting.level 0) {
if (ev-nesting.hook_fn) {
int ret2;
ret2 = ev-nesting.hook_fn(ev,
@@ -485,7 +487,7 @@ int _tevent_loop_once(struct tevent_context *ev, const char
*location)
ret = ev-ops-loop_once(ev, location);
- if (ev-nesting.level 1) {
+ if (ev-nesting.level 0) {
if (ev-nesting.hook_fn) {
int ret2;
ret2 = ev-nesting.hook_fn(ev,
@@ -525,6 +527,8 @@ int _tevent_loop_until(struct tevent_context *ev,
errno = ELOOP;
return -1;
}
+ }
+ if (ev-nesting.level 0) {
if (ev-nesting.hook_fn) {
int ret2;
ret2 = ev-nesting.hook_fn(ev,
@@ -547,7 +551,7 @@ int _tevent_loop_until(struct tevent_context *ev,
}
}
- if (ev-nesting.level 1) {
+ if (ev-nesting.level 0) {
if (ev-nesting.hook_fn) {
int ret2;
ret2 = ev-nesting.hook_fn(ev,
@@ -601,9 +605,5 @@ int tevent_common_loop_wait(struct tevent_context *ev,
*/
int _tevent_loop_wait(struct tevent_context *ev, const char *location)
{
- int ret;
- ev-nesting.level++;
- ret = ev-ops-loop_wait(ev, location);
- ev-nesting.level--;
- return ret;
+ return ev-ops-loop_wait(ev, location);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-567-g011ad72
The branch, master has been updated
via 011ad7245d53a716c4c766f5ef8d317bb3a53d0f (commit)
from 36e7045340bbc7d6567008bdd87c4cdf717835bd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f
Author: Björn Jacke b...@sernet.de
Date: Mon Mar 16 01:51:09 2009 +0100
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/libads/krb5_errs.c |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/krb5_errs.c b/source3/libads/krb5_errs.c
index 53023cc..0e03ebb 100644
--- a/source3/libads/krb5_errs.c
+++ b/source3/libads/krb5_errs.c
@@ -30,12 +30,10 @@ static const struct {
{KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED},
{KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
{KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
- {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
{KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
+#else /* old Heimdal releases have it with different name only in an enum: */
+ {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
#endif
{25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7
krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */
{KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-535-g3b74ba9
The branch, v3-4-test has been updated
via 3b74ba990e5b96e17ef76845551ab03fdddc59f8 (commit)
from 5bbf96dd63227a19fe1f95ff8d8f2b3c75a5a497 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 3b74ba990e5b96e17ef76845551ab03fdddc59f8
Author: Björn Jacke b...@sernet.de
Date: Mon Mar 16 01:51:09 2009 +0100
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
---
Summary of changes:
source3/libads/krb5_errs.c |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/krb5_errs.c b/source3/libads/krb5_errs.c
index 53023cc..0e03ebb 100644
--- a/source3/libads/krb5_errs.c
+++ b/source3/libads/krb5_errs.c
@@ -30,12 +30,10 @@ static const struct {
{KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED},
{KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
{KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
- {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
{KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
+#else /* old Heimdal releases have it with different name only in an enum: */
+ {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
#endif
{25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7
krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */
{KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5146-gfecb980
The branch, v3-3-test has been updated
via fecb980bc90ba4be1fa95b4a6e2aa6967d036656 (commit)
via 69a8eeb16af7cccdaa524dd85c7e2b648c0547a3 (commit)
from ddcf94787f59cf682c51010b87d3624bbdd6b4a3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit fecb980bc90ba4be1fa95b4a6e2aa6967d036656
Author: Björn Jacke b...@sernet.de
Date: Mon Mar 16 01:51:09 2009 +0100
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
commit 69a8eeb16af7cccdaa524dd85c7e2b648c0547a3
Author: Günther Deschner g...@samba.org
Date: Mon Feb 23 11:43:32 2009 +0100
s3-spoolss: fix notify_printer_status_byname.
This took me almost a week to find, so here a little longer explanation:
When a windows client registers printer *status* change notifies using
spoolss_RemoteFindFirstChangeNotify, it registers them to a print server
handle,
not a printer handle. We were then correctly monitoring the printer status
changes but were sending out the spoolss_RouterReplyPrinterEx via the
back-channel
connection with job_id set to 0 (which we only may do for monitored printer
change status notifies on printer handlers, not print server handles).
Windows
was then showing a new empty dummy printer icon in the explorer as it cannot
route the notify event to the approriate local handle. It also discarded the
content of the notify event message of course. With this, printer change
notify for
pausing, resuming and purging printers nicely works again here.
Jerry, Tim and all other printing gurus, please check.
Guenther
---
Summary of changes:
source/libads/krb5_errs.c |8 +++-
source/printing/notify.c |4 +++-
2 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/krb5_errs.c b/source/libads/krb5_errs.c
index 53023cc..0e03ebb 100644
--- a/source/libads/krb5_errs.c
+++ b/source/libads/krb5_errs.c
@@ -30,12 +30,10 @@ static const struct {
{KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED},
{KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
{KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
- {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
{KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
+#else /* old Heimdal releases have it with different name only in an enum: */
+ {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
#endif
{25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7
krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */
{KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},
diff --git a/source/printing/notify.c b/source/printing/notify.c
index 860a400..e54b308 100644
--- a/source/printing/notify.c
+++ b/source/printing/notify.c
@@ -394,8 +394,10 @@ void notify_printer_status_byname(const char *sharename,
uint32 status)
{
/* Printer status stored in value1 */
+ int snum = print_queue_snum(sharename);
+
send_notify_field_values(sharename, PRINTER_NOTIFY_TYPE,
-PRINTER_NOTIFY_STATUS, 0,
+PRINTER_NOTIFY_STATUS, snum,
status, 0, 0);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3511-g5eaa254
The branch, v3-2-test has been updated
via 5eaa2541f19277bc00c47b944739c6732f90809b (commit)
from 0c11c2deee7ab9d281df6df91b793b7f1c1764a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 5eaa2541f19277bc00c47b944739c6732f90809b
Author: Björn Jacke b...@sernet.de
Date: Mon Mar 16 01:51:09 2009 +0100
fix build on old Heimdal based systems
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
---
Summary of changes:
source/libads/krb5_errs.c |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/krb5_errs.c b/source/libads/krb5_errs.c
index 53023cc..0e03ebb 100644
--- a/source/libads/krb5_errs.c
+++ b/source/libads/krb5_errs.c
@@ -30,12 +30,10 @@ static const struct {
{KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED},
{KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
{KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
- {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
{KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
+#else /* old Heimdal releases have it with different name only in an enum: */
+ {KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
#endif
{25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7
krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */
{KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5147-gd01cca5
The branch, v3-3-test has been updated
via d01cca5e3ddb925696d49a1ea728013ec1032372 (commit)
from fecb980bc90ba4be1fa95b4a6e2aa6967d036656 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit d01cca5e3ddb925696d49a1ea728013ec1032372
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 07:56:51 2009 +0100
s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
Before we send the secondary requests we need to remove the
old mid=seqnum mapping and reset cli-mid and make the new
mid=seqnum mapping persistent.
The bug we had in cli_send_trans was this:
The first cli_send_smb() incremented cli-mid
and the secondary requests used the incremented mid,
but as cli-outbuf still had the correct mid,
we send the correct mid to the server. The real problem
was that the cli_send_smb() function stored the seqnum
under the wrong mid.
cli_send_nttrans() was totally broken and now follows the
same logic as cli_send_trans().
The good thing is that in practice the problem is unlikely to happen,
because max_xmit is large enough to avoid secondary requests.
metze
(cherry picked from commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b)
(cherry picked from commit 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3)
---
Summary of changes:
source/libsmb/clitrans.c | 30 +++---
1 files changed, 7 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index 4bb70f1..b42cde9 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -112,9 +112,6 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
- client_set_trans_sign_state_off(cli, mid);
- client_set_trans_sign_state_on(cli, mid);
-
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,20 +135,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
- client_set_trans_sign_state_off(cli, mid);
return False;
}
-
- /* Ensure we use the same mid for the secondaries. */
- cli-mid = mid;
+ client_set_trans_sign_state_on(cli, mid);
tot_data += this_ldata;
tot_param += this_lparam;
@@ -461,21 +452,14 @@ bool cli_send_nt_trans(struct cli_state *cli,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
- client_set_trans_sign_state_off(cli, mid);
return False;
}
-
- /* Ensure we use the same mid for the secondaries. */
- cli-mid = mid;
+ client_set_trans_sign_state_on(cli, mid);
tot_data += this_ldata;
tot_param += this_lparam;
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-203-g06c9926
The branch, v3-2-ctdb has been updated via 06c9926c50941bbbc0fd0b96fdadded3cbed0769 (commit) via 7d0fcda9a6fee7fbd7871285ca3d2a04687fa9a9 (commit) from 352fca67a831e061ed3c126d7513611aa4c1fcf3 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit 06c9926c50941bbbc0fd0b96fdadded3cbed0769 Author: Volker Lendecke v...@sernet.de Date: Sun Nov 23 08:01:33 2008 +0100 Add a vfs_preopen module to hide fs latencies Signed-off-by: Michael Adam ob...@samba.org commit 7d0fcda9a6fee7fbd7871285ca3d2a04687fa9a9 Author: Andrew Tridgell tri...@samba.org Date: Tue Mar 10 16:45:45 2009 +1100 fixed a bug in message handling for code the change notify code The change notify code registered a separate message handler for each tree connect. This registration uses the global messaging context. The messaging code would consider a 2nd registration for the same messaging type as being an 'update' of the handler, rather than a new handler. It also would only call the first handler in the linked list for a given message type when dispatching messages. This patch changes the messaging code to allow for multiple registrations of the same message type, and allow for multiple calls to different messaging handler for one incoming message. This fixes the problem with the test_notify_tcon() test that I recently committed to the S4 smbtorture Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/vfs_preopen.8.xml | 115 + source/Makefile.in|5 + source/configure.in |3 +- source/lib/messages.c | 18 ++- source/modules/vfs_preopen.c | 456 + 5 files changed, 594 insertions(+), 3 deletions(-) create mode 100644 docs-xml/manpages-3/vfs_preopen.8.xml create mode 100644 source/modules/vfs_preopen.c Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_preopen.8.xml b/docs-xml/manpages-3/vfs_preopen.8.xml new file mode 100644 index 000..a84d472 --- /dev/null +++ b/docs-xml/manpages-3/vfs_preopen.8.xml @@ -0,0 +1,115 @@ +?xml version=1.0 encoding=iso-8859-1? +!DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN http://www.samba.org/samba/DTD/samba-doc; +refentry id=vfs_preopen.8 + +refmeta + refentrytitlevfs_preopen/refentrytitle + manvolnum8/manvolnum + refmiscinfo class=sourceSamba/refmiscinfo + refmiscinfo class=manualSystem Administration tools/refmiscinfo + refmiscinfo class=version3.3/refmiscinfo +/refmeta + +refnamediv + refnamevfs_preopen/refname + refpurposeHide read latencies for applications reading numbered files/refpurpose +/refnamediv + +refsynopsisdiv + cmdsynopsis + commandvfs objects = preopen/command + /cmdsynopsis +/refsynopsisdiv + +refsect1 + titleDESCRIPTION/title + + paraThis VFS module is part of the + citerefentryrefentrytitlesamba/refentrytitle + manvolnum7/manvolnum/citerefentry suite./para + + paraThis module assists applications that want to read numbered + files in sequence with very strict latency requirements. One area + where this happens in video streaming applications that want to read + one file per frame./para + + paraWhen you use this module, a number of helper processes is + started that speculatively open files and read a number of bytes to + prime the file system cache, so that later on when the real + application's request comes along, no disk access is necessary./para + + paraThis module is stackable./para + +/refsect1 + + +refsect1 + titleOPTIONS/title + + variablelist + + varlistentry + termpreopen:names = /pattern//term + listitem + para + preopen:names specifies the file name pattern which should + trigger the preopen helpers to do their work. We assume that + the files are numbered incrementally. So if your file names + are numbered FRAME0.frm FRAME1.frm and so on you would + list them as commandpreopen:names=/FRAME*.frm//command + /para + /listitem + /varlistentry + + varlistentry + termpreopen:num_bytes = BYTES/term + listitem + para + Specifies the number of bytes the helpers should speculatively + read, defaults to 1. + /para + /listitem + /varlistentry + + varlistentry + termpreopen:helpers = NUM-PROCS/term +
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3512-g6c13360
The branch, v3-2-test has been updated
via 6c13360e195189f7afc70c5fda6ef27f46145b0b (commit)
from 5eaa2541f19277bc00c47b944739c6732f90809b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 6c13360e195189f7afc70c5fda6ef27f46145b0b
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 18 07:56:51 2009 +0100
s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
Before we send the secondary requests we need to remove the
old mid=seqnum mapping and reset cli-mid and make the new
mid=seqnum mapping persistent.
The bug we had in cli_send_trans was this:
The first cli_send_smb() incremented cli-mid
and the secondary requests used the incremented mid,
but as cli-outbuf still had the correct mid,
we send the correct mid to the server. The real problem
was that the cli_send_smb() function stored the seqnum
under the wrong mid.
cli_send_nttrans() was totally broken and now follows the
same logic as cli_send_trans().
The good thing is that in practice the problem is unlikely to happen,
because max_xmit is large enough to avoid secondary requests.
metze
(cherry picked from commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b)
(cherry picked from commit 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3)
(cherry picked from commit d01cca5e3ddb925696d49a1ea728013ec1032372)
---
Summary of changes:
source/libsmb/clitrans.c | 30 +++---
1 files changed, 7 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index 4bb70f1..b42cde9 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -112,9 +112,6 @@ bool cli_send_trans(struct cli_state *cli, int trans,
this_lparam = MIN(lparam-tot_param,cli-max_xmit -
500); /* hack */
this_ldata = MIN(ldata-tot_data,cli-max_xmit -
(500+this_lparam));
- client_set_trans_sign_state_off(cli, mid);
- client_set_trans_sign_state_on(cli, mid);
-
cli_set_message(cli-outbuf,trans==SMBtrans?8:9,0,True);
SCVAL(cli-outbuf,smb_com,(trans==SMBtrans ? SMBtranss
: SMBtranss2));
@@ -138,20 +135,14 @@ bool cli_send_trans(struct cli_state *cli, int trans,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
- client_set_trans_sign_state_off(cli, mid);
return False;
}
-
- /* Ensure we use the same mid for the secondaries. */
- cli-mid = mid;
+ client_set_trans_sign_state_on(cli, mid);
tot_data += this_ldata;
tot_param += this_lparam;
@@ -461,21 +452,14 @@ bool cli_send_nt_trans(struct cli_state *cli,
memcpy(outdata,data+tot_data,this_ldata);
cli_setup_bcc(cli, outdata+this_ldata);
- /*
-* Save the mid we're using. We need this for finding
-* signing replies.
-*/
- mid = cli-mid;
-
show_msg(cli-outbuf);
+ client_set_trans_sign_state_off(cli, mid);
+ cli-mid = mid;
if (!cli_send_smb(cli)) {
- client_set_trans_sign_state_off(cli, mid);
return False;
}
-
- /* Ensure we use the same mid for the secondaries. */
- cli-mid = mid;
+ client_set_trans_sign_state_on(cli, mid);
tot_data += this_ldata;
tot_param += this_lparam;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-587-g18b4925
The branch, master has been updated via 18b4925031f7b378fdd3cde0cb90d48ff967cdc3 (commit) via 4508152282758bfa60b5ab55038359fc837a2609 (commit) via 84a140f18722518eb0f40737085dd3b3958a3a02 (commit) via c600e8ef42c3cb71c03330782f96bfdf71870e0f (commit) via b69e72dedac5792d8c191850ea3bd4b3ff976526 (commit) via 4e18c24e2e4cf567bf5c07978c9881e47cec95d0 (commit) via f6efec5dd423b54f6b9b8cf8d47e644481b0aea2 (commit) via b900e9242512e35f7f805ba4f4ce1624c2677d8b (commit) via 235a7a420b72068403d38b47b123faf4481bef08 (commit) via a27c6eb8e23db924e0dc67aa71c832be54cda98f (commit) via 6c8bd1005d7440c929d5b70f9faba09e0838b12a (commit) via 2e44ceaea858a611bcb7018df80a6a00096449ab (commit) via a140823cc9d7a47e2fc2ffdb80d63b402f7664c0 (commit) via 4002b7bdc132988b44aa83b3d0cd8af54a55fe08 (commit) via 9ed7a45c88d9daeedf818b56ecefd6ce58fcce36 (commit) via ccfd6a6e39ab999df0eba0d9e94cc22f1aa6e000 (commit) via 6c88d61bdd7333c671f440ada23bca7169cd60fc (commit) via c00126e60913f8777e5ba87db464a5b4b9b8b886 (commit) via d848d517b54074ae6b0e2349383554302b85109c (commit) via 2e0e416676f5d67e716f272d3923386c3f0c9524 (commit) from 011ad7245d53a716c4c766f5ef8d317bb3a53d0f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 18b4925031f7b378fdd3cde0cb90d48ff967cdc3 Author: Stefan Metzmacher me...@samba.org Date: Tue Feb 24 19:05:33 2009 +0100 s3:libads: use libcli/cldap code metze commit 4508152282758bfa60b5ab55038359fc837a2609 Author: Stefan Metzmacher me...@samba.org Date: Tue Feb 24 18:27:45 2009 +0100 s3:build: compile lib/tsocket and libcli/cldap metze commit 84a140f18722518eb0f40737085dd3b3958a3a02 Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 18 17:43:11 2009 +0100 move source4/libcli/cldap = libcli/cldap metze commit c600e8ef42c3cb71c03330782f96bfdf71870e0f Author: Stefan Metzmacher me...@samba.org Date: Fri Feb 13 13:13:54 2009 +0100 s4:cldap: rewrite the cldap library based on tsocket metze commit b69e72dedac5792d8c191850ea3bd4b3ff976526 Author: Stefan Metzmacher me...@samba.org Date: Thu Feb 26 14:33:52 2009 +0100 lib/util: build tevent_unix.o and tevent_ntstatus.o as UTIL_TEVENT subsystem metze commit 4e18c24e2e4cf567bf5c07978c9881e47cec95d0 Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 18 15:59:36 2009 +0100 lib/tsocket: add tsocket_guide.txt section with specific details about bsd style sockets metze commit f6efec5dd423b54f6b9b8cf8d47e644481b0aea2 Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 11 17:27:03 2009 +0100 lib/tsocket: add a fast path to tsocket_writev_send/recv() This is similar to the tsocket_sendto_send/recv() fast path. metze commit b900e9242512e35f7f805ba4f4ce1624c2677d8b Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 11 17:11:22 2009 +0100 lib/tsocket: add a fast path to tsocket_sendto_send/recv() By first trying to send data without waiting for the socket to become writeable we gain about 10-20% performance in the LDAP-BENCH-CLDAP test. metze commit 235a7a420b72068403d38b47b123faf4481bef08 Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 18 11:14:38 2009 +0100 lib/tsocket: add tsocket_guide.txt section about the async _send/recv() helper functions metze commit a27c6eb8e23db924e0dc67aa71c832be54cda98f Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 11 15:51:07 2009 +0100 lib/tsocket: add tsocket_readv_send/recv() metze commit 6c8bd1005d7440c929d5b70f9faba09e0838b12a Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 11 14:26:15 2009 +0100 lib/tsocket: add tsocket_writev_queue_send/recv() metze commit 2e44ceaea858a611bcb7018df80a6a00096449ab Author: Stefan Metzmacher me...@samba.org Date: Wed Mar 11 14:10:47 2009 +0100 lib/tsocket: add tsocket_writev_send/recv() metze commit a140823cc9d7a47e2fc2ffdb80d63b402f7664c0 Author: Stefan Metzmacher me...@samba.org Date: Wed Feb 18 09:19:09 2009 +0100 lib/tsocket: add tsocket_connect_send/recv() metze commit 4002b7bdc132988b44aa83b3d0cd8af54a55fe08 Author: Stefan Metzmacher me...@samba.org Date: Wed Feb 18 10:00:50 2009 +0100 lib/tsocket: add tsocket_sendto_queue_send/recv() metze commit 9ed7a45c88d9daeedf818b56ecefd6ce58fcce36 Author: Stefan Metzmacher me...@samba.org Date: Tue Mar 10 21:12:31 2009 +0100 lib/tsocket: add tsocket_sendto_send/recv() metze commit ccfd6a6e39ab999df0eba0d9e94cc22f1aa6e000 Author: Stefan Metzmacher me...@samba.org Date: Wed Feb 18 09:23:32 2009 +0100 lib/tsocket: add tsocket_recvfrom_send/recv() metze commit
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - 78a2a02a4ea86f07fd6ff659d3a7bf09a89df21f
The branch, v3-3-ctdb has been updated via 78a2a02a4ea86f07fd6ff659d3a7bf09a89df21f (commit) from d277da2671f3be4e74be34d6b91b29e7ed01c195 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb - Log - commit 78a2a02a4ea86f07fd6ff659d3a7bf09a89df21f Author: Michael Adam ob...@samba.org Date: Thu Mar 19 17:08:16 2009 +0100 VERSION: Set version to 3.3.2-ctdb-1 Michael --- Summary of changes: source/VERSION |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/VERSION b/source/VERSION index 358c3af..b364aca 100644 --- a/source/VERSION +++ b/source/VERSION @@ -84,8 +84,8 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT= # SAMBA_VERSION_VENDOR_FUNCTION # # # -SAMBA_VERSION_VENDOR_SUFFIX= -SAMBA_VERSION_VENDOR_PATCH= +SAMBA_VERSION_VENDOR_SUFFIX=ctdb +SAMBA_VERSION_VENDOR_PATCH=1 # This can be set by vendors if they want..# -- SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - d98723ea49022a7b0c8a9fbf648f2d440e4da1a8
The branch, v3-3-ctdb has been updated
via d98723ea49022a7b0c8a9fbf648f2d440e4da1a8 (commit)
via d6f92159608f0d3db334f9c735db51589387a653 (commit)
via 17953e24ad75383d8c8ae2dae9159ee43dc63ed9 (commit)
via 3640e2922ad0a51c3566f4f94728f88a8c0ab4ae (commit)
via c85a47acadc530fb7767f35b744f691ad6b1a9aa (commit)
from 78a2a02a4ea86f07fd6ff659d3a7bf09a89df21f (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit d98723ea49022a7b0c8a9fbf648f2d440e4da1a8
Author: Michael Adam ob...@samba.org
Date: Wed Jan 21 09:49:12 2009 +0100
packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit
build
Michael
commit d6f92159608f0d3db334f9c735db51589387a653
Author: Michael Adam ob...@samba.org
Date: Tue Jan 20 19:47:28 2009 +0100
packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
Michael
commit 17953e24ad75383d8c8ae2dae9159ee43dc63ed9
Author: Michael Adam ob...@samba.org
Date: Wed Jan 21 11:03:34 2009 +0100
packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from
version.h
Michael
commit 3640e2922ad0a51c3566f4f94728f88a8c0ab4ae
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 17:57:11 2009 +0100
packaging(RHEL-CTDB): The former release number has basically moved into
VERSION
Michael
commit c85a47acadc530fb7767f35b744f691ad6b1a9aa
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 17:55:05 2009 +0100
add generated packaging/RHEL-CTDB/samba.spec to .gitignore
Michael
---
Summary of changes:
.gitignore |1 +
packaging/RHEL-CTDB/makerpms.sh | 17 +++---
packaging/RHEL-CTDB/makespec.sh |4 +
packaging/RHEL-CTDB/samba.spec.tmpl | 105 ---
4 files changed, 111 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index acaf24e..d3ed83f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,7 @@ examples/libsmbclient/testfstatvfs
examples/libsmbclient/teststatvfs
examples/libsmbclient/tree
examples/libsmbclient/Makefile.internal
+packaging/RHEL-CTDB/samba.spec
source/librpc/gen_ndr/cli_krb5pac.*
source/librpc/gen_ndr/cli_messaging.*
source/librpc/gen_ndr/cli_misc.*
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 50fa96c..8da9078 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -88,19 +88,20 @@ cp -p ${SPECFILE} ${RPMSPECDIR}
popd
##
-## Build
+## some symlink fixes for building 32bit compat libs
##
-echo $(basename $0): Getting Ready to build release package
-pushd ${RPMSPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
-if [ x$? = x0 ] [ `arch` = x86_64 ]; then
-echo Building 32 bit winbind libs
-# hi ho, a hacking we will go ...
+if [ `arch` = x86_64 ]; then
ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
ln -sf /lib/libuuid.so.1 /lib/libuuid.so
-${RPM} -ba --rebuild --target=i386 $SPECFILE
fi
+##
+## Build
+##
+echo $(basename $0): Getting Ready to build release package
+
+pushd ${RPMSPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
popd
echo $(basename $0): Done.
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index ae58db0..62f0969 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -26,6 +26,10 @@ vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX
${VERSION_H} | awk '{print $3}'
if test x${vendor_version} != x ; then
VERSION=${VERSION}-${vendor_version}
fi
+vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+if test x${vendor_patch} != x ; then
+ VERSION=${VERSION}-${vendor_patch}
+fi
VERSION=`echo ${VERSION} | sed 's/-/_/g'`
VERSION=`echo ${VERSION} | sed 's/\//g'`
echo VERSION: ${VERSION}
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index c8f31f3..744cfe4 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -6,7 +6,7 @@ Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Name: samba
Version: PVERSION
-Release: ctdb.1
+Release: 1
Epoch:0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -93,7 +93,7 @@ The samba-swat package includes the new SWAT (Samba Web
Administration
Tool), for remotely managing Samba's smb.conf file using your favorite
Web browser.
-%ifarch i386 i486 i586 i686 ppc s390
+%ifarch x86_64 ppc64
%package winbind-32bit
Summary:Samba winbind compatibility package for 32bit apps on 64bit
archs
Group: Applications/System
@@ -144,6 +144,80 @@ export CC
## always run autogen.sh
./autogen.sh
+
+##
+## build the files for the winbind-32bit compat package
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - d0f4f8eb49ad10126536ddbb7b2689f3aa053b0b
The branch, v3-3-ctdb has been updated via d0f4f8eb49ad10126536ddbb7b2689f3aa053b0b (commit) via 317ea0b90b5b15c89484c6308952d8506fcaccec (commit) via 95fe02c1a8075b2a5c5d9ff941668772bd1ad1a9 (commit) via 5dc226ae4898eea15246ff5b111d4515bae55b71 (commit) via 6c6e12534dd66f7ee98c024b36a288cfe150434a (commit) via cf451fa00618471a667d7c71a2edf923659c6cf5 (commit) via 3cb7291f76a14a8599973557077af34ef30f4ecf (commit) via 26ed7a73fc237944add17f101bec007e766027e1 (commit) via adff4bb2128ae5a4c497b70ac6eeba46426c4f6d (commit) via f8751cac1dfd3c5c89821faa86054aad5b2b4be3 (commit) via 0e8d43c1cf50ea82ee9e2dac86a1393c9eb2c85b (commit) via 82f4c98bddbe7c7b65d56bcb4bcbf6267d3d21c2 (commit) via ca5cc54234ad2940ae5868001aa282d1b828bb3f (commit) via 6ac324a34b73e8a3d20e6de3c670bf0f8eb85fde (commit) via 414abc35882e3216004da0ead9fff713d00c335a (commit) via 733c92d7bf90a067211d46f55e85388aaf4c1bf9 (commit) via d9b808cee10730247c31d6178e387b2692eb249f (commit) via 98898b9e0e3050ba616bc914d1055daab74d7d32 (commit) via db21ccde5a0ac1740526d04a371d545c0b934cbe (commit) via 2871c74f8778e08c3bf399e17b759fe62707616c (commit) via bc416e056c08524528988a4935157c5e06877050 (commit) via 9875b765ea3d8dee001225ae0bdf4c9911602a8a (commit) via d306b158231658458c4cdadc44afee79c648fba2 (commit) via 195118915f5d420f36f49b2333793781a9035824 (commit) via 602e0dfd37900600b937f3231e2630cee4d58a19 (commit) via 86717ebd7ba35cc2ae11c5419cb9bd81aa999e61 (commit) via 34d1a41979b693d05a0217ed1b41ba6bb2a0e663 (commit) via b885267126f3844fe9dcf3a79d5e3817a19f2564 (commit) via 567cdc094d6e9df274b8f91e9cb4fc4de8d28358 (commit) via b230ff459d84d07e48efb8ff9841e7af6f9780d3 (commit) via 7009d64f06a0e629ceff342040787c7122626de2 (commit) via c46d4eea2f1a1d058fd76fe0146ec7019870971c (commit) via 98939ab69789f074325bc0cabfd6740e572fdbd7 (commit) via 34ff9fb525cdb828cca7644e2bf35e5a9bc17242 (commit) via c613d80968e1c071cdd3313d7d8f198c7fe21e87 (commit) via 628038d050df8545acc3d143056af622f75fd692 (commit) via 0169d26705b007b0115ab359a5e58e38179c01d0 (commit) via 31545b5bb6ecdfccb06bec73364e2c0de830cb43 (commit) via f3e826b589d24aca3fdb2e9446808b9f77a0a0b6 (commit) via 2687121aa5cc46d9ec4d2326d8e25f187f736fd3 (commit) via 1d1c93c4136f0e1ff279b9075102f0737e6097de (commit) via de7baafb5129e910b2759a74941cf0d6b3d6f3ea (commit) via f70716edac143b8d83fdfaa409c3c68373ed801f (commit) via 7f196f3c98051c1a1c78ec8a38645a45c3258b5e (commit) via 9d099300f3fff611fa45778d4f734d245ef17c29 (commit) via 966b592179d1fd07ff1f0fca93286d3a41cfcc72 (commit) via f13a60cb63495b3be6e3e03cb0332bb8d16f6b11 (commit) via 8f5fb8c3e8dbc20c0eeb7d7ef4d2cd8c5517f0aa (commit) via 70276725ff96e89c601fb7779049ade7c166ac94 (commit) via f9a7b079a249977c91962c57e5b7b53b647ebb0f (commit) via 8683abf27f48e50f107b7d5611141ab61d00e1a3 (commit) via ee3295922420b46ab5b2dc3529f7e8e646186e57 (commit) via a451896bcdd55ba0706ad2bf41f79b0234e98f20 (commit) via d4a4025c0f8e482668670ad357a4ce7130a86404 (commit) via 1d1ed6d583f640394b5f652046c4bbde03ecb374 (commit) via b306f826fe0475515cc2a8161daa20c4c819cda1 (commit) via 351b8d068fcbcbf3623e7658d698e612ab2f9533 (commit) via b3aa6f0ccdf50eca5f5841ed9c8f85a4ac38f0a4 (commit) via ac4c574bc0c1a7a7be71961df39b0d38628fb243 (commit) via 516e531452ce224de1396bccade986f87fd798a9 (commit) via 3a5c0e6d8e8c9668d4c76dadaca76622cc466dd0 (commit) via d44f8a495abbdc8e38ea72a72668ac6eed31ce43 (commit) via aeffcc58ddaeba5163eb72d4ca25cf46ae78e0c3 (commit) via 13e25b5d573e08b4fcf3fde3cc05dcb64f385b8f (commit) via ee377c0ef2044141ff197e1d9989c41e6156d3d4 (commit) via d66f0476abf3311dceafdfcb33c856f1d0ba2590 (commit) via d4bf42d1e707271920ba40c87f1b63cf17e941b5 (commit) via 9713428c282380453c26db2cc1e12e0e6c496244 (commit) via fc78f9366ede81edb26eb549db022ab06110981d (commit) via 463d2467bfad75affc6f3709b0110f6fff0b6db4 (commit) via be34db6693bd3ccd0d43be1bc6b98d8cbe352cff (commit) via 39c4411fe393fc07bef9a55cb100f3c45bd7da45 (commit) via 35f405b354aa23ef503f7ba594e973bdc695ae21 (commit) via 437ad9212a945e30cc267810ab9d1f71a3fada40 (commit) via bd74475f15e05846f378f392b852825733ba14f1 (commit) via 5213d02fbb248a961891ce561dd0b95ac30949ee (commit) via 7fb36ad10927d1650f0324f653c0624d0cd06618 (commit) via 4ca8a274a5841a531475ce4e5050106223fff28b (commit) via d2353b9027ae97ba151092dba3c6e53ea4281bb3 (commit) via eaf91c11002d9a1e513a62f13b6e3fd373f19043 (commit)
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - 6f1de7cf08ee48b6dfccd1cda35e43ac8dafef38
The branch, v3-3-ctdb has been updated
via 6f1de7cf08ee48b6dfccd1cda35e43ac8dafef38 (commit)
from d0f4f8eb49ad10126536ddbb7b2689f3aa053b0b (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit 6f1de7cf08ee48b6dfccd1cda35e43ac8dafef38
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 18:29:09 2009 +0100
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
---
Summary of changes:
source/lib/version.c |2 +-
source/script/mkversion.sh |1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/version.c b/source/lib/version.c
index 3982646..271a3c4 100644
--- a/source/lib/version.c
+++ b/source/lib/version.c
@@ -29,7 +29,7 @@ const char *samba_version_string(void)
#ifdef SAMBA_VERSION_VENDOR_SUFFIX
#ifdef SAMBA_VERSION_VENDOR_PATCH
return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX \
- - SAMBA_VERSION_VENDOR_PATCH;
+ - SAMBA_VERSION_VENDOR_PATCH_STRING;
#endif /* SAMBA_VERSION_VENDOR_PATCH */
return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX;
#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 695fc7d..08b3a38 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -112,6 +112,7 @@ if test -n ${SAMBA_VERSION_VENDOR_SUFFIX};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}
if test -n ${SAMBA_VERSION_VENDOR_PATCH};then
echo #define SAMBA_VERSION_VENDOR_PATCH
${SAMBA_VERSION_VENDOR_PATCH} $OUTPUT_FILE
+echo #define SAMBA_VERSION_VENDOR_PATCH_STRING
\${SAMBA_VERSION_VENDOR_PATCH}\ $OUTPUT_FILE
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}
fi
fi
--
SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-588-gf603903
The branch, master has been updated
via f603903cb01f0c1e8bba66ab8c5229c3e7724ae3 (commit)
from 18b4925031f7b378fdd3cde0cb90d48ff967cdc3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f603903cb01f0c1e8bba66ab8c5229c3e7724ae3
Author: Dan Sledz dan.sl...@isilon.com
Date: Thu Mar 19 21:53:34 2009 +
s3: Fix a free of an uninitialized variable in winbind_get_sid_aliases
---
Summary of changes:
source3/lib/winbind_util.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 64f5fb4..df095b9 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -322,7 +322,6 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
rids,
num_rids);
if (ret != WBC_ERR_SUCCESS) {
- wbcFreeMemory(rids);
return false;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-536-gc50490e
The branch, v3-4-test has been updated
via c50490e4af2f4270cf8b59f868b45630efb55efd (commit)
from 3b74ba990e5b96e17ef76845551ab03fdddc59f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit c50490e4af2f4270cf8b59f868b45630efb55efd
Author: Dan Sledz dan.sl...@isilon.com
Date: Thu Mar 19 21:53:34 2009 +
s3: Fix a free of an uninitialized variable in winbind_get_sid_aliases
---
Summary of changes:
source3/lib/winbind_util.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 64f5fb4..df095b9 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -322,7 +322,6 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
rids,
num_rids);
if (ret != WBC_ERR_SUCCESS) {
- wbcFreeMemory(rids);
return false;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5148-gf846e0f
The branch, v3-3-test has been updated
via f846e0fcdf62333b44a16e5a392930189b512f9b (commit)
from d01cca5e3ddb925696d49a1ea728013ec1032372 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit f846e0fcdf62333b44a16e5a392930189b512f9b
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 18:29:09 2009 +0100
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
---
Summary of changes:
source/lib/version.c |2 +-
source/script/mkversion.sh |1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/version.c b/source/lib/version.c
index 3982646..271a3c4 100644
--- a/source/lib/version.c
+++ b/source/lib/version.c
@@ -29,7 +29,7 @@ const char *samba_version_string(void)
#ifdef SAMBA_VERSION_VENDOR_SUFFIX
#ifdef SAMBA_VERSION_VENDOR_PATCH
return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX \
- - SAMBA_VERSION_VENDOR_PATCH;
+ - SAMBA_VERSION_VENDOR_PATCH_STRING;
#endif /* SAMBA_VERSION_VENDOR_PATCH */
return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX;
#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 695fc7d..08b3a38 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -112,6 +112,7 @@ if test -n ${SAMBA_VERSION_VENDOR_SUFFIX};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}
if test -n ${SAMBA_VERSION_VENDOR_PATCH};then
echo #define SAMBA_VERSION_VENDOR_PATCH
${SAMBA_VERSION_VENDOR_PATCH} $OUTPUT_FILE
+echo #define SAMBA_VERSION_VENDOR_PATCH_STRING
\${SAMBA_VERSION_VENDOR_PATCH}\ $OUTPUT_FILE
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}
fi
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-590-g3a4638d
The branch, master has been updated
via 3a4638db0351368d3b148bf547546f28fa0b1479 (commit)
via d813a90d1887958085adf92c88359dc866c656ad (commit)
from f603903cb01f0c1e8bba66ab8c5229c3e7724ae3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3a4638db0351368d3b148bf547546f28fa0b1479
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 23:56:12 2009 +0100
add a versiontest program to print samba_version_string().
This is to allow for testing samba_version_string() without
the need to compile any of the larger binaries like smbd or net...
Michael
commit d813a90d1887958085adf92c88359dc866c656ad
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 23:55:21 2009 +0100
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
---
Summary of changes:
source3/Makefile.in |4
source3/{libnet/libnet.h = lib/version_test.c} | 19 ---
source3/script/mkversion.sh |3 ++-
3 files changed, 14 insertions(+), 12 deletions(-)
copy source3/{libnet/libnet.h = lib/version_test.c} (71%)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a7fc01d..cf74182 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1641,6 +1641,10 @@ bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ)
@BUILD_POPT@ @LIBTALLOC_SHARED
$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o
+
#
#
diff --git a/source3/libnet/libnet.h b/source3/lib/version_test.c
similarity index 71%
copy from source3/libnet/libnet.h
copy to source3/lib/version_test.c
index 570009c..880cfeb 100644
--- a/source3/libnet/libnet.h
+++ b/source3/lib/version_test.c
@@ -1,7 +1,7 @@
/*
* Unix SMB/CIFS implementation.
- * libnet Support
- * Copyright (C) Guenther Deschner 2007
+ * version_test - test program for samba_version_strion()
+ * Copyright (C) Michael Adam 2009
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,13 +17,10 @@
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
-#ifndef __LIBNET_H__
-#define __LIBNET_H__
+#include includes.h
-#include libnet/libnet_keytab.h
-#include libnet/libnet_samsync.h
-#include libnet/libnet_dssync.h
-#include librpc/gen_ndr/libnet_join.h
-#include libnet/libnet_proto.h
-
-#endif
+int main(void)
+{
+ printf(%s\n, samba_version_string());
+ return 0;
+}
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index a55aafc..ce9d2af 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -112,6 +112,7 @@ if test -n ${SAMBA_VERSION_VENDOR_SUFFIX};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}
if test -n ${SAMBA_VERSION_VENDOR_PATCH};then
echo #define SAMBA_VERSION_VENDOR_PATCH
${SAMBA_VERSION_VENDOR_PATCH} $OUTPUT_FILE
+echo #define SAMBA_VERSION_VENDOR_PATCH_STRING
\${SAMBA_VERSION_VENDOR_PATCH}\ $OUTPUT_FILE
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}
fi
fi
@@ -130,7 +131,7 @@ cat $OUTPUT_FILECEOF
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
# ifdef SAMBA_VERSION_VENDOR_SUFFIX
#ifdef SAMBA_VERSION_VENDOR_PATCH
-# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX - SAMBA_VERSION_VENDOR_PATCH
+# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX - SAMBA_VERSION_VENDOR_PATCH_STRING
#else /* SAMBA_VERSION_VENDOR_PATCH */
# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX
#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-557-gd380c49
Hi Metze, fixed a logic bug in the tevent nesting code The event nesting code never triggered as nesting.level was never greater than 1. The main event loop needs to increase the nesting level by 1. That was desired, why do you want to be called if there's no nesting? you do if (unixuid_nesting_level == 0) return; anyway. The code as it was previously would only call the hook if we had two levels of nesting. ie. it would call it when we had this: - main loop - call to event_loop_once - call to event_loop_once - calls hook It was just a simple off by 1 error, as the check was for 1, which meant it only triggered when the nesting was 2 or greater. It started at zero. If we change it to call the hook at level 0, we should change that in tevent_loop_once() and not in tevent_loop_wait(). no, because then we'll get the hook code called in top level code that calls event_loop_once, such as the smbtorture code. I also added a paranoia check to the nesting setup call. The API as currently written cannot support multiple nesting hooks, so we need to abort if multiple hooks are tried. I think we should have global in vfs_unixid.c which remembers that we already set the hook and not reset it on each tree connect. The point of that paranoia check was not for the existing vfs code, it was for future uses of that API. The API is now a public part of tevent, and may be used by other libraries or modules. The first time we used a library like that we would have had silent corruption. It would be perfectly possible to re-do the implementation of this function so that it can cope with multiple pieces of code on the same event context that need a hook (we could have a linked list of hooks). By having this paranoia check we will know when we need to re-do the implementation when we first hit this situation. Cheers, Tridge
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-538-ga75c184
The branch, v3-4-test has been updated
via a75c184cafbb80adb0a3b056e55608d2d263a0c6 (commit)
via 21bf5cac5f352f51432ad717b2e5051a3a63cac9 (commit)
from c50490e4af2f4270cf8b59f868b45630efb55efd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit a75c184cafbb80adb0a3b056e55608d2d263a0c6
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 23:56:12 2009 +0100
add a versiontest program to print samba_version_string().
This is to allow for testing samba_version_string() without
the need to compile any of the larger binaries like smbd or net...
Michael
commit 21bf5cac5f352f51432ad717b2e5051a3a63cac9
Author: Michael Adam ob...@samba.org
Date: Thu Mar 19 23:55:21 2009 +0100
version: fix handling of SAMBA_VERSION_VENDOR_PATCH.
We need a string version of this, or else version.c does not compile.
Michael
---
Summary of changes:
source3/Makefile.in |4
source3/{libnet/libnet.h = lib/version_test.c} | 19 ---
source3/script/mkversion.sh |3 ++-
3 files changed, 14 insertions(+), 12 deletions(-)
copy source3/{libnet/libnet.h = lib/version_test.c} (71%)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6cd5898..1bf9555 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1630,6 +1630,10 @@ bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ)
@BUILD_POPT@ @LIBTALLOC_SHARED
$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o
+
#
#
diff --git a/source3/libnet/libnet.h b/source3/lib/version_test.c
similarity index 71%
copy from source3/libnet/libnet.h
copy to source3/lib/version_test.c
index 570009c..880cfeb 100644
--- a/source3/libnet/libnet.h
+++ b/source3/lib/version_test.c
@@ -1,7 +1,7 @@
/*
* Unix SMB/CIFS implementation.
- * libnet Support
- * Copyright (C) Guenther Deschner 2007
+ * version_test - test program for samba_version_strion()
+ * Copyright (C) Michael Adam 2009
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,13 +17,10 @@
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
-#ifndef __LIBNET_H__
-#define __LIBNET_H__
+#include includes.h
-#include libnet/libnet_keytab.h
-#include libnet/libnet_samsync.h
-#include libnet/libnet_dssync.h
-#include librpc/gen_ndr/libnet_join.h
-#include libnet/libnet_proto.h
-
-#endif
+int main(void)
+{
+ printf(%s\n, samba_version_string());
+ return 0;
+}
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index a55aafc..ce9d2af 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -112,6 +112,7 @@ if test -n ${SAMBA_VERSION_VENDOR_SUFFIX};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}
if test -n ${SAMBA_VERSION_VENDOR_PATCH};then
echo #define SAMBA_VERSION_VENDOR_PATCH
${SAMBA_VERSION_VENDOR_PATCH} $OUTPUT_FILE
+echo #define SAMBA_VERSION_VENDOR_PATCH_STRING
\${SAMBA_VERSION_VENDOR_PATCH}\ $OUTPUT_FILE
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}
fi
fi
@@ -130,7 +131,7 @@ cat $OUTPUT_FILECEOF
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
# ifdef SAMBA_VERSION_VENDOR_SUFFIX
#ifdef SAMBA_VERSION_VENDOR_PATCH
-# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX - SAMBA_VERSION_VENDOR_PATCH
+# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX - SAMBA_VERSION_VENDOR_PATCH_STRING
#else /* SAMBA_VERSION_VENDOR_PATCH */
# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX
#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - 08f544dfaf266614da1b3e9443e894a4f3e56833
The branch, v3-3-ctdb has been updated
via 08f544dfaf266614da1b3e9443e894a4f3e56833 (commit)
via 34f47a5ae4323125f06bfaf83fe52441169e949b (commit)
via a10426f54ee21b5eb2b35645f9d7a2c055a60a1f (commit)
via b4b896c56114266c6da203439fecba0093ec6a64 (commit)
from 6f1de7cf08ee48b6dfccd1cda35e43ac8dafef38 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit 08f544dfaf266614da1b3e9443e894a4f3e56833
Author: Michael Adam ob...@samba.org
Date: Wed Jan 28 13:34:34 2009 +0100
vfs_gpfs_prefetch: correctly return -1 on error condition in
smbd_gpfs_fcntl()
Michael
commit 34f47a5ae4323125f06bfaf83fe52441169e949b
Author: Michael Adam ob...@samba.org
Date: Tue Aug 26 17:51:18 2008 +0200
don't build gpfs_prefetch.so by default
This is meant as a first measure for GPL-compliance:
Don't ship the gpfs_prefetch module in the binary RPMs.
Michael
commit a10426f54ee21b5eb2b35645f9d7a2c055a60a1f
Author: Volker Lendecke v...@samba.org
Date: Mon Apr 28 11:44:26 2008 +0200
Add a gpfs_prefetch module
commit b4b896c56114266c6da203439fecba0093ec6a64
Author: Andrew Tridgell tri...@samba.org
Date: Mon Apr 21 18:41:32 2008 +0200
apply patch from v3-0-ctdb to special case root in libnss_winbind
This is needed to ensure the administrator can login to a node even
when ctdbd and winbindd are stuck
---
Summary of changes:
source/Makefile.in |5 +
source/configure.in |1 +
source/modules/vfs_gpfs_prefetch.c | 308 +++
source/nsswitch/winbind_nss_linux.c |8 +
4 files changed, 322 insertions(+), 0 deletions(-)
create mode 100644 source/modules/vfs_gpfs_prefetch.c
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 988ca2c..5322508 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -625,6 +625,7 @@ VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
VFS_COMMIT_OBJ = modules/vfs_commit.o
VFS_GPFS_OBJ = modules/vfs_gpfs.o modules/gpfs.o modules/nfs4_acls.o
+VFS_GPFS_PREFETCH_OBJ = modules/vfs_gpfs_prefetch.o modules/gpfs.o
VFS_NOTIFY_FAM_OBJ = modules/vfs_notify_fam.o
VFS_READAHEAD_OBJ = modules/vfs_readahead.o
VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
@@ -2414,6 +2415,10 @@ bin/gp...@shlibext@: $(BINARY_PREREQS) $(VFS_GPFS_OBJ)
@echo Building plugin $@
@$(SHLD_MODULE) $(VFS_GPFS_OBJ)
+bin/gpfs_prefet...@shlibext@: $(BINARY_PREREQS) $(VFS_GPFS_PREFETCH_OBJ)
+ @echo Building plugin $@
+ @$(SHLD_MODULE) $(VFS_GPFS_PREFETCH_OBJ)
+
bin/notify_f...@shlibext@: $(BINARY_PREREQS) $(VFS_NOTIFY_FAM_OBJ)
@echo Building plugin $@
@$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ) @SMB_FAM_LIBS@
diff --git a/source/configure.in b/source/configure.in
index 6d8a387..9416dce 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -6390,6 +6390,7 @@ SMB_MODULE(vfs_cacheprime, \$(VFS_CACHEPRIME_OBJ),
bin/cacheprime.$SHLIBEXT, V
SMB_MODULE(vfs_prealloc, \$(VFS_PREALLOC_OBJ), bin/prealloc.$SHLIBEXT, VFS)
SMB_MODULE(vfs_commit, \$(VFS_COMMIT_OBJ), bin/commit.$SHLIBEXT, VFS)
SMB_MODULE(vfs_gpfs, \$(VFS_GPFS_OBJ), bin/gpfs.$SHLIBEXT, VFS)
+SMB_MODULE(vfs_gpfs_prefetch, \$(VFS_GPFS_PREFETCH_OBJ),
bin/gpfs_prefetch.$SHLIBEXT, VFS)
SMB_MODULE(vfs_readahead, \$(VFS_READAHEAD_OBJ), bin/readahead.$SHLIBEXT,
VFS)
SMB_MODULE(vfs_tsmsm, \$(VFS_TSMSM_OBJ), bin/tsmsm.$SHLIBEXT, VFS)
SMB_MODULE(vfs_fileid, \$(VFS_FILEID_OBJ), bin/fileid.$SHLIBEXT, VFS)
diff --git a/source/modules/vfs_gpfs_prefetch.c
b/source/modules/vfs_gpfs_prefetch.c
new file mode 100644
index 000..308ac10
--- /dev/null
+++ b/source/modules/vfs_gpfs_prefetch.c
@@ -0,0 +1,308 @@
+/*
+ Unix SMB/CIFS implementation.
+ Make use of gpfs prefetch functionality
+
+ Copyright (C) Volker Lendecke 2008
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+
+*/
+
+#include includes.h
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_VFS
+
+#include gpfs.h
+#include gpfs_fcntl.h
+
+static int (*gpfs_fcntl_fn)(int fd, void *arg);
+
+static int smbd_gpfs_fcntl(int fd, void *arg)
+{
+ static void *libgpfs_handle = NULL;
+
+
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - 880bb9c1798f97095de19d4afda3f74824e0f191
The branch, v3-3-ctdb has been updated
via 880bb9c1798f97095de19d4afda3f74824e0f191 (commit)
from 08f544dfaf266614da1b3e9443e894a4f3e56833 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit 880bb9c1798f97095de19d4afda3f74824e0f191
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 00:21:34 2009 +0100
packaging(RHEL-CTDB): fix creation of version number in makespec.sh
Michael
---
Summary of changes:
packaging/RHEL-CTDB/makespec.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 62f0969..a73b3f8 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -26,7 +26,7 @@ vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H}
| awk '{print $3}'
if test x${vendor_version} != x ; then
VERSION=${VERSION}-${vendor_version}
fi
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print
$3}'`
if test x${vendor_patch} != x ; then
VERSION=${VERSION}-${vendor_patch}
fi
--
SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - a67a6be3a255456b215269c85e8c32a533b381ab
The branch, v3-3-ctdb has been updated
via a67a6be3a255456b215269c85e8c32a533b381ab (commit)
via d09b4e7af2dd9b6fc5ea7bf7678405b87c1d92fd (commit)
via 7d29d14c634d836dbea69f348701df7d9dc59aa9 (commit)
from 880bb9c1798f97095de19d4afda3f74824e0f191 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit a67a6be3a255456b215269c85e8c32a533b381ab
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 00:30:35 2009 +0100
packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
Michael
commit d09b4e7af2dd9b6fc5ea7bf7678405b87c1d92fd
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 00:28:36 2009 +0100
packaging(RHEL-CTDB): add new binary sharesec to the client package.
Michael
commit 7d29d14c634d836dbea69f348701df7d9dc59aa9
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 00:26:11 2009 +0100
packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
Michael
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index 744cfe4..b257687 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -513,6 +513,7 @@ exit 0
%{_bindir}/smbspool
%{_bindir}/smbtar
%{_bindir}/smbtree
+%{_bindir}/sharesec
%{_mandir}/man8/mount.cifs.8.*
%{_mandir}/man8/umount.cifs.8.*
@@ -543,6 +544,7 @@ exit 0
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
+/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
@@ -575,6 +577,7 @@ exit 0
%{_bindir}/ldbedit
%{_bindir}/ldbmodify
%{_bindir}/ldbsearch
+%{_bindir}/ldbrename
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
--
SAMBA-CTDB repository
Build status as of Fri Mar 20 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-03-19 00:00:28.0 + +++ /home/build/master/cache/broken_results.txt 2009-03-20 00:00:31.0 + @@ -1,23 +1,23 @@ -Build status as of Thu Mar 19 00:00:02 2009 +Build status as of Fri Mar 20 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 28 5 0 +ccache 30 5 0 ctdb 0 0 0 distcc 0 0 0 -ldb 28 28 0 -libreplace 28 9 0 -lorikeet-heimdal 25 12 0 -pidl 20 2 0 +ldb 30 30 0 +libreplace 30 11 0 +lorikeet-heimdal 27 14 0 +pidl 21 3 0 ppp 13 0 0 -rsync28 8 0 +rsync30 10 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 27 27 0 -samba_3_X_test 26 24 0 -samba_4_0_test 28 27 1 -smb-build27 4 0 -talloc 27 28 0 +samba_3_X_devel 28 28 0 +samba_3_X_test 28 27 1 +samba_4_0_test 30 29 1 +smb-build29 6 0 +talloc 30 30 0 tdb 28 9 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-593-g5fe2b28
The branch, master has been updated
via 5fe2b28f45289dc5578cdd536600f0d30a14d820 (commit)
via ec9aeeab00584f4d3dfe9afb83dc1a77b8463b81 (commit)
via 722dc9eed3798db0d3795bdf70ce10e6d402705a (commit)
from 3a4638db0351368d3b148bf547546f28fa0b1479 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5fe2b28f45289dc5578cdd536600f0d30a14d820
Merge: ec9aeeab00584f4d3dfe9afb83dc1a77b8463b81
3a4638db0351368d3b148bf547546f28fa0b1479
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Mar 20 01:30:36 2009 +0100
Merge branch 'master' of git://git.samba.org/samba into minschema
commit ec9aeeab00584f4d3dfe9afb83dc1a77b8463b81
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Mar 20 01:29:31 2009 +0100
Fix up minschema after the conversion from JavaScript.
Pair programmed over the phone with Andrew :-)
commit 722dc9eed3798db0d3795bdf70ce10e6d402705a
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Mar 20 00:33:43 2009 +0100
pyldb: Improve exception message when a list is expected.
---
Summary of changes:
source4/lib/ldb/pyldb.c | 17 ++--
source4/scripting/bin/minschema | 165 ++-
2 files changed, 86 insertions(+), 96 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 81b9609..7ff4bf4 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -469,19 +469,20 @@ static PyObject *py_ldb_get_default_basedn(PyLdbObject
*self)
return PyLdbDn_FromDn(dn);
}
-static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list)
+static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list,
+
const char *paramname)
{
const char **ret;
int i;
if (!PyList_Check(list)) {
- PyErr_SetString(PyExc_TypeError, options is not a list);
+ PyErr_Format(PyExc_TypeError, %s is not a list, paramname);
return NULL;
}
ret = talloc_array(NULL, const char *, PyList_Size(list)+1);
for (i = 0; i PyList_Size(list); i++) {
PyObject *item = PyList_GetItem(list, i);
if (!PyString_Check(item)) {
- PyErr_SetString(PyExc_TypeError, options should be
strings);
+ PyErr_Format(PyExc_TypeError, %s should be strings,
paramname);
return NULL;
}
ret[i] = PyString_AsString(item);
@@ -510,7 +511,7 @@ static int py_ldb_init(PyLdbObject *self, PyObject *args,
PyObject *kwargs)
if (py_options == Py_None) {
options = NULL;
} else {
- options = PyList_AsStringList(ldb, py_options);
+ options = PyList_AsStringList(ldb, py_options, options);
if (options == NULL)
return -1;
}
@@ -563,7 +564,7 @@ static PyObject *py_ldb_connect(PyLdbObject *self, PyObject
*args, PyObject *kwa
if (py_options == Py_None) {
options = NULL;
} else {
- options = PyList_AsStringList(NULL, py_options);
+ options = PyList_AsStringList(NULL, py_options, options);
if (options == NULL)
return NULL;
}
@@ -813,7 +814,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject
*args, PyObject *kwar
if (py_attrs == Py_None) {
attrs = NULL;
} else {
- attrs = PyList_AsStringList(ldb_ctx, py_attrs);
+ attrs = PyList_AsStringList(ldb_ctx, py_attrs, attrs);
if (attrs == NULL)
return NULL;
}
@@ -828,7 +829,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject
*args, PyObject *kwar
if (py_controls == Py_None) {
parsed_controls = NULL;
} else {
- const char **controls = PyList_AsStringList(ldb_ctx,
py_controls);
+ const char **controls = PyList_AsStringList(ldb_ctx,
py_controls, controls);
parsed_controls = ldb_parse_control_strings(ldb_ctx, ldb_ctx,
controls);
talloc_free(controls);
}
@@ -1129,7 +1130,7 @@ static PyObject *py_ldb_module_search(PyLdbModuleObject
*self, PyObject *args, P
mod = self-mod;
ret = ldb_build_search_req(req, mod-ldb, NULL, PyLdbDn_AsDn(py_base),
-scope, NULL /* expr */, py_attrs ==
Py_None?NULL:PyList_AsStringList(req, py_attrs),
+scope, NULL /* expr */, py_attrs ==
Py_None?NULL:PyList_AsStringList(req, py_attrs, attrs),
NULL /* controls */, NULL, NULL,
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - 9ed0deab46a108eae7f7715ec15764153a926992
The branch, v3-3-ctdb has been updated
via 9ed0deab46a108eae7f7715ec15764153a926992 (commit)
from a67a6be3a255456b215269c85e8c32a533b381ab (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit 9ed0deab46a108eae7f7715ec15764153a926992
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 01:57:56 2009 +0100
Revert Fix bug #6195 - Migrating from 3.0.x to 3.3.x can fail to update
passdb.tdb correctly.
This reverts commit 5213d02fbb248a961891ce561dd0b95ac30949ee.
This makes samba (and tools) panic when running with clustering = yes
since the rename() of the tdb files fails: ctdb puts the databases
elsewhere...
Revert the change for the v3-3-ctdb branch until we have a fix
that works with ctdb.
Michael
---
Summary of changes:
source/Makefile.in | 10 +-
source/passdb/pdb_tdb.c | 215 +++---
2 files changed, 19 insertions(+), 206 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 5322508..1ad6a47 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -575,7 +575,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o
passdb/pdb_interface.o \
passdb/util_unixsids.o passdb/lookup_sid.o \
passdb/login_cache.o @PDB_STATIC@ \
lib/account_pol.o $(PRIVILEGES_OBJ) \
- lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
+ lib/util_nscd.o lib/winbind_util.o
DEVEL_HELP_WEIRD_OBJ = modules/weird.o
CP850_OBJ = modules/CP850.o
@@ -671,7 +671,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o
smbd/connection.o \
smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o \
smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \
smbd/vfs.o smbd/statcache.o smbd/seal.o \
- smbd/posix_acls.o lib/sysacls.o \
+ smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
smbd/process.o smbd/service.o smbd/error.o \
printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
lib/sysquotas_xfs.o lib/sysquotas_4A.o \
@@ -882,7 +882,7 @@ NET_OBJ = $(NET_OBJ1) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
+ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
$(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
@@ -1044,7 +1044,7 @@ WINBINDD_OBJ = \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
- $(LIBADS_SERVER_OBJ) $(LDB_OBJ)
+ $(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ)
WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
\
$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -1110,7 +1110,7 @@ NTLM_AUTH_OBJ1 = utils/ntlm_auth.o
utils/ntlm_auth_diagnostics.o
NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o
libads/kerberos.o \
- $(LIBADS_SERVER_OBJ) \
+ $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
$(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index de49ed2..80faeb0 100644
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -142,149 +142,6 @@ static int tdbsam_convert_one(struct db_record *rec, void
*priv)
return 0;
}
-/**
- Struct and function to backup an old record.
- */
-
-struct tdbsam_backup_state {
- struct db_context *new_db;
- bool success;
-};
-
-static int backup_copy_fn(struct db_record *orig_rec, void *state)
-{
- struct tdbsam_backup_state *bs = (struct tdbsam_backup_state *)state;
- struct db_record *new_rec;
- NTSTATUS status;
-
- new_rec = bs-new_db-fetch_locked(bs-new_db, talloc_tos(),
orig_rec-key);
- if (new_rec == NULL) {
- bs-success = false;
- return 1;
- }
-
- status = new_rec-store(new_rec, orig_rec-value, TDB_INSERT);
-
- TALLOC_FREE(new_rec);
-
- if (!NT_STATUS_IS_OK(status)) {
- bs-success = false;
-
[SCM] SAMBA-CTDB repository - branch v3-3-ctdb updated - c747ecf791370642fa8491885d9c5304eb06c308
The branch, v3-3-ctdb has been updated
via c747ecf791370642fa8491885d9c5304eb06c308 (commit)
from 9ed0deab46a108eae7f7715ec15764153a926992 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-3-ctdb
- Log -
commit c747ecf791370642fa8491885d9c5304eb06c308
Author: Michael Adam ob...@samba.org
Date: Fri Mar 20 00:47:45 2009 +0100
packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
Michael
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index b257687..e99cfaa 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -211,6 +211,7 @@ mv nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/
mv bin/pam_winbind.so %{_32bit_tmp_dir}/
mv bin/libtalloc.so* %{_32bit_tmp_dir}/
mv bin/libtdb.so* %{_32bit_tmp_dir}/
+mv bin/libwbclient.so* %{_32bit_tmp_dir}/
make clean
@@ -321,6 +322,7 @@ install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so
${RPM_BUILD_ROOT}/lib/libnss_
mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib
mv %{_32bit_tmp_dir}/libtdb* ${RPM_BUILD_ROOT}/usr/lib
+mv %{_32bit_tmp_dir}/libwbclient* ${RPM_BUILD_ROOT}/usr/lib
mv %{_32bit_tmp_dir}/pam_winbind.so ${RPM_BUILD_ROOT}/lib/security
rm -rf %{_32bit_tmp_dir}
@@ -607,6 +609,7 @@ exit 0
#%attr(755,root,root) /lib/libnss_wins.so*
%attr(755,root,root) /usr/lib/libtalloc.so*
%attr(755,root,root) /usr/lib/libtdb.so*
+%attr(755,root,root) /usr/lib/libwbclient.so*
%attr(755,root,root) /lib/security/pam_winbind.so
%endif
--
SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-598-gf696bb8
The branch, master has been updated
via f696bb81f8499443eee9815e7adf8dbb6810506a (commit)
via 653dd024a630af095277f5884add9246da399eb9 (commit)
via 5bfed623f5115a774f47e1cdceed862c53cd40a1 (commit)
via 6906c01cac226db508cd56a31b751eee3ac62bc9 (commit)
via 1dc5b90e86fdee2978f5608f483c3b11c86fb9bc (commit)
from 5fe2b28f45289dc5578cdd536600f0d30a14d820 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f696bb81f8499443eee9815e7adf8dbb6810506a
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 20 16:18:40 2009 +1100
s4: Remove autogenerated attributes from minschema and fullschema output
These attributes will be generated by Samba on import, and do not need
to be in the schema file.
Andrew Bartlett
commit 653dd024a630af095277f5884add9246da399eb9
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 20 16:07:49 2009 +1100
Add minschema like tool to extract and dump the full schema from AD
commit 5bfed623f5115a774f47e1cdceed862c53cd40a1
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 20 13:55:43 2009 +1100
s4:minschma Fix aggregate schema generation in minschema
The conversion from EJS to python I did with Jelmer this morning was
not quite complete, due mostly to the difference between print in EJS
and python (python implies a newline).
Andrew Bartlett
commit 6906c01cac226db508cd56a31b751eee3ac62bc9
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 20 16:25:01 2009 +1100
s4:ldb Ensure to pass down options to LDB from python
This is needed for things such as to load modules, like the
paged_searches module.
Andrew Bartlett
commit 1dc5b90e86fdee2978f5608f483c3b11c86fb9bc
Author: Andrew Bartlett abart...@samba.org
Date: Fri Mar 20 16:26:42 2009 +1100
s4:ldb Fix the paged_searches module
This simplifies the code, removes presumptions about being the only
control in the reply, and allows it to function against Windows 2008.
For searches which did not require a paged result, the module was
simply returning a failure when the compleated search did not include
a paged result control.
Andrew Bartlett
---
Summary of changes:
source4/lib/ldb/modules/paged_searches.c | 109 -
source4/scripting/bin/fullschema | 177
source4/scripting/bin/minschema| 49
source4/scripting/python/samba/__init__.py |6 +-
4 files changed, 254 insertions(+), 87 deletions(-)
create mode 100644 source4/scripting/bin/fullschema
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/modules/paged_searches.c
b/source4/lib/ldb/modules/paged_searches.c
index 01e77cb..70b880e 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -2,6 +2,7 @@
ldb database library
Copyright (C) Simo Sorce 2005-2008
+ Copyright (C) Andrew Bartlett abart...@samba.org 2009
** NOTE! The following LGPL license applies to the ldb
** library. This does NOT imply that all of Samba is released
@@ -52,23 +53,40 @@ struct ps_context {
char **saved_referrals;
int num_referrals;
+
+ struct ldb_request *down_req;
};
-static int check_ps_continuation(struct ldb_request *req, struct ldb_reply
*ares)
+static int check_ps_continuation(struct ps_context *ac, struct ldb_request
*req, struct ldb_reply *ares)
{
- struct ps_context *ac;
- struct ldb_paged_control *rep_control, *req_control;
+ struct ldb_context *ldb;
+ struct ldb_control *rep_control, *req_control;
+ struct ldb_paged_control *paged_rep_control = NULL, *paged_req_control
= NULL;
+ ldb = ldb_module_get_ctx(ac-module);
- ac = talloc_get_type(req-context, struct ps_context);
+ rep_control = ldb_reply_get_control(ares,
LDB_CONTROL_PAGED_RESULTS_OID);
+ if (rep_control) {
+ paged_rep_control = talloc_get_type(rep_control-data, struct
ldb_paged_control);
+ }
- /* look up our paged control */
- if (!ares-controls || strcmp(LDB_CONTROL_PAGED_RESULTS_OID,
ares-controls[0]-oid) != 0) {
- /* something wrong here */
- return LDB_ERR_OPERATIONS_ERROR;
+ req_control = ldb_request_get_control(req,
LDB_CONTROL_PAGED_RESULTS_OID);
+ paged_req_control = talloc_get_type(req_control-data, struct
ldb_paged_control);
+
+ if (!rep_control || !paged_rep_control) {
+ if (paged_req_control-cookie) {
+ /* something wrong here - why give us a control back
befre, but not one now? */
+ ldb_set_errstring(ldb, paged_searches: ERROR: We got
back a control from a previous page, but
