[Samba] A qustion about samba
Hello , I'm a student in Shahed university in IRAN . Now I'm become a member of our uni IT-Center . We are going to have an organized network with a en-bloc user authentication and proxy server. In comparison between MS AD and Samba , i want to choose Samba server ( cause of my belief in Open Source ) . Our plan have a Forest(root : shahed.ac.ir) and trees for faculties (like : eng.shahed.ac.ir , maybe have child ) and maybe for internet-site we may have a new forest (we should have trust between these domains ). In every site we should have DC and SQUID Proxy server ( for control and sharing internet in the best way ) . note : all of our clients have windows XP or se7en . My questions are : can we completely handle our plan with Samba server ? , for replication and trust what we should do ? we should use openLDAP for our plan ? what is your suggestion for what we are going to do ? witch distribution of LINUX is appropriate for our plan ? Best regards . -- M.S.Ansari -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] A qustion about samba
Theoretically yes but: - the official stable Samba 3.x can mimic only NT-style domains - Win7s are no longer able to join NT domains by default (registry hack is needed) - replication using OpenLdap backend could turn into a nightmare (as a standalone server will Samba do fine though) So I would say - if your time is cheap and you are fancy playing with it, then go for it and try it. Otherwise - purchase a license for Active Directory controllers and forget about all problems. Ondrej M.Saeed Ansari wrote: Hello , I'm a student in Shahed university in IRAN . Now I'm become a member of our uni IT-Center . We are going to have an organized network with a en-bloc user authentication and proxy server. In comparison between MS AD and Samba , i want to choose Samba server ( cause of my belief in Open Source ) . Our plan have a Forest(root : shahed.ac.ir) and trees for faculties (like : eng.shahed.ac.ir , maybe have child ) and maybe for internet-site we may have a new forest (we should have trust between these domains ). In every site we should have DC and SQUID Proxy server ( for control and sharing internet in the best way ) . note : all of our clients have windows XP or se7en . My questions are : can we completely handle our plan with Samba server ? , for replication and trust what we should do ? we should use openLDAP for our plan ? what is your suggestion for what we are going to do ? witch distribution of LINUX is appropriate for our plan ? Best regards . -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Windows Server 2008 R2 backup with windows server backup
Backup to a network drive is tricky at best with Windows 2008. It is supposed to work if you use a UNC path instead of a drive letter. Be aware that R2 is actually a quite different animal (Windows 2008 = Vista Server, Windows 2008 R2 = Windows 7 Server) so I am not sure if even that is still supported. Generally, Windows 2008+ backups are best done to a local drive (or with a third-party tool. I am using a combination of a local backup and bacula). -Original Message- From: samba-boun...@lists.samba.org [mailto:samba- boun...@lists.samba.org] On Behalf Of helac Sent: Wednesday, December 09, 2009 5:03 AM To: samba@lists.samba.org Subject: [Samba] Windows Server 2008 R2 backup with windows server backup Hi, I would like to ask if someone has been able to do a backup from Windows Server 2008 [R2] to a Samba share? If I try to do a backup I receive this error: The backup of volume DATA2(E:) could not be completed. Error: The version does not support this version of the file format. == My config is: [global] security = ads password server = servername.domainname.cz encrypt passwords = true workgroup = DOMAINNAME realm = DOMAINNAME.TLD netbios name = backup #idmap backend = ad idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind enum groups = yes winbind use default domain = Yes log level = 2 profile acls = yes nt acl support = yes [mesicek] path = /mnt/backup/server/current/writable browseable = yes read only = no inherit acls = yes inherit permissions = yes create mask = 700 directory mask = 700 admin users = DOMAINNAME\backupad, DOMAINNAME\administrator -- View this message in context: http://old.nabble.com/Windows-Server- 2008-R2-backup-with-windows-server-backup-tp26709809p26709809.html Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] ldap passwd sync problem with slave ldap server
Hello everyone! I'm having problem with the parameter ldap passwd sync = yes. If my ldapsam points to a master ldap server, it works perfectly. If it points to a slave ldap server, the samba attributes are update but not the userpassword. I'm using samba 3.4.3 with Fedora Directory 1.2. Viewing the log files I saw same strange messages when I trying to change my password: [2009/12/08 15:10:42, 5] passdb/pdb_ldap.c:ldapsam_modify_entry(1660) ldapsam_modify_entry: mods is empty: nothing to modify [2009/12/08 15:10:42, 2] passdb/pdb_ldap.c:ldapsam_update_sam_account(1961) ldapsam_update_sam_account: successfully modified uid = test in the LDAP database Thanks, TISDN -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] wbinfo / Could not convert sid to gid / uid
From: roel...@hotmail.com To: samba@lists.samba.org Date: Wed, 9 Dec 2009 11:02:32 +0100 Subject: Re: [Samba] wbinfo / Could not convert sid to gid / uid Date: Tue, 8 Dec 2009 08:55:05 -0700 Subject: Re: [Samba] wbinfo / Could not convert sid to gid / uid From: rob...@leblancnet.us To: roel...@hotmail.com CC: samba@lists.samba.org On Tue, Dec 8, 2009 at 7:55 AM, Georg Roelli wrote: Hello My is environment: Ubuntu 8.04 LTS, Squid 2.6.18, Samba 3.0.28a For Squid I need the query of a global group from Active Directory 2003. This works beautifully, but unfortunately not always. There are global groups which works to transform and others where it does not work. Here are my entries for test: # wbinfo -n nobadurl S-1-5-21-986273330-1409306274-1541874228-9965 Domain Group (2) # wbinfo -Y S-1-5-21-986273330-1409306274-1541874228-9965 Could not convert sid S-1-5-21-986273330-1409306274-1541874228-9965 to gid # wbinfo -n www-Access S-1-5-21-986273330-1409306274-1541874228-2514 Domain Group (2) # wbinfo -Y S-1-5-21-986273330-1409306274-1541874228-2514 10011 I am a little confused. Why the conversion goes for one group but for the other one not? I've tried a lot, unfortunately without success. Is there a log I can turn on what can help me? What is the value wbinfo take out of the AD to convert the SID to UID or GID? Is there another way I can figure out why the conversion does not work? Thanks for your help. Kind regards, G. I would check /var/log/samba/log.winbindd or /var/log/samba/log.wb.. I would suspect that you may have run out of gids allocated to groups (your rang is not big enough). The logs should help you pinpoint the problem though. Robert LeBlanc Life Sciences Undergraduate Education Computer Support Brigham Young University Thanks for the note. I get following results in the logs for those SID which couldn't convert. log.winbindd: [2009/12/09 10:57:14, 3] nsswitch/winbindd_misc.c:winbindd_interface_version(491) [15791]: request interface version [2009/12/09 10:57:14, 3] nsswitch/winbindd_misc.c:winbindd_priv_pipe_dir(524) [15791]: request location of privileged pipe [2009/12/09 10:57:14, 3] nsswitch/winbindd_sid.c:winbindd_sid_to_gid(308) [15791]: sid to gid S-1-5-21-986273330-1409306274-1541874228-9965 log.wb-MYDOM: [2009/12/09 10:57:14, 3] nsswitch/winbindd_async.c:winbindd_dual_lookupsid(754) [21931]: lookupsid S-1-5-21-986273330-1409306274-1541874228-9965 [2009/12/09 10:57:14, 3] nsswitch/winbindd_ads.c:sequence_number(1010) ads: fetch sequence_number for MYDOM [2009/12/09 10:57:14, 3] nsswitch/winbindd_rpc.c:msrpc_sid_to_name(304) sid_to_name [rpc] S-1-5-21-986273330-1409306274-1541874228-9965 for domain MYDOM How can this help us now? Regards, G. Hello I have something very interesting, which would confirm the statement from Robert. Until now I have made all the tests on a virtual clone. Now I have reproduced the installation on the productive system. Here I get a GID for the group nobadurl. Possibly I run out of gids allocated to groups. How do I find out, how great my range for GID must be and how can I change this value. I now there exist to values in the smb.conf. Idmap uid and Idmap gid are now 1-2. I have changed these values one time but without success. I got no GID for the group nobadurl. Who can help me? Kind regards, G. _ Samichlaus und Weihnachts Fotos: direkt im Messenger mit Freunden austauschen http://www.microsoft.com/switzerland/windows/de/windowslive/products/messenger.aspx?tab=2 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba PDC LDAP and LDAP Aliases
Hello all
I've got a problem with unresolved (at least I guess that) LDAP Aliases
and Samba. That's my LDAP Setup:
ou=alvhaus,ou=ch { base }
ou=People,ou=alvhaus,ou=ch { posix and samba accounts }
ou=Group,ou=alvhaus,ou=ch { posix and samba groups }
ou=Samba,ou=alvhaus,ou=ch { samba base dn }
ou=Idmap,ou=Samba,ou=alvhaus,ou=ch
ou=Machines,ou=Samba,ou=alvhaus,ou=ch
ou=PeopleAlias,ou=Samba,ou=alvhaus,ou=ch { that's an alias to
ou=People,ou=alvhaus,ou=ch }
ou=GroupAlias,ou=Samba,ou=alvhaus,ou=ch { that's an alias to
ou=Group,ou=alvhaus,ou=ch }
ldapsearch -h MYHOST -D uid=Account Admin,ou=System
Accounts,dc=alvhaus,dc=ch -W -b ou=Samba,dc=alvhaus,dc=ch -a search
-s one
The output of ldapsearch is right! The aliases are correctly resolved
(controled by the -a search parameter)
# People, alvhaus.ch
dn: ou=People,dc=alvhaus,dc=ch
objectClass: organizationalUnit
ou: People
# Group, alvhaus.ch
dn: ou=Group,dc=alvhaus,dc=ch
objectClass: organizationalUnit
ou: Group
# Idmap, Samba, alvhaus.ch
dn: ou=Idmap,ou=Samba,dc=alvhaus,dc=ch
objectClass: organizationalUnit
ou: Idmap
# Machines, Samba, alvhaus.ch
dn: ou=Machines,ou=Samba,dc=alvhaus,dc=ch
objectClass: organizationalUnit
ou: Machines
# FILESERV, Samba, alvhaus.ch
dn: sambaDomainName=FILESERV,ou=Samba,dc=alvhaus,dc=ch
sambaAlgorithmicRidBase: 1000
objectClass: sambaDomain
... more
My smb.conf
ldap admin dn = uid=Account Admin,ou=System
Accounts,dc=alvhaus,dc=ch
ldap group suffix = ou=Group
ldap idmap suffix = ou=Idmap
ldap machine suffix = ou=Machines
ldap passwd sync = yes
ldap suffix = ou=Samba,dc=alvhaus,dc=ch
ldap ssl = no
ldap user suffix = ou=People
For me it looks right! And it's also working, if People and Group aren't
aliased. So I guess samba pdc is not resolving aliases.
Version 3.4.0
-Ivo Steinmann
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
[Samba] dns lookups for SRV kerberos
Hi,
I have raised this question on the kerberos mailing list, but have been told
that Samba has it's own behavior regarding SRV lookups.
My configuration uses the following :
dns_lookup_realm = false
dns_lookup_kdc = false
[realms]
EXAMPLE.DOM = {
kdc = 10.0.0.1:88
kdc = 10.0.0.2:88
admin_server = 10.0.0.1:749
default_domain = example.dom
}
but I still see the DNS lookups for SRV _kerberos-master_udp
( same with kdc = adserver1.example.dom.:88 )
To be precise, the following happens (We don't have these records in the DNS
system) :
ASREQ -
- KRBERR PREAUTH
DNS SRV _kerberos-master -
- no such name
ASREQ -
- AS REP OK
DNS SRV _kerberos-master -
- no such name
TGSREQ -
- TGSREP
DNS SRV _kerberos-master -
- no such name
that makes 3 DNS lookups per TGS.
As I have excplicitly configured :
A) dns_lookups to false
B) numerical IP addresses for the KDC's
I would expect dns lookups to be completely *non-existant*.
Are my expectations correct, or is there something in the protocol that I missed
, that would need to enforce dns lookups even if configured not to ? Or maybe I
have misconfigured krb5.conf ? It seems that Samba would not look into this
file.
Can it be configured elsewhere ?
Same behaviour with numerical ipp addresses for password server
Why I am looking into this is because I use kerberos for AD authentication,
through winbind.
Our configuration (typical for an AD infrastructure) is to have 2 DC's, which
are KDC's as well as DNS servers.
What happens when the primary DC is unavailable is that both the primary KDC and
the primary DNS are down.
Timeouts summing up, the result in a default RHEL5 configuration is to have
wbinto -t take 21 seconds to accomplish.
(3*5s DNS timeouts + 3*2s KDC timeouts)
For the moment, DNS Timeout can be lowered to 1s but not less.
Still, I don't understand why these DNS lookups are made at all with this
configuration.
Has anyone an explanation ?
using
krb5-libs-1.6.1-36.el5
samba-3.0.33-3.15.el5_4
on RHEL 5.4
Regards,
Andrew
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] wbinfo / Could not convert sid to gid / uid
On Thu, Dec 10, 2009 at 6:21 AM, Georg Roelli roel...@hotmail.com wrote Hello I have something very interesting, which would confirm the statement from Robert. Until now I have made all the tests on a virtual clone. Now I have reproduced the installation on the productive system. Here I get a GID for the group nobadurl. Possibly I run out of gids allocated to groups. How do I find out, how great my range for GID must be and how can I change this value. I now there exist to values in the smb.conf. Idmap uid and Idmap gid are now 1-2. I have changed these values one time but without success. I got no GID for the group nobadurl. Who can help me? Kind regards, G. The logs didn't seem to give any additional info. Do you have less than 10,000 groups in your AD? You can set that as high as you want. You will need to restart the winbind service. You probably do NOT want to clear the id cache, this will mess up your old rids. We use idmap_hash which has 10 digits in the id and gid, so you can go very high, you just have to be careful that some apps don't have problems. We only found a problem with a database that stored the uid and it wasn't wide enough. Robert LeBlanc Life Sciences Undergraduate Education Computer Support Brigham Young University -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] mv renames the wrong file
Hi, Using Samba 3.4.3 server on Ubuntu 9.10 (compiled myself, since Ubuntu came with Samba 3.4.0). Sometimes, mv commands don't do what I asked for! This morning, I was in my Videos share, in the Movies/Baby Einstein Mozart/ directory. (I have the share mounted locally in /mnt/samba/Videos, on the same machine where samba server runs on.) I issued the following command: mv 10BE_BABY_MOZART.avi ../../Soline/Baby\ Einstein/Baby\ Mozart.avi Here's what extd_audit logged for that: vfs_extd_audit: rename ./Movies - Soline/Baby Einstein/Baby Mozart.avi And it indeed did what the log says it did; it moved my complete Movies folder into a new folder named Soline/Baby Einstein/Baby Mozart.avi/ But that wasn't what I asked for!! Maybe this is a bug in the CIFS library used in Ubuntu to mount shares? I didn't hit this bug when renaming files on my shares using other computers; the only time I reproduced it (unintentionally) (and it happened 3-4 times in the last days) is when I used the mv command in the shares I mounted locally on the server. I seem to remember that when it happened in the past, instead of renaming the file like I asked for, it moved the parent folder at the target location... Example: cd dir1; mv filename1 ../dir2/filename2 Would result in dir1 being renamed dir2/filename2/ and it would still contain filename1. Any pointers? (Should I post in the Ubuntu forums instead of here?) Thanks, Guillaume Boudreau PS I checked my history to make sure I did issue the correct command, in the right directory, and I did: 834 cd samba/ 835 cd Videos/Movies 836 cd Baby\ Einstein\ \ \ Mozart/ 837 ls -l 838 mv 10BE_BABY_MOZART.avi ../../Soline/Baby\ Einstein/Baby\ Mozart.avi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Regedit
On Tue, Dec 8, 2009 at 4:40 PM, Nick Pappin npap...@latahfcu.org wrote: Hey Everyone, So here is what is going on I have two computers on the same network that are both connected to the PDC of a samba domain (on the same network segment): | | | | | | _ ___ | comp1 | | comp2| | PDC | --- --- -- Now when i try to connect to the registry of comp1 from comp2 I get an error saying i don't have permission to connect using the domain administrator account. This also coincides with a name mismatch error: [2009/12/08 16:10:43, 0] lib/util_sock.c:matchname(1721) matchname: host name/name mismatch: FOO != FOO.bar.com Could this be causing my problem and how should I troubleshoot this problem. Any ideas would be greatly appreciated. Thanks, Nick Hi everyone, I have fixed the mismatch error but it still isn't working I was hoping someone could help me. From what I can tell in the logs I am authenticating on the machine however then I see a wrong password entry. Could someone please explain to me what is going on. I have attached a level 2 log file if you need higher I can do that as well. [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_group_from_ldap(2366) init_group_from_ldap: Entry found for group: 512 [2009/12/10 11:21:49, 2] auth/auth.c:check_ntlm_password(308) check_ntlm_password: authentication for user [root] - [root] - [root] succeeded [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:49, 0] lib/util_sock.c:matchname(1749) matchname: host name/address mismatch: :::192.168.1.200 != it0 [2009/12/10 11:21:49, 0] lib/util_sock.c:get_peer_name(1870) Matchname failed on it0 :::192.168.1.200 [2009/12/10 11:21:49, 2] rpc_server/srv_samr_nt.c:_samr_LookupDomain(3456) Returning domain sid for domain LATAHFCU - S-1-5-21-2238568125-4161709326-2298815865 [2009/12/10 11:21:49, 2] rpc_server/srv_samr_nt.c:_samr_LookupDomain(3456) Returning domain sid for domain LATAHFCU - S-1-5-21-2238568125-4161709326-2298815865 [2009/12/10 11:21:49, 2] rpc_server/srv_samr_nt.c:_samr_LookupDomain(3456) Returning domain sid for domain LATAHFCU - S-1-5-21-2238568125-4161709326-2298815865 [2009/12/10 11:21:49, 2] rpc_server/srv_samr_nt.c:_samr_LookupDomain(3456) Returning domain sid for domain LATAHFCU - S-1-5-21-2238568125-4161709326-2298815865 [2009/12/10 11:21:49, 2] smbd/sesssetup.c:setup_new_vc_session(1368) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2009/12/10 11:21:49, 2] smbd/sesssetup.c:setup_new_vc_session(1368) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2009/12/10 11:21:49, 2] lib/smbldap.c:smbldap_open_connection(856) smbldap_open_connection: connection opened [2009/12/10 11:21:49, 2] lib/module.c:do_smb_load_module(64) Module '/usr/lib64/samba/vfs/full_audit.so' loaded [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_ldap_from_sam(1128) init_ldap_from_sam: Setting entry for user: root [2009/12/10 11:21:49, 2] auth/auth.c:check_ntlm_password(318) check_ntlm_password: Authentication for user [Administrator] - [root] FAILED with error NT_STATUS_WRONG_PASSWORD [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_group_from_ldap(2366) init_group_from_ldap: Entry found for group: 512 [2009/12/10 11:21:49, 2] auth/auth.c:check_ntlm_password(308) check_ntlm_password: authentication for user [root] - [root] - [root] succeeded [2009/12/10 11:21:49, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:49, 2] auth/auth.c:check_ntlm_password(308) check_ntlm_password: authentication for user [root] - [root] - [root] succeeded [2009/12/10 11:21:54, 2] passdb/pdb_ldap.c:init_sam_from_ldap(571) init_sam_from_ldap: Entry found for user: root [2009/12/10 11:21:54, 2] passdb/pdb_ldap.c:init_ldap_from_sam(1128) init_ldap_from_sam: Setting entry for user: root [2009/12/10 11:21:54, 2] auth/auth.c:check_ntlm_password(318) check_ntlm_password: Authentication for user [Administrator] - [root] FAILED with error NT_STATUS_WRONG_PASSWORD Thank you for your time,
Re: [Samba] Samba PDC LDAP and LDAP Aliases
On 2009-12-10 at 14:40 +0100 Ivo Steinmann sent off: For me it looks right! And it's also working, if People and Group aren't aliased. So I guess samba pdc is not resolving aliases. іn the next samba release (not yet in 3.5 ...) you'll be able to tell samba whether and how to do alias dereferencing. But you should be able to tell the ldap library to do that by default, too - see ldap.conf(5). That would also make your -a option in ldapsearch obsolete. Cheers Björn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.4.2 Winbind problem IDMAP GID range full
Greg wrote: [2009/12/08 16:41:48, 0] winbindd/idmap_tdb.c:341(idmap_tdb_alloc_init) idmap will be unable to map foreign SIDs: NT_STATUS_UNSUCCESSFUL Test a users SID to UID mapping: # /apps/samba/bin/wbinfo -n SOMEUSER S-1-5-21-3147950943-2271782263-395470419-4610 User (1) # /apps/samba/bin/wbinfo -S S-1-5-21-3147950943-2271782263-395470419-4610 46318 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.4.2 Winbind problem IDMAP GID range full
Test a users SID to UID mapping: # /apps/samba/bin/wbinfo -n SOMEUSER S-1-5-21-3147950943-2271782263-395470419-4610 User (1) # /apps/samba/bin/wbinfo -S S-1-5-21-3147950943-2271782263-395470419-4610 46318 That works fine. I'm using a local user name, it resolved the NT style SID which could then resolve the local UID. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] disabling extended security attributes
Hello: Can someone please let me know how to disable Extended Security Negotiation from samba server. Either using config file or just comment it out in C code... I'm running 3.0.25. Thanks a lot! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] disabling extended security attributes
On Thu, Dec 10, 2009 at 04:54:37PM -0800, Learner Study wrote: Can someone please let me know how to disable Extended Security Negotiation from samba server. Either using config file or just comment it out in C code... I'm running 3.0.25. use spnego = no Volker signature.asc Description: Digital signature -- 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 v3-4-test updated
The branch, v3-4-test has been updated
via 0a3b576... s3:pdb_ldap: Fix large paged search.
via a6d9c21... fix bogus out of memory winbind msg
from 886a90c... s3 aclocal.m4: Fix iconv checks, clean up m4 code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 0a3b576c0a4298cbe600ad8943e401e3a0639359
Author: Volker Lendecke v...@samba.org
Date: Mon May 18 16:04:04 2009 +0200
s3:pdb_ldap: Fix large paged search.
Fix bug #6981 (Paged Search with DirX LDAP server broken).
commit a6d9c2161859fff61bdd0539d9428615da3da655
Author: Volker Lendecke v...@samba.org
Date: Wed May 13 10:12:26 2009 +0200
fix bogus out of memory winbind msg
Fix bug #6982 (Erroneous out of memory error path in lookup_sid).
---
Summary of changes:
source3/passdb/pdb_ldap.c |1 +
source3/rpc_client/cli_lsarpc.c |3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 71d4030..6a5c96f 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4336,6 +4336,7 @@ static bool ldapsam_search_nextpage(struct pdb_search
*search)
if (state-current_entry == NULL) {
ldap_msgfree(state-entries);
state-entries = NULL;
+ return false;
}
return True;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index d49fa47..74fd082 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -232,7 +232,8 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct
rpc_pipe_client *cli,
} else {
(names)[i] = NULL;
}
- (domains)[i] = talloc_strdup(mem_ctx, dom_name);
+ domains[i] = talloc_strdup(
+ mem_ctx, dom_name ? dom_name : );
(types)[i] = lsa_names.names[i].sid_type;
if (((domains)[i] == NULL)) {
DEBUG(0, (cli_lsa_lookup_sids_noalloc(): out
of memory\n));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b5011ba... s3:packaging: Fix typo in comment. from c59372b... s4-ldb: fixed 2 bugs in ldb_dn_set_extended_component() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b5011ba2c897fa177f1e22dde075055b9ffd271d Author: Karolin Seeger ksee...@samba.org Date: Thu Dec 10 14:08:43 2009 +0100 s3:packaging: Fix typo in comment. Karolin --- Summary of changes: packaging/RHEL/makerpms.sh.tmpl |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl index 93d2d82..03e56f5 100644 --- a/packaging/RHEL/makerpms.sh.tmpl +++ b/packaging/RHEL/makerpms.sh.tmpl @@ -16,7 +16,7 @@ EXTRA_OPTIONS=$1 SPECDIR=`rpm --eval %_specdir` SRCDIR=`rpm --eval %_sourcedir` -# At this point the SPECDIR and SRCDIR vaiables must have a value! +# At this point the SPECDIR and SRCDIR variables must have a value! USERID=`id -u` GRPID=`id -g` -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 3b812b1... s3:packaging: Fix typo in comment. from fa57272... s3: check for PAM_RADIO_TYPE. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 3b812b134d819097df51bb20bdb4fd856f4ad00d Author: Karolin Seeger ksee...@samba.org Date: Thu Dec 10 14:08:43 2009 +0100 s3:packaging: Fix typo in comment. Karolin (cherry picked from commit b5011ba2c897fa177f1e22dde075055b9ffd271d) --- Summary of changes: packaging/RHEL/makerpms.sh.tmpl |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl index 93d2d82..03e56f5 100644 --- a/packaging/RHEL/makerpms.sh.tmpl +++ b/packaging/RHEL/makerpms.sh.tmpl @@ -16,7 +16,7 @@ EXTRA_OPTIONS=$1 SPECDIR=`rpm --eval %_specdir` SRCDIR=`rpm --eval %_sourcedir` -# At this point the SPECDIR and SRCDIR vaiables must have a value! +# At this point the SPECDIR and SRCDIR variables must have a value! USERID=`id -u` GRPID=`id -g` -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via c504e7f... s3:packaging: Fix typo in comment. from 0a3b576... s3:pdb_ldap: Fix large paged search. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit c504e7f0d464944836d04db3f288ee786431b553 Author: Karolin Seeger ksee...@samba.org Date: Thu Dec 10 14:08:43 2009 +0100 s3:packaging: Fix typo in comment. Karolin (cherry picked from commit b5011ba2c897fa177f1e22dde075055b9ffd271d) (cherry picked from commit 3b812b134d819097df51bb20bdb4fd856f4ad00d) --- Summary of changes: packaging/RHEL/makerpms.sh.tmpl |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl index 93d2d82..03e56f5 100644 --- a/packaging/RHEL/makerpms.sh.tmpl +++ b/packaging/RHEL/makerpms.sh.tmpl @@ -16,7 +16,7 @@ EXTRA_OPTIONS=$1 SPECDIR=`rpm --eval %_specdir` SRCDIR=`rpm --eval %_sourcedir` -# At this point the SPECDIR and SRCDIR vaiables must have a value! +# At this point the SPECDIR and SRCDIR variables must have a value! USERID=`id -u` GRPID=`id -g` -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 85e79a2... s3:packaging: Fix source dir.
from b5011ba... s3:packaging: Fix typo in comment.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 85e79a2a03e8c1c6275363c39b0fa71283214562
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:26:58 2009 +0100
s3:packaging: Fix source dir.
Karolin
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index a8cb477..1b31648 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -29,7 +29,7 @@ GRPID=`id -g`
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
VERSION_H=${SRCDIR}/include/version.h
SPECFILE=samba.spec
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 1ed3172... s3:packaging: Fix source dir.
from 3b812b1... s3:packaging: Fix typo in comment.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 1ed3172d10ca96816ec548996953579ec55da660
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:26:58 2009 +0100
s3:packaging: Fix source dir.
Karolin
(cherry picked from commit 85e79a2a03e8c1c6275363c39b0fa71283214562)
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index a8cb477..1b31648 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -29,7 +29,7 @@ GRPID=`id -g`
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
VERSION_H=${SRCDIR}/include/version.h
SPECFILE=samba.spec
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via f39cde6... s3:packaging: Fix source dir.
from c504e7f... s3:packaging: Fix typo in comment.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit f39cde691c0f19d8851b056d5f625967155d35cf
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:26:58 2009 +0100
s3:packaging: Fix source dir.
Karolin
(cherry picked from commit 85e79a2a03e8c1c6275363c39b0fa71283214562)
(cherry picked from commit 1ed3172d10ca96816ec548996953579ec55da660)
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index a8cb477..1b31648 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -29,7 +29,7 @@ GRPID=`id -g`
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
VERSION_H=${SRCDIR}/include/version.h
SPECFILE=samba.spec
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 56b754e... Implementation of sDRightsEffective,
allowedAttributesEffective and allowedChildClassesEffective.
from 85e79a2... s3:packaging: Fix source dir.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 56b754e09ad5cd926e1dd0747252b7c359294938
Author: Nadezhda Ivanova nadezhda.ivan...@postpath.com
Date: Thu Dec 10 15:49:53 2009 +0200
Implementation of sDRightsEffective, allowedAttributesEffective and
allowedChildClassesEffective.
Behavior as documented in WSPP and tested. Needs optimisation though.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/acl.c | 650 ++--
source4/dsdb/samdb/ldb_modules/kludge_acl.c|5 +-
source4/lib/ldb/tests/python/sec_descriptor.py | 127 +-
3 files changed, 738 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/acl.c
b/source4/dsdb/samdb/ldb_modules/acl.c
index 13e71e5..45aa294 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -1,22 +1,22 @@
/*
- ldb database library
+ ldb database library
- Copyright (C) Simo Sorce 2006-2008
- Copyright (C) Nadezhda Ivanova 2009
- Copyright (C) Anatoliy Atanasov 2009
+ Copyright (C) Simo Sorce 2006-2008
+ Copyright (C) Nadezhda Ivanova 2009
+ Copyright (C) Anatoliy Atanasov 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
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ 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.
+ 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/.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
*/
/*
@@ -45,8 +45,21 @@ struct extended_access_check_attribute {
const uint32_t requires_rights;
};
-struct acl_private{
- bool perform_check;
+struct acl_private {
+ bool acl_perform;
+ const char **password_attrs;
+};
+
+struct acl_context {
+ struct ldb_module *module;
+ struct ldb_request *req;
+ enum security_user_level user_type;
+ bool allowedAttributes;
+ bool allowedAttributesEffective;
+ bool allowedChildClasses;
+ bool allowedChildClassesEffective;
+ bool sDRightsEffective;
+ const char * const *attrs;
};
bool is_root_base_dn(struct ldb_context *ldb, struct ldb_dn *dn_to_check)
@@ -80,7 +93,12 @@ static int acl_module_init(struct ldb_module *module)
{
struct ldb_context *ldb;
struct acl_private *data;
- int ret;
+ int ret, i;
+ TALLOC_CTX *mem_ctx = talloc_new(module);
+ static const char *attrs[] = { passwordAttribute, NULL };
+ struct ldb_result *res;
+ struct ldb_message *msg;
+ struct ldb_message_element *password_attributes;
ldb = ldb_module_get_ctx(module);
@@ -92,22 +110,69 @@ static int acl_module_init(struct ldb_module *module)
}
data = talloc(module, struct acl_private);
- data-perform_check = lp_parm_bool(ldb_get_opaque(ldb, loadparm),
- NULL, acl, perform, false);
+ if (data == NULL) {
+ ldb_oom(ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ data-password_attrs = NULL;
+ data-acl_perform = lp_parm_bool(ldb_get_opaque(ldb, loadparm),
+NULL, acl, perform, false);
ldb_module_set_private(module, data);
+ if (!mem_ctx) {
+ ldb_oom(ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ret = ldb_search(ldb, mem_ctx, res,
+ldb_dn_new(mem_ctx, ldb, @KLUDGEACL),
+LDB_SCOPE_BASE, attrs, NULL);
+ if (ret != LDB_SUCCESS) {
+ goto done;
+ }
+ if
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0604c69... s3:packaging: Fix version detection.
from 56b754e... Implementation of sDRightsEffective,
allowedAttributesEffective and allowedChildClassesEffective.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0604c696a05773a439538d88f1b45aa6637766a7
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:57:08 2009 +0100
s3:packaging: Fix version detection.
Adapted from 728b01fc03.
Thanks god I was not root! It would have delted /*!
Karolin
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index 1b31648..68f9d96 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -61,8 +61,8 @@ if [ ! -f ${VERSION_H} ] ; then
exit 1
fi
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print
$3}'`
+VERSION=`grep ^#define SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk
'{print $3}'`
+vendor_version=`grep ^#define SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} |
awk '{print $3}'`
if test x${vendor_version} != x ; then
VERSION=${VERSION}-${vendor_version}
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via fd30552... s3:packaging: Fix version detection.
from 1ed3172... s3:packaging: Fix source dir.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit fd30552aab88572b2d5944b9b87ee8ca76d29b35
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:57:08 2009 +0100
s3:packaging: Fix version detection.
Adapted from 728b01fc03.
Thanks god I was not root! It would have delted /*!
Karolin
(cherry picked from commit 0604c696a05773a439538d88f1b45aa6637766a7)
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index 1b31648..68f9d96 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -61,8 +61,8 @@ if [ ! -f ${VERSION_H} ] ; then
exit 1
fi
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print
$3}'`
+VERSION=`grep ^#define SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk
'{print $3}'`
+vendor_version=`grep ^#define SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} |
awk '{print $3}'`
if test x${vendor_version} != x ; then
VERSION=${VERSION}-${vendor_version}
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via 24f3fb1... s3:packaging: Fix version detection.
from f39cde6... s3:packaging: Fix source dir.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 24f3fb1395673883e4435ffbf999b2f309c35306
Author: Karolin Seeger ksee...@samba.org
Date: Thu Dec 10 14:57:08 2009 +0100
s3:packaging: Fix version detection.
Adapted from 728b01fc03.
Thanks god I was not root! It would have delted /*!
Karolin
(cherry picked from commit 0604c696a05773a439538d88f1b45aa6637766a7)
(cherry picked from commit fd30552aab88572b2d5944b9b87ee8ca76d29b35)
---
Summary of changes:
packaging/RHEL/makerpms.git.sh |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index 1b31648..68f9d96 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -61,8 +61,8 @@ if [ ! -f ${VERSION_H} ] ; then
exit 1
fi
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print
$3}'`
+VERSION=`grep ^#define SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk
'{print $3}'`
+vendor_version=`grep ^#define SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} |
awk '{print $3}'`
if test x${vendor_version} != x ; then
VERSION=${VERSION}-${vendor_version}
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 835e7d6... spoolss: remove unused spoolss_StringArray2.
via ce33967... s4-smbtorture: fix and extend enum printerkey test.
via f20effc... s3-spoolss: fix enumprinter key client and server.
via fa413d1... s3: re-run make samba3-idl.
via 0ecb7f6... spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
via cf25614... spoolss: add spoolss_KeyNames union.
from 0604c69... s3:packaging: Fix version detection.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 835e7d6c98406725dc9dab891d3025b9a11b7eb9
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:23:49 2009 +0100
spoolss: remove unused spoolss_StringArray2.
Guenther
commit ce33967f4a6a762e97a87513df7d33716db689fb
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:21:12 2009 +0100
s4-smbtorture: fix and extend enum printerkey test.
Guenther
commit f20effc437970d826c5bd4f047ff47e23e7a1a73
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:20:22 2009 +0100
s3-spoolss: fix enumprinter key client and server.
Guenther
commit fa413d167bc3ea9aff3dcff97152ef07a1173939
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:27:33 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 0ecb7f6ab28d7b7c1844554289f5ae8e876b1dcf
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:19:28 2009 +0100
spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
Guenther
commit cf2561473f7bd0bcef5c562c1e901d4ad17e6ee3
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 14:18:46 2009 +0100
spoolss: add spoolss_KeyNames union.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c|9 ++-
librpc/gen_ndr/cli_spoolss.h|6 +-
librpc/gen_ndr/ndr_spoolss.c| 145 ---
librpc/gen_ndr/ndr_spoolss.h|4 +-
librpc/gen_ndr/spoolss.h| 12 ++--
librpc/gen_ndr/srv_spoolss.c| 15 +++-
librpc/idl/spoolss.idl | 14 ++--
librpc/ndr/ndr_spoolss_buf.c| 65
librpc/ndr/ndr_spoolss_buf.h|3 -
source3/rpc_client/cli_spoolss.c|7 +-
source3/rpc_server/srv_spoolss_nt.c | 13 +++-
source4/torture/rpc/spoolss.c | 58 +++---
source4/torture/rpc/spoolss_win.c | 12 +--
13 files changed, 237 insertions(+), 126 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index e63a781..c6bb8ed 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -12207,7 +12207,8 @@ struct tevent_req
*rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client
*cli,
struct policy_handle
*_handle /* [in] [ref] */,
const char *_key_name /*
[in] [charset(UTF16)] */,
- struct
spoolss_StringArray2 *_key_buffer /* [out] [ref] */,
+ uint32_t *__ndr_size /*
[out] [ref] */,
+ union spoolss_KeyNames
*_key_buffer /* [out]
[subcontext_size(*_ndr_size*2),ref,subcontext(0),switch_is(*_ndr_size)] */,
uint32_t _offered /* [in]
*/,
uint32_t *_needed /*
[out] [ref] */)
{
@@ -12229,6 +12230,7 @@ struct tevent_req
*rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
state-orig.in.offered = _offered;
/* Out parameters */
+ state-orig.out._ndr_size = __ndr_size;
state-orig.out.key_buffer = _key_buffer;
state-orig.out.needed = _needed;
@@ -12278,6 +12280,7 @@ static void rpccli_spoolss_EnumPrinterKey_done(struct
tevent_req *subreq)
}
/* Copy out parameters */
+ *state-orig.out._ndr_size = *state-tmp.out._ndr_size;
*state-orig.out.key_buffer = *state-tmp.out.key_buffer;
*state-orig.out.needed = *state-tmp.out.needed;
@@ -12317,7 +12320,8 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in]
[ref] */,
const char *key_name /* [in]
[charset(UTF16)] */,
- struct spoolss_StringArray2 *key_buffer
/* [out] [ref] */,
+ uint32_t *_ndr_size /* [out] [ref] */,
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6683644... s3: add LDAP Alias Dereferencing support
from 835e7d6... spoolss: remove unused spoolss_StringArray2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 66836445a2d5fde1e82eae7fc2f6a6ee86a6c468
Author: Björn Jacke b...@sernet.de
Date: Thu Dec 10 21:00:26 2009 +0100
s3: add LDAP Alias Dereferencing support
Thanks to Dan Cox for initial patch for 3.0. This closes #2350.
---
Summary of changes:
source3/lib/smbldap.c| 11 +++
source3/param/loadparm.c | 20
2 files changed, 31 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index f7ca1c1..4727c15 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -877,6 +877,7 @@ static int smbldap_open_connection (struct smbldap_state
*ldap_state)
{
int rc = LDAP_SUCCESS;
int version;
+ int deref;
LDAP **ldap_struct = ldap_state-ldap_struct;
rc = smb_ldap_setup_conn(ldap_struct, ldap_state-uri);
@@ -902,6 +903,16 @@ static int smbldap_open_connection (struct smbldap_state
*ldap_state)
return rc;
}
+ /* Set alias dereferencing method */
+ deref = lp_ldap_deref();
+ if (deref != -1) {
+ if (ldap_set_option (*ldap_struct, LDAP_OPT_DEREF, deref) !=
LDAP_OPT_SUCCESS) {
+ DEBUG(1,(smbldap_open_connection: Failed to set
dereferencing method: %d\n, deref));
+ } else {
+ DEBUG(5,(Set dereferencing method: %d\n, deref));
+ }
+ }
+
DEBUG(2, (smbldap_open_connection: connection opened\n));
return rc;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d6d78c8..38cad7c 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -259,6 +259,7 @@ struct global {
char *szLdapGroupSuffix;
int ldap_ssl;
bool ldap_ssl_ads;
+ int ldap_deref;
int ldap_follow_referral;
char *szLdapSuffix;
char *szLdapAdminDn;
@@ -746,6 +747,14 @@ static const struct enum_list enum_ldap_ssl[] = {
{-1, NULL}
};
+static const struct enum_list enum_ldap_deref[] = {
+ {LDAP_DEREFERENCE_NEVER, never},
+ {LDAP_DEREFERENCE_SEARCHING, searching},
+ {LDAP_DEREFERENCE_FINDING, finding},
+ {LDAP_DEREFERENCE_ALWAYS, always},
+ {-1, NULL}
+};
+
static const struct enum_list enum_ldap_passwd_sync[] = {
{LDAP_PASSWD_SYNC_OFF, no},
{LDAP_PASSWD_SYNC_OFF, off},
@@ -3671,6 +3680,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = ldap deref,
+ .type = P_ENUM,
+ .p_class= P_GLOBAL,
+ .ptr= Globals.ldap_deref,
+ .special= NULL,
+ .enum_list = enum_ldap_deref,
+ .flags = FLAG_ADVANCED,
+ },
+ {
.label = ldap follow referral,
.type = P_ENUM,
.p_class= P_GLOBAL,
@@ -5064,6 +5082,7 @@ static void init_globals(bool first_time_only)
string_set(Globals.szLdapAdminDn, );
Globals.ldap_ssl = LDAP_SSL_START_TLS;
Globals.ldap_ssl_ads = False;
+ Globals.ldap_deref = LDAP_DEREFERENCE_NEVER;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
@@ -5418,6 +5437,7 @@ FN_GLOBAL_STRING(lp_ldap_suffix, Globals.szLdapSuffix)
FN_GLOBAL_STRING(lp_ldap_admin_dn, Globals.szLdapAdminDn)
FN_GLOBAL_INTEGER(lp_ldap_ssl, Globals.ldap_ssl)
FN_GLOBAL_BOOL(lp_ldap_ssl_ads, Globals.ldap_ssl_ads)
+FN_GLOBAL_INTEGER(lp_ldap_deref, Globals.ldap_deref)
FN_GLOBAL_INTEGER(lp_ldap_follow_referral, Globals.ldap_follow_referral)
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, Globals.ldap_passwd_sync)
FN_GLOBAL_BOOL(lp_ldap_delete_dn, Globals.ldap_delete_dn)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via faccec7... s3: keep subsecond times on cross-filesystem moves and
don't follow links
from fd30552... s3:packaging: Fix version detection.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit faccec7b97b469b170932f27d8b7e0baf985a909
Author: Björn Jacke b...@sernet.de
Date: Wed Dec 9 02:06:17 2009 +0100
s3: keep subsecond times on cross-filesystem moves and don't follow links
---
Summary of changes:
source3/modules/vfs_default.c | 22 ++
1 files changed, 22 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index ded4b1a..6e2a571 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -540,6 +540,27 @@ static int copy_reg(const char *source, const char *dest)
return -1;
/* Try to copy the old file's modtime and access time. */
+#if defined(HAVE_UTIMENSAT)
+ {
+ struct timespec ts[2];
+
+ ts[0] = source_stats.st_ex_atime;
+ ts[1] = source_stats.st_ex_mtime;
+ utimensat(AT_FDCWD, dest, ts, AT_SYMLINK_NOFOLLOW);
+ }
+#elif defined(HAVE_UTIMES)
+ {
+ struct timeval tv[2];
+
+ tv[0] = convert_timespec_to_timeval(source_stats.st_ex_atime);
+ tv[1] = convert_timespec_to_timeval(source_stats.st_ex_mtime);
+#ifdef HAVE_LUTIMES
+ lutimes(dest, tv);
+#else
+ utimes(dest, tv);
+#endif
+ }
+#elif defined(HAVE_UTIME)
{
struct utimbuf tv;
@@ -547,6 +568,7 @@ static int copy_reg(const char *source, const char *dest)
tv.modtime =
convert_timespec_to_time_t(source_stats.st_ex_mtime);
utime(dest, tv);
}
+#endif
if (unlink (source) == -1)
return -1;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e92b034... s3: make own defines for ldap deref types
from 6683644... s3: add LDAP Alias Dereferencing support
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e92b034d8a830e36a353b4c9dee64af2f1dadc00
Author: Björn Jacke b...@sernet.de
Date: Thu Dec 10 22:22:54 2009 +0100
s3: make own defines for ldap deref types
there are too many naming clashes between different ldap libs and ldb libs.
Let's simply make our own defines. The numbers are well standarized. This
also
makes the default for ldap deref be default which means we won't tell
the
ldap library what to do. Ð
o by default it's all up to what the server and
our
libs think they should to do.
---
Summary of changes:
source3/param/loadparm.c | 18 --
1 files changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 38cad7c..de31e91 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -747,12 +747,18 @@ static const struct enum_list enum_ldap_ssl[] = {
{-1, NULL}
};
+/* LDAP Dereferencing Alias types */
+#define SAMBA_LDAP_DEREF_NEVER 0
+#define SAMBA_LDAP_DEREF_SEARCHING 1
+#define SAMBA_LDAP_DEREF_FINDING 2
+#define SAMBA_LDAP_DEREF_ALWAYS3
+
static const struct enum_list enum_ldap_deref[] = {
- {LDAP_DEREFERENCE_NEVER, never},
- {LDAP_DEREFERENCE_SEARCHING, searching},
- {LDAP_DEREFERENCE_FINDING, finding},
- {LDAP_DEREFERENCE_ALWAYS, always},
- {-1, NULL}
+ {SAMBA_LDAP_DEREF_NEVER, never},
+ {SAMBA_LDAP_DEREF_SEARCHING, searching},
+ {SAMBA_LDAP_DEREF_FINDING, finding},
+ {SAMBA_LDAP_DEREF_ALWAYS, always},
+ {-1, default}
};
static const struct enum_list enum_ldap_passwd_sync[] = {
@@ -5082,7 +5088,7 @@ static void init_globals(bool first_time_only)
string_set(Globals.szLdapAdminDn, );
Globals.ldap_ssl = LDAP_SSL_START_TLS;
Globals.ldap_ssl_ads = False;
- Globals.ldap_deref = LDAP_DEREFERENCE_NEVER;
+ Globals.ldap_deref = -1;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 31202a9... s3-selftest: enable RPC-SAMBA3-WINREG.
via c2618d2... s3-rpcclient: allow to set offered size for enumkey
command.
via dc71d1c... s4-smbtorture: add more spoolss_EnumPrinterKey tests for
local NDR test.
from e92b034... s3: make own defines for ldap deref types
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 31202a9dab330ed939b4ea71349c816707adff95
Author: Günther Deschner g...@samba.org
Date: Thu Dec 10 20:38:32 2009 +0100
s3-selftest: enable RPC-SAMBA3-WINREG.
Very strange we didn't run it before.
Guenther
commit c2618d2c6f8657c30cd0f68777d3f37e64172191
Author: Günther Deschner g...@samba.org
Date: Wed Dec 9 15:49:46 2009 +0100
s3-rpcclient: allow to set offered size for enumkey command.
Guenther
commit dc71d1c29de521c5034fd7ebf4657610d62c2c3c
Author: Günther Deschner g...@samba.org
Date: Thu Dec 3 00:35:03 2009 +0100
s4-smbtorture: add more spoolss_EnumPrinterKey tests for local NDR test.
Guenther
---
Summary of changes:
source3/rpcclient/cmd_spoolss.c | 13 +
source3/script/tests/test_posix_s3.sh |2 +-
source4/torture/ndr/README|4
source4/torture/ndr/spoolss.c | 14 ++
4 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 source4/torture/ndr/README
Changeset truncated at 500 lines:
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 5393ba7..6101fc6 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2906,18 +2906,23 @@ static WERROR cmd_spoolss_enum_printerkey(struct
rpc_pipe_client *cli,
struct policy_handle hnd;
const char **key_buffer = NULL;
int i;
+ uint32_t offered = 0;
- if (argc 2 || argc 3) {
- printf(Usage: %s printername [keyname]\n, argv[0]);
+ if (argc 2 || argc 4) {
+ printf(Usage: %s printername [keyname] [offered]\n, argv[0]);
return WERR_OK;
}
- if (argc == 3) {
+ if (argc = 3) {
keyname = argv[2];
} else {
keyname = ;
}
+ if (argc == 4) {
+ offered = atoi(argv[3]);
+ }
+
/* Open printer handle */
RPCCLIENT_PRINTERNAME(printername, cli, argv[1]);
@@ -2936,7 +2941,7 @@ static WERROR cmd_spoolss_enum_printerkey(struct
rpc_pipe_client *cli,
hnd,
keyname,
key_buffer,
- 0);
+ offered);
if (!W_ERROR_IS_OK(result)) {
goto done;
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index 07d2873..e5a51bf 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -38,7 +38,7 @@ raw=$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK
raw=$raw RAW-SAMBA3ROOTDIRFID RAW-SFILEINFO-END-OF-FILE
rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC
-rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC
+rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG
rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME
rpc=$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS
rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES
diff --git a/source4/torture/ndr/README b/source4/torture/ndr/README
new file mode 100644
index 000..d17d0b2
--- /dev/null
+++ b/source4/torture/ndr/README
@@ -0,0 +1,4 @@
+use
+ hexdump -e '12/1 0x%02x, \n' infile|outfile
+
+to import ndr dumps
diff --git a/source4/torture/ndr/spoolss.c b/source4/torture/ndr/spoolss.c
index bcff814..bdab29f 100644
--- a/source4/torture/ndr/spoolss.c
+++ b/source4/torture/ndr/spoolss.c
@@ -219,6 +219,17 @@ static const uint8_t enumprinterdataex_out_data[] = {
0xea, 0x00, 0x00, 0x00
};
+static const uint8_t enumprinterkey_in_data2[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xcc, 0x89, 0x90, 0x8a, 0xfc, 0xca, 0x4c,
+ 0xa5, 0x44, 0xdc, 0x30, 0x10, 0x20, 0xd9, 0x8f, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x00,
+ 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t enumprinterkey_out_data2[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0xea, 0x00, 0x00, 0x00
+};
+
static const uint8_t enumprinterkey_in_data[] = {
0x00, 0x00, 0x00, 0x00, 0x22, 0x5c, 0x46, 0xe5, 0x74, 0xa1, 0x9e, 0x46,
0x95, 0x80, 0x19, 0xf1, 0xaa, 0x63, 0xc9, 0x01, 0x01, 0x00, 0x00, 0x00,
@@ -471,6 +482,9 @@ struct torture_suite *ndr_spoolss_suite(TALLOC_CTX *ctx)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f3205d3... s3: add prototype to fix the build from 31202a9... s3-selftest: enable RPC-SAMBA3-WINREG. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f3205d31d60e54f39abf8ee190d668ba879c6627 Author: Björn Jacke b...@sernet.de Date: Thu Dec 10 23:19:26 2009 +0100 s3: add prototype to fix the build --- Summary of changes: source3/include/proto.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 3fd1d18..ab74c9c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4006,6 +4006,7 @@ char *lp_ldap_suffix(void); char *lp_ldap_admin_dn(void); int lp_ldap_ssl(void); bool lp_ldap_ssl_ads(void); +int lp_ldap_deref(void); int lp_ldap_follow_referral(void); int lp_ldap_passwd_sync(void); bool lp_ldap_delete_dn(void); -- Samba Shared Repository
Build status as of Fri Dec 11 07:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-12-10 00:00:22.0 -0700 +++ /home/build/master/cache/broken_results.txt 2009-12-11 00:00:03.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Thu Dec 10 07:00:01 2009 +Build status as of Fri Dec 11 07:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 34 7 0 +ccache 35 7 0 distcc 0 0 0 -ldb 34 34 0 -libreplace 2 1 0 +ldb 35 35 0 +libreplace 1 1 0 lorikeet 0 0 0 pidl 2 2 0 -ppp 15 0 0 -rsync2 0 0 +ppp 17 0 0 +rsync3 0 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 31 30 0 -samba_3_master 32 28 4 -samba_3_next 32 32 2 -samba_4_0_test 34 31 0 -talloc 34 12 0 -tdb 32 15 0 +samba_3_current 32 31 0 +samba_3_master 33 25 4 +samba_3_next 33 32 2 +samba_4_0_test 35 33 2 +talloc 35 12 0 +tdb 33 15 0
