Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
I did with a simpler share, but it is the same bahaviour. Telling me: another user open read only. I think Fuse/Glusterfs cannot manage msoffice files written from msword or msexcell. If I change or create doc file with openoffice everything is working on the fly. --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: Harry Jede [mailto:walk2...@arcor.de] Gesendet: Dienstag, 8. Februar 2011 11:32 An: muel...@tropenklinik.de Betreff: Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files On 11:24:47 wrote Daniel Müller: Dear all, I have set up a two node workin gluster with glusterfs3.1 and Samba-Sernet 3.5. Everything is working great except MSOffice files (Word/Excell). On the gluster-vol they have the strange behavior That they rest read only, write protected. As far as i know, the newer versions of MSO creates tmp-files during the save operation. So try to change or uncomment the veto oplock files and/or the force create mode directive. Maybe you start with a simpler share definition, like this: [test] path = /mnt/glusterfs/windows/test write list = Domain Users, Domain Admins force group = Domain Users read only = No Every other type of files can be manged without problem, openoffice files too. So when I save a word file on the vol and try to change it it is write protected. When I open the word file with openoffice I can change it without any problem? Is there a bug in samba concerning glusterd? My share config: [test] path = /mnt/glusterfs/windows/test write list = Domain Users, Domain Admins force group = Domain Users read only = No create mask = 02770 force create mode = 02770 profile acls = Yes veto oplock files = /*.mdb/*.MDB/*.dbf/*.DBF/*.doc/*.docx/*.xls/*.xlsx/*.tmp/*.TMP/?~$*/~ $*/*.ex e/*.com oplocks = No level2 oplocks = No --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -- Gruss Harry Jede -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
I did with a simpler share, but it is the same bahaviour. Telling me: another user open read only. I think Fuse/Glusterfs cannot manage msoffice files written from msword or msexcell. Remember that office files are not normal. When you save in office the application creates a temporary file then deletes the previous file then renames the temporary file with the same filename as the the original. When that happens the windows filesystem automatically applies the permissions of the recently deleted file to the file that was just renamed to the same name. *nix filesystems do not have that strange behavior. I believe on my work network I needed to use a force create mode to fix this issue with some 3.0.X version of samba and I have not changed it in years.. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] mount -F smbfs
Dear all there is first port to me plz if u have any idea about mount windows share inside Solaris10 OS with mount -F smbfs or mount -F cifs thanks to advanced best, *Hosam Al Ali UNIX System Administrator - GIT Libya * SCSA - SCNA - SCSECA - MCSAM - MCSE Phone +218919240730 +963 955 287841 Blog: http://hosam.wordpress.com/ Twitter: http://twitter.com/hosamalali http://hosam.wordpress.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] WINS not caching second Samba Server
Background: I have 2 SMB Servers; one is configured to be the Preferred Master (fserver), the other (upstairs) is configured to just share some files. I want it to connect and update the WINS configuration on the Preferred Master. Configuration files for both servers are attached. Also worth mentioning that both the 'fserver' and 'upstairs' reside on the same network. Some basic system information probably worth mentioning: snip id=fserver ## SELinux not Enforcing [root@fserver ~]# getenforce Permissive ## Processes running [root@fserver ~]# ps aux | egrep mbd | egrep -v egrep root 26588 0.0 0.0 135364 2304 ?Ss 15:16 0:00 smbd -D root 26591 0.0 0.0 135364 1180 ?S15:16 0:00 smbd -D root 26592 0.0 0.0 109848 1540 ?Ss 15:16 0:00 nmbd -D ## Services listening [root@fserver ~]# netstat -pnat | egrep mb tcp0 0 127.0.0.1:139 0.0.0.0:* LISTEN 20394/smbd tcp0 0 192.168.0.1:139 0.0.0.0:* LISTEN 20394/smbd tcp0 0 127.0.0.1:445 0.0.0.0:* LISTEN 20394/smbd tcp0 0 192.168.0.1:445 0.0.0.0:* LISTEN 20394/smbd /snip snip id=upstairs ## SELinux not Enforcing [root@upstairs ~]# getenforce Permissive ## Processes running [root@upstairs ~]# ps aux | egrep mbd | egrep -v egrep root 11308 0.0 0.2 203548 2960 ?Ss 15:09 0:00 smbd -D root 11310 0.0 0.1 203548 1448 ?S15:09 0:00 smbd -D ## Services listening [root@upstairs ~]# netstat -pnat | egrep mb tcp0 0 127.0.0.1:445 0.0.0.0:* LISTEN 11308/smbd tcp0 0 192.168.0.62:445 0.0.0.0:* LISTEN 11308/smbd tcp0 0 127.0.0.1:139 0.0.0.0:* LISTEN 11308/smbd tcp0 0 192.168.0.62:139 0.0.0.0:* LISTEN 11308/smbd /snip on 'fserver' (the main samba server) and 'upstairs' I see the following output: snip id='fserver,upstairs' [root@fserver ~]# smbtree -N WORKGROUP \\HL-3070CW cli_start_connection: failed to connect to HL-3070CW20 (0.0.0.0). Error NT_STATUS_BAD_NETWORK_NAME \\FSERVERSamba Server \\FSERVER\IPC$ IPC Service (Samba Server) \\FSERVER\generalGeneral \\FSERVER\photos Photos \\FSERVER\video Video \\FSERVER\music Music This is 'mostly' correct... I want to see entries like : \\UPSTAIRS\... [root@fserver ~]# nmblookup fserver querying fserver on 127.255.255.255 192.168.0.1 fserver00 [root@upstairs ~]# nmblookup fserver querying fserver on 127.255.255.255 querying fserver on 192.168.0.255 192.168.0.1 fserver00 /snip Neither server can resolve the Netbios name 'upstairs', but i can easily access it via IP. What configuration snip am i missing so windows hosts can browse this? It almost seems like the 'fserver' (Also the WINS Server) is not caching 'upstairs' when it broadcasts. snip id=fserver [root@fserver ~]# nmblookup upstairs querying upstairs on 127.255.255.255 querying upstairs on 192.168.0.255 name_query failed to find name upstairs /snip On the fserver I see the requests some in and go back out (so it's not a firewall issue) snip id=fserver [root@fserver ~]# tcpdump -i eth1 -l -n | grep 137 tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on eth1, link-type EN10MB (Ethernet), capture size 96 bytes 15:38:27.354500 IP 192.168.0.62.44866 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST 15:38:27.354805 IP 192.168.0.1.netbios-ns 192.168.0.62.44866: NBT UDP PACKET(137): QUERY; POSITIVE; RESPONSE; UNICAST 15:38:27.625262 IP 192.168.0.62.44866 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST 15:38:27.625453 IP 192.168.0.1.netbios-ns 192.168.0.62.44866: NBT UDP PACKET(137): QUERY; POSITIVE; RESPONSE; UNICAST 15:38:27.895986 IP 192.168.0.62.44866 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST 15:38:27.896056 IP 192.168.0.1.netbios-ns 192.168.0.62.44866: NBT UDP PACKET(137): QUERY; POSITIVE; RESPONSE; UNICAST /snip I also see broadcasts made by the upstairs machine every so often in the tcp dump too (192.168.0.62 = upstairs) snip id=fserver 08:01:01.369299 IP 192.168.0.62.54458 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST 08:01:01.639895 IP 192.168.0.62.54458 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST 08:01:01.910509 IP 192.168.0.62.54458 192.168.0.255.netbios-ns: NBT UDP PACKET(137): QUERY; REQUEST; BROADCAST /snip In a nutshell... my problem (again): Why doesn't 'upstairs' (standard SMB server) associate it's Netbios name with the Master SMB (also configured to
[Samba] samba policies? logon scripts?
Hello all, I wanted something to enhace my roaming profiles from a samba server. As well as users saving its config into my server, i would like to give them a primary setup, by automatically creating some desktop shortcuts, or creating a corporative background image for all. I think i have 2 options, but i cant find a decent howto, and it seems that i must use a microsoft tool. system policies logon scripts Is this necessary? i mean, is it possible to make my users a custom background image and some desktop icons? If so, guide me or show me a starting point. Much appreciated. -- Fran Del Val Dpto de informática. Rojatex S.L. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
But even with the force group or force create mode it is still not possible to do it on a glusterd vol. I think I will skip glusterd and return to gfs2 and drbd. --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: John Drescher [mailto:dresche...@gmail.com] Gesendet: Dienstag, 8. Februar 2011 13:34 An: muel...@tropenklinik.de Cc: samba@lists.samba.org Betreff: Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files I did with a simpler share, but it is the same bahaviour. Telling me: another user open read only. I think Fuse/Glusterfs cannot manage msoffice files written from msword or msexcell. Remember that office files are not normal. When you save in office the application creates a temporary file then deletes the previous file then renames the temporary file with the same filename as the the original. When that happens the windows filesystem automatically applies the permissions of the recently deleted file to the file that was just renamed to the same name. *nix filesystems do not have that strange behavior. I believe on my work network I needed to use a force create mode to fix this issue with some 3.0.X version of samba and I have not changed it in years.. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
On Tue, Feb 08, 2011 at 03:12:00PM +0100, Daniel Müller wrote: But even with the force group or force create mode it is still not possible to do it on a glusterd vol. I think I will skip glusterd and return to gfs2 and drbd. Without further analysis I don't think this is appropriate. Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba policies? logon scripts?
2011/2/8 fdel...@rojatex.com: I wanted something to enhace my roaming profiles from a samba server. As well as users saving its config into my server, i would like to give them a primary setup, by automatically creating some desktop shortcuts, or creating a corporative background image for all. I think i have 2 options, but i cant find a decent howto, and it seems that i must use a microsoft tool. system policies logon scripts Is this necessary? i mean, is it possible to make my users a custom background image and some desktop icons? For a custom backgroup image, you had better use system policies. For some desktop icons, you had better use logon scripts. You can use a default profile but I do not recommend. To manupulate a default profile is something difficult. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] archive in the future
Hallo, samba, the mailinglist archive shows some articles from the future: http://lists.samba.org/archive/samba/ I'm impressed! Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
So I created the file versuch.docx on the glusterd-vol. At the end of my smbd.log the file is read only. Only one change in the file possible My share definition: [test] path=/mnt/glusterfs/windows/test readonly=no profile acls = YES oplocks=NO level2 oplocks=NO write list=Domain Users Domain Admins create mask = 2770 force group= Domain Users -rwxrw 1 root Domain Users 10021 8. Feb 15:42 versuch.docx Smbd.log: [2011/02/08 15:40:42.199280, 3] smbd/trans2.c:5012(call_trans2qfilepathinfo) call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = 1005 [2011/02/08 15:40:42.199325, 3] smbd/trans2.c:5225(call_trans2qfilepathinfo) call_trans2qfilepathinfo versuch.docx (fnum = 16123) level=1005 call=7 total_data=0 [2011/02/08 15:40:42.199344, 5] smbd/trans2.c:4197(smbd_do_qfilepathinfo) smbd_do_qfilepathinfo: versuch.docx (fnum = 16123) level=1005 max_data=24 [2011/02/08 15:40:42.199364, 5] lib/util.c:617(show_msg) [2011/02/08 15:40:42.199374, 5] lib/util.c:627(show_msg) size=84 smb_com=0x32 smb_rcls=0 smb_reh=0 smb_err=0 smb_flg=136 smb_flg2=51203 smb_tid=4 smb_pid=216 smb_uid=109 smb_mid=61187 smt_wct=10 smb_vwv[ 0]=2 (0x2) smb_vwv[ 1]= 24 (0x18) smb_vwv[ 2]=0 (0x0) smb_vwv[ 3]=2 (0x2) smb_vwv[ 4]= 56 (0x38) smb_vwv[ 5]=0 (0x0) smb_vwv[ 6]= 24 (0x18) smb_vwv[ 7]= 60 (0x3C) smb_vwv[ 8]=0 (0x0) smb_vwv[ 9]=0 (0x0) smb_bcc=29 [2011/02/08 15:40:42.200144, 3] smbd/process.c:1485(process_smb) Transaction 12057 of length 45 (0 toread) [2011/02/08 15:40:42.200217, 5] lib/util.c:617(show_msg) [2011/02/08 15:40:42.200227, 5] lib/util.c:627(show_msg) size=41 smb_com=0x4 smb_rcls=0 smb_reh=0 smb_err=0 smb_flg=24 smb_flg2=51207 smb_tid=4 smb_pid=65279 smb_uid=109 smb_mid=61251 smt_wct=3 smb_vwv[ 0]=16123 (0x3EFB) smb_vwv[ 1]=65535 (0x) smb_vwv[ 2]=65535 (0x) smb_bcc=0 [2011/02/08 15:40:42.200300, 3] smbd/process.c:1294(switch_message) switch message SMBclose (pid 2781) conn 0x2b53d94fd900 [2011/02/08 15:40:42.200318, 4] smbd/uid.c:257(change_to_user) change_to_user: Skipping user change - already user [2011/02/08 15:40:42.200336, 3] smbd/reply.c:4653(reply_close) close fd=28 fnum=16123 (numopen=2) [2011/02/08 15:40:42.200507, 2] smbd/close.c:656(close_normal_file) root closed file versuch.docx (numopen=1) NT_STATUS_OK [2011/02/08 15:40:42.200531, 5] smbd/files.c:497(file_free) freed files structure 16123 (1 used) [2011/02/08 15:40:42.200559, 5] lib/util.c:617(show_msg) [2011/02/08 15:40:42.200570, 5] lib/util.c:627(show_msg) size=35 smb_com=0x4 smb_rcls=0 smb_reh=0 smb_err=0 smb_flg=136 smb_flg2=51203 smb_tid=4 smb_pid=65279 smb_uid=109 smb_mid=61251 smt_wct=0 smb_bcc=0 [2011/02/08 15:40:53.742751, 3] smbd/sec_ctx.c:310(set_sec_ctx) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2011/02/08 15:40:53.743145, 5] auth/token_util.c:525(debug_nt_user_token) NT user token: (NULL) [2011/02/08 15:40:53.743585, 5] auth/token_util.c:551(debug_unix_user_token) UNIX token of user 0 Primary group is 0 and contains 0 supplementary groups [2011/02/08 15:40:53.743776, 5] smbd/uid.c:369(change_to_root_user) change_to_root_user: now uid=(0,0) gid=(0,0) [2011/02/08 15:41:13.427755, 3] smbd/sec_ctx.c:310(set_sec_ctx) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2011/02/08 15:41:13.427998, 5] auth/token_util.c:525(debug_nt_user_token) NT user token: (NULL) [2011/02/08 15:41:13.428154, 5] auth/token_util.c:551(debug_unix_user_token) UNIX token of user 0 Primary group is 0 and contains 0 supplementary groups [2011/02/08 15:41:13.428467, 5] smbd/uid.c:369(change_to_root_user) change_to_root_user: now uid=(0,0) gid=(0,0) [2011/02/08 15:42:05.901565, 3] smbd/process.c:1294(switch_message) switch message SMBwriteX (pid 2781) conn 0x2b53d94fd900 [2011/02/08 15:42:05.901580, 4] smbd/uid.c:257(change_to_user) change_to_user: Skipping user change - already user [2011/02/08 15:42:05.902421, 3] lib/util.c:1846(fcntl_getlock) fcntl_getlock: fd 35 is returned info 2 pid 0 [2011/02/08 15:42:05.902447, 5] smbd/fileio.c:235(trigger_write_time_update) Update write time 200 usec later on ~$ersuch.docx [2011/02/08 15:42:05.902474, 3] smbd/oplock.c:373(break_level2_to_none_async) process_oplock_async_level2_break_message: downgrading fake level 2 oplock. [2011/02/08 15:42:05.902714, 3] smbd/reply.c:4437(reply_write_and_X) writeX fnum=16138 num=54 wrote=54 [2011/02/08 15:42:05.902919, 3] smbd/process.c:1485(process_smb) Transaction 12162 of length 76 (0 toread) [2011/02/08 15:42:05.902938, 5] lib/util.c:617(show_msg) [2011/02/08 15:42:05.902947, 5] lib/util.c:627(show_msg) size=72 smb_com=0x32 smb_rcls=0 smb_reh=0 smb_err=0 smb_flg=24 smb_flg2=51207 smb_tid=1 smb_pid=216 smb_uid=109 smb_mid=2375 smt_wct=15 smb_vwv[ 0]=4 (0x4)
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
On Tue, Feb 08, 2011 at 03:51:26PM +0100, Daniel Müller wrote: So I created the file versuch.docx on the glusterd-vol. At the end of my smbd.log the file is read only. Only one change in the file possible If that is all the logs that you can ever get out of your Server (your max log size must be EXTREMELY small) then I don't see any chance to help you. A full debug level 10 log, a network sniff and at some point potentially a strace of smbd, that would be the information that you might have a chance with. But that is probably more effort for you than installing GFS2. Sorry for that, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
Is this possibly a caching issue? I had some problems with nfs file share that sounded somewhat like this and it turned out to be caching. I disabled caching on the mount and it all worked perfectly. On 02/08/2011 10:16 AM, Volker Lendecke wrote: On Tue, Feb 08, 2011 at 03:51:26PM +0100, Daniel Müller wrote: So I created the file versuch.docx on the glusterd-vol. At the end of my smbd.log the file is read only. Only one change in the file possible If that is all the logs that you can ever get out of your Server (your max log size must be EXTREMELY small) then I don't see any chance to help you. A full debug level 10 log, a network sniff and at some point potentially a strace of smbd, that would be the information that you might have a chance with. But that is probably more effort for you than installing GFS2. Sorry for that, Volker Lendecke -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CentOs 5.5 Glusterfs 3.1.0 Samba 3.5 MSOffice Files
On 18:33:52 wrote Daniel Müller: So I created the file versuch.docx on the glusterd-vol. At the end of my smbd.log the file is read only. Only one change in the file possible My share definition: [test] path=/mnt/glusterfs/windows/test readonly=no profile acls = YES oplocks=NO level2 oplocks=NO write list=Domain Users Domain Admins write list=@Domain Users @Domain Admins should be groups, not a single user create mask = 2770 force group= Domain Users -rwxrw 1 root Domain Users 10021 8. Feb 15:42 versuch.docx -- Gruss Harry Jede -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba policies? logon scripts?
poledit.exe ok, i take notes. I suppose i should download it in every client pc? and what about logon scripts? do i forget about them? thanks On Tue, Feb 8, 2011 at 3:49 PM, fdel...@rojatex.com wrote: Hello all, I wanted something to enhace my roaming profiles from a samba server. As well as users saving its config into my server, i would like to give them a primary setup, by automatically creating some desktop shortcuts, or creating a corporative background image for all. I think i have 2 options, but i cant find a decent howto, and it seems that i must use a microsoft tool. system policies logon scripts Is this necessary? i mean, is it possible to make my users a custom background image and some desktop icons? If so, guide me or show me a starting point. Much appreciated. -- Fran Del Val Dpto de informática. Rojatex S.L. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba for winNT4 you can use poledit.exe tool to create policy files. It will modify registry according to your needs. It worked for me for these purposes on winxp machines. Liutauras -- Fran Del Val Dpto de informática. Rojatex S.L. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] modify the windws registry as administrator
Hi all, I am making my PDC up and I have a quick questions. I did an script to modify some windows registry keys, I execute it through netlogon and on windows xp box there is not any problem, but when it is executed on windows 7 the system reclaim the user approval to execute it. Is there any way to execute it through samba without any user approval? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] modify the windws registry as administrator
On Tue, Feb 8, 2011 at 7:27 PM, sisu . npil...@hotmail.com wrote: Hi all, I am making my PDC up and I have a quick questions. I did an script to modify some windows registry keys, I execute it through netlogon and on windows xp box there is not any problem, but when it is executed on windows 7 the system reclaim the user approval to execute it. Is there any way to execute it through samba without any user approval? this has nothing to do with samba. This is a windows 'problem': UAC. -- natxo -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] modify the windws registry as administrator
Under windows 7 there has changed a lot. you must disable the UAC if you want the logon scripts to work as usual. From cmd and: C:\Windows\System32\UserAccountControlSettings.exe Or per regstry setting: HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System There find: EnableLUA (RegDword) .On the Edit menu, click Modify. In the Value data box, type 0 (zero), and then click OK You can also put this in a reg-file and leave it to be wriiten in te registry by your logon script. Notice this reg-file must be done with administartor rights. On Tue, 8 Feb 2011 18:27:38 +, sisu . npil...@hotmail.com wrote: Hi all, I am making my PDC up and I have a quick questions. I did an script to modify some windows registry keys, I execute it through netlogon and on windows xp box there is not any problem, but when it is executed on windows 7 the system reclaim the user approval to execute it. Is there any way to execute it through samba without any user approval? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba4 LDAP Timeout - Wrong IP?
Greetings, all. I am trying to join a samba4 server to an existing Windows SBS 2003 domain as a DC. I've compiled samba4 from git and am following the howto. On what is essentially the first step, I get a failed to connect error with an ldap:// url, and the message NT_STATUS_IO_TIMEOUT. In reviewing an strace, it looks to me like it might be trying to connect to the wrong IP. The command I'm using is: # strace -o ~/samba-join.log bin/samba-tool join ba-cam.local DC -Uadministrator --realm=ba-cam.local -d10 ~/samba-tool.log I've put pastes up of the -d10 output of samba-tool, and the strace. samba-tool output: http://pastey.net/145858 strace log: http://pastey.net/145857 Note that it appears to correctly find the IP of the PDC (192.168.14.253), but in the strace on lines 5486 and 5496, it's talking about a 192.167.14.253, which will of course time out. Am I doing something wrong? Is this a bug? Is there a way around this? Thanks, -Andrew -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Upgrade vom 3.0.37 to 3.4.9
dear list members, i have a 3.0.37 server running fine but hardware goes down so i must change the server. the new server is there, gentoo with samba 3.4.9. last time i have done this sever exchange, i have copied the *conf and *tdb files together with /etc/passwd and /etc/shadow /etc/group and the server was running within few hours, but this was a small version jump from 3.0.29 to 3.0.37. are there any things to do like converting files / tdb-databases or so on to make the jump from 3.0.37 to 3.4.9?? thanks for any good tips in advance - bernd -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba4 LDAP Timeout - Wrong IP?
On Tue, Feb 8, 2011 at 11:27 AM, Andrew Wilkinson drukar...@gmail.comwrote: Greetings, all. I am trying to join a samba4 server to an existing Windows SBS 2003 domain as a DC. I've compiled samba4 from git and am following the howto. On what is essentially the first step, I get a failed to connect error with an ldap:// url, and the message NT_STATUS_IO_TIMEOUT. In reviewing an strace, it looks to me like it might be trying to connect to the wrong IP. The command I'm using is: # strace -o ~/samba-join.log bin/samba-tool join ba-cam.local DC -Uadministrator --realm=ba-cam.local -d10 ~/samba-tool.log I've put pastes up of the -d10 output of samba-tool, and the strace. samba-tool output: http://pastey.net/145858 strace log: http://pastey.net/145857 Note that it appears to correctly find the IP of the PDC (192.168.14.253), but in the strace on lines 5486 and 5496, it's talking about a 192.167.14.253, which will of course time out. Am I doing something wrong? Is this a bug? Is there a way around this? Thanks, -Andrew Or, I could just have an erroneous /etc/hosts entry... Sorry for the noise. -Andrew -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba4 LDAP Timeout - Wrong IP?
I am trying to join a samba4 server to an existing Windows SBS 2003 domain as a DC. I've compiled samba4 from git and am following the howto. On what is essentially the first step, I get a failed to connect error with an ldap:// url, and the message NT_STATUS_IO_TIMEOUT. In reviewing an strace, it looks to me like it might be trying to connect to the wrong IP. The command I'm using is: # strace -o ~/samba-join.log bin/samba-tool join ba-cam.local DC -Uadministrator --realm=ba-cam.local -d10 ~/samba-tool.log I've put pastes up of the -d10 output of samba-tool, and the strace. samba-tool output: http://pastey.net/145858 strace log: http://pastey.net/145857 Note that it appears to correctly find the IP of the PDC (192.168.14.253), but in the strace on lines 5486 and 5496, it's talking about a 192.167.14.253, which will of course time out. That addy has to be a DNS entry. Look there. Am I doing something wrong? Is this a bug? Is there a way around this? Thanks, -Andrew -- 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
Re: [Samba] bind9 dlopen/dlz problems [update]
On Mon, 2011-02-07 at 08:28 +0100, Marcel Ritter wrote: Hi, just a short update on this issue: By using strace and having a look at the source code, I found the reason for the named error: Accessing samba database via ldapi requires the use of ildap.so (samba ldb module, which is not located in standard ldb modules path). Just setting LDB_MODULES_PATH to the directory containing it makes named start: export LDB_MODULES_PATH=/usr/lib/samba/ldb/ named -u named - startup complete So it wasn't my first suspect ldap uri: ldapi:///var/lib/samba4/private/ldap_priv/ldapi ldapi://%2Fvar%2Flib%2Fsamba4%2Fprivate%2Fldap_priv%2Fldapi This leaves me with the task to finally get some DNS entries into the samba database :-) The only way to get DNS entries in is by replicating an existing Microsoft DNS server. Anyway, the reason there isn't any documentation is that it's not really finished. We got it to the point where we were able to show that BIND9.8 when released would do what we want, when we are loaded with the dlopen dlz plugin. That was an important milestone, as it is more difficult to get a new BIND version to Samba4 users than an updated plugin. From here, we need to come up with a secure read/write approach over LDAPI, with transactions of some kind, and tidy up some other details. Then we will publish some more docs on this. But in the meantime, you seem to have cracked the setup for the less secure, unsafe (no transactions) but works-for-a-demo mode of operation :-). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Cisco Inc. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] WINS not caching second Samba Server
2011/2/8 Chris lead2g...@gmail.com: Background: I have 2 SMB Servers; one is configured to be the Preferred Master (fserver), the other (upstairs) is configured to just share some files. (snip) I snip id=upstairs ## Processes running [root@upstairs ~]# ps aux | egrep mbd | egrep -v egrep root 11308 0.0 0.2 203548 2960 ? Ss 15:09 0:00 smbd -D root 11310 0.0 0.1 203548 1448 ? S 15:09 0:00 smbd -D Neither server can resolve the Netbios name 'upstairs', but i can easily access it via IP. What configuration snip am i missing so windows hosts can browse this? You have to run nmbd on upstairs. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba policies? logon scripts?
2011/2/9 fdel...@rojatex.com: poledit.exe ok, i take notes. I suppose i should download it in every client pc? No, poledit is used to create NTconfig.pol file. and what about logon scripts? do i forget about them? As Liutauras said: It will modify registry according to your needs. basically, settings stored in registry can be managed with system policy. The backgroup image file name is stored in registry, but shortcuts are not. Anyway these knowledge are applied not only to Samba but also to NT domain. So you had better search into knowledge how to manage NT domain. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] mount -F smbfs
2011/2/8 Hosam Al Ali a.ho...@gmail.com: plz if u have any idea about mount windows share inside Solaris10 OS with mount -F smbfs or mount -F cifs mount.cifs is a successor of mount.smbfs and mount.smbfs is no longer supported after Samba 3.2.0. So you should use mount.cifs. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] mount -F smbfs
On Wed, Feb 09, 2011 at 08:40:49AM +0900, TAKAHASHI Motonobu wrote: 2011/2/8 Hosam Al Ali a.ho...@gmail.com: plz if u have any idea about mount windows share inside Solaris10 OS with mount -F smbfs or mount -F cifs mount.cifs is a successor of mount.smbfs and mount.smbfs is no longer supported after Samba 3.2.0. So you should use mount.cifs. That's true for Linux, I'm not so sure about mount.cifs on Solaris. Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] open printer driver files
When serving printer drivers to Windows 7 hosts, under what circumstances is it normal for the Windows clients to be locking driver files? Using smbstatus, I see clients constantly touching these files, even in cases where it is highly unlikely that the user is actively installing a printer. I expect that the driver files would be downloaded during the initial printer installation, but it seems that Windows continues to grab at the drivers even after the fact. Is this documented behavior? In the majority of cases the clients seem to release the files quickly, but in a few problematic edge cases I have clients just repeatedly download the drivers over and over. It would be easier to troubleshoot these problem cases if I understood why so many healthy clients are also requesting drivers frequently. Thanks, M@ -- 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
The branch, master has been updated via be5edba libndr: share some uuid helpers. via 84dbc2a ndr: merge ndr_map_error2string and ndr_errstr. via 8b55ae1 ndr: move null_ndr_syntax_id to the common libndr location. via 724c982 ndr: merge duplicate ndr_map_error2ntstatus() functions. from e68f6ad If possible (O_DIRECTORY exists) open an fd for a directory open. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit be5edba117d3af9c9289bc5d37e7e037cb0a05f1 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 00:04:20 2011 +0100 libndr: share some uuid helpers. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 09:52:56 CET 2011 on sn-devel-104 commit 84dbc2a82de0531c49fa7aa16fbdf8aba6324aac Author: Günther Deschner g...@samba.org Date: Mon Feb 7 23:27:57 2011 +0100 ndr: merge ndr_map_error2string and ndr_errstr. Guenther commit 8b55ae178586d25854a929ace05f203d547242ad Author: Günther Deschner g...@samba.org Date: Mon Feb 7 23:21:41 2011 +0100 ndr: move null_ndr_syntax_id to the common libndr location. Guenther commit 724c9821313b5289dc6fa29bbe930c19dfd230fb Author: Günther Deschner g...@samba.org Date: Fri Jan 28 23:38:21 2011 +0100 ndr: merge duplicate ndr_map_error2ntstatus() functions. Guenther --- Summary of changes: librpc/ndr/libndr.h |5 ++ librpc/ndr/ndr.c |5 ++ librpc/ndr/ndr_basic.c | 25 + librpc/ndr/uuid.c| 17 ++ source3/include/proto.h |5 -- source3/lib/netapi/samr.c|6 +- source3/lib/util.c | 17 -- source3/librpc/ndr/util.c| 100 -- source4/libcli/util/errormap.c | 26 - source4/torture/rpc/spoolss_access.c |7 --- 10 files changed, 55 insertions(+), 158 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index ff20755..f621535 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -328,6 +328,7 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons extern const struct ndr_syntax_id ndr_transfer_syntax; extern const struct ndr_syntax_id ndr64_transfer_syntax; +extern const struct ndr_syntax_id null_ndr_syntax_id; struct ndr_interface_call { const char *name; @@ -362,6 +363,7 @@ struct ndr_interface_list { */ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err); const char *ndr_map_error2string(enum ndr_err_code ndr_err); +#define ndr_errstr ndr_map_error2string /* FIXME: Use represent_as instead */ struct dom_sid; @@ -504,6 +506,9 @@ enum ndr_err_code ndr_pull_policy_handle(struct ndr_pull *ndr, int ndr_flags, st enum ndr_err_code ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, const struct policy_handle *r); void ndr_print_policy_handle(struct ndr_print *ndr, const char *name, const struct policy_handle *r); bool policy_handle_empty(struct policy_handle *h); +bool is_valid_policy_hnd(const struct policy_handle *hnd); +bool policy_handle_equal(const struct policy_handle *hnd1, +const struct policy_handle *hnd2); void ndr_check_padding(struct ndr_pull *ndr, size_t n); enum ndr_err_code ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v); diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 63b2cc3..068e07f 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -46,6 +46,11 @@ const struct ndr_syntax_id ndr64_transfer_syntax = { 1 }; +const struct ndr_syntax_id null_ndr_syntax_id = { + { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } }, + 0 +}; + /* work out the number of bytes needed to align on a n byte boundary */ diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index d628faa..1d67e11 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -1213,3 +1213,28 @@ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool { ndr-print(ndr, %-25s: %s, name, b?true:false); } + +_PUBLIC_ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err) +{ + switch (ndr_err) { + case NDR_ERR_SUCCESS: + return NT_STATUS_OK; + case NDR_ERR_BUFSIZE: + return NT_STATUS_BUFFER_TOO_SMALL; + case NDR_ERR_TOKEN: + return NT_STATUS_INTERNAL_ERROR; + case NDR_ERR_ALLOC: + return NT_STATUS_NO_MEMORY; + case NDR_ERR_ARRAY_SIZE: + return NT_STATUS_ARRAY_BOUNDS_EXCEEDED; + case NDR_ERR_INVALID_POINTER: + return NT_STATUS_INVALID_PARAMETER_MIX; + case NDR_ERR_UNREAD_BYTES:
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 3720d13 libndr: share some uuid helpers. via 0474eca ndr: merge ndr_map_error2string and ndr_errstr. via 0f2753d ndr: move null_ndr_syntax_id to the common libndr location. via a4216a3 ndr: merge duplicate ndr_map_error2ntstatus() functions. from eb2d8f7 Use corrcet function instead of cut-and-paste code. (cherry picked from commit 1121091f8bf857948c335f326088cfafa78ed013) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 3720d13da442eba35c17680add9750bbbded5e08 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 00:04:20 2011 +0100 libndr: share some uuid helpers. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 09:52:56 CET 2011 on sn-devel-104 (cherry picked from commit be5edba117d3af9c9289bc5d37e7e037cb0a05f1) commit 0474eca66f6c1d54c6fd045a4bf5c2e13241c36c Author: Günther Deschner g...@samba.org Date: Mon Feb 7 23:27:57 2011 +0100 ndr: merge ndr_map_error2string and ndr_errstr. Guenther (cherry picked from commit 84dbc2a82de0531c49fa7aa16fbdf8aba6324aac) commit 0f2753dcea164e0a769afbaeab59bb7822fd64c6 Author: Günther Deschner g...@samba.org Date: Mon Feb 7 23:21:41 2011 +0100 ndr: move null_ndr_syntax_id to the common libndr location. Guenther (cherry picked from commit 8b55ae178586d25854a929ace05f203d547242ad) commit a4216a338cbb6194a10f50704d454cb77d403b32 Author: Günther Deschner g...@samba.org Date: Fri Jan 28 23:38:21 2011 +0100 ndr: merge duplicate ndr_map_error2ntstatus() functions. Guenther (cherry picked from commit 724c9821313b5289dc6fa29bbe930c19dfd230fb) --- Summary of changes: librpc/ndr/libndr.h |5 ++ librpc/ndr/ndr.c |5 ++ librpc/ndr/ndr_basic.c | 25 + librpc/ndr/uuid.c| 17 ++ source3/include/proto.h |5 -- source3/lib/netapi/samr.c|6 +- source3/lib/util.c | 17 -- source3/librpc/ndr/util.c| 100 -- source4/libcli/util/errormap.c | 26 - source4/torture/rpc/spoolss_access.c |7 --- 10 files changed, 55 insertions(+), 158 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index ff20755..f621535 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -328,6 +328,7 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons extern const struct ndr_syntax_id ndr_transfer_syntax; extern const struct ndr_syntax_id ndr64_transfer_syntax; +extern const struct ndr_syntax_id null_ndr_syntax_id; struct ndr_interface_call { const char *name; @@ -362,6 +363,7 @@ struct ndr_interface_list { */ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err); const char *ndr_map_error2string(enum ndr_err_code ndr_err); +#define ndr_errstr ndr_map_error2string /* FIXME: Use represent_as instead */ struct dom_sid; @@ -504,6 +506,9 @@ enum ndr_err_code ndr_pull_policy_handle(struct ndr_pull *ndr, int ndr_flags, st enum ndr_err_code ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, const struct policy_handle *r); void ndr_print_policy_handle(struct ndr_print *ndr, const char *name, const struct policy_handle *r); bool policy_handle_empty(struct policy_handle *h); +bool is_valid_policy_hnd(const struct policy_handle *hnd); +bool policy_handle_equal(const struct policy_handle *hnd1, +const struct policy_handle *hnd2); void ndr_check_padding(struct ndr_pull *ndr, size_t n); enum ndr_err_code ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v); diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 63b2cc3..068e07f 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -46,6 +46,11 @@ const struct ndr_syntax_id ndr64_transfer_syntax = { 1 }; +const struct ndr_syntax_id null_ndr_syntax_id = { + { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } }, + 0 +}; + /* work out the number of bytes needed to align on a n byte boundary */ diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index d628faa..1d67e11 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -1213,3 +1213,28 @@ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool { ndr-print(ndr, %-25s: %s, name, b?true:false); } + +_PUBLIC_ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err) +{ + switch (ndr_err) { + case NDR_ERR_SUCCESS: + return NT_STATUS_OK; + case NDR_ERR_BUFSIZE: + return NT_STATUS_BUFFER_TOO_SMALL; + case
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 311b42a Announce Samba 3.4.10 and 3.4.11. from d8b1eb6 Added entry for BRLink - Brazil. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 311b42ad43d678fad23c1857fa915de72b309d45 Author: Karolin Seeger ksee...@samba.org Date: Tue Feb 8 10:37:49 2011 +0100 Announce Samba 3.4.10 and 3.4.11. Manual workaround, because I cannot add stories on news.samba.org. Karolin --- Summary of changes: generated_news/latest_10_bodies.html| 100 +-- generated_news/latest_10_headlines.html |4 + generated_news/latest_2_bodies.html | 56 -- 3 files changed, 58 insertions(+), 102 deletions(-) Changeset truncated at 500 lines: diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index 4f145fd..50eaf51 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,4 +1,33 @@ +h5a name=3.4.11 23 January 2011/a/h5 +p class=headlineSamba 3.4.11 Available for Download/p +pThis is the latest stable release of the Samba 3.4 series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=http://samba.org/samba/ftp/stable/samba-3.4.11.tar.gz;downloaded +now/a. A a +href=http://samba.org/samba/ftp/patches/patch-3.4.10-3.4.11.diffs.gz;patch +against +Samba 3.4.9/a is also available. See a +href=http://samba.org/samba/history/samba-3.4.11.html;the +release notes for more info/a./p + + +h5a name=3.4.10 22 January 2011/a/h5 +p class=headlineSamba 3.4.10 Available for Download/p +pThis is the latest stable release of the Samba 3.4 series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=http://samba.org/samba/ftp/stable/samba-3.4.10.tar.gz;downloaded +now/a. A a +href=http://samba.org/samba/ftp/patches/patch-3.4.9-3.4.10.diffs.gz;patch +against +Samba 3.4.9/a is also available. See a +href=http://samba.org/samba/history/samba-3.4.10.html;the +release notes for more info/a./p + h5a name=3.5.6 8 October 2010/a/h5 p class=headlineSamba 3.5.6 Available for Download/p pThis is the latest stable release of the Samba 3.5 series./p @@ -116,74 +145,3 @@ using GnuPG (ID 6568B7EA). The source code can be See a href=http://www.samba.org/samba/history/samba-3.3.13.html;the release notes for more info/a./p - - h5a name=Samba_Team_Blog_428 May 2010/a/h5 - p class=headlineSamba Team Blog #4/p - pbWeb sites, Conferences and Coding/b/p - -piIt takes nine months to create a Samba release, no matter how many engineers are working on it/i/p. - -pCheck out the new look, updated a href=http://samba.org;Samba.org/a web site - complete with new logo ! We really like it as it meant we had an excuse to get new Samba Team t-shirts, and stickers for our laptops. Thanks to a href=http://www.sernet.de/en/;SerNet/a for taking care of our new 21st Century look./p - -pWe recently held SambaXP - our annual get-together in Göttingen, Germany, as usual hosted very capably by SerNet./p - -pMany presentations were listened to, meetings were had, and fine German beer was drunk. Our friends the Microsoft SMB/SMB2 engineers attended again this year, and Tom Talpey from Microsoft announced a new project to design UNIX extensions for the SMB2 protocol. It will be hosted by Team member Chris Hertel's company, ubiqx Consulting, at a href=http://unixsmb2.org;http://unixsmb2.org/a./p - -pThe slides from all the presentations will be available at a href=http://sambaxp.org;http://sambaxp.org/a shortly. If you didn't go, we missed you - and you should certainly make an effort to be there next year !/p - -pWe are still making great strides on Samba4, and creator of Samba Dr. Andrew Tridgell from IBM (just to be formal for once. Everyone still just calls him tridge :-) demonstrated two-way replication between a Microsoft Active Directory domain, and a Samba4 Domain. There is still much work to be done on the AD domain controller code, but we're starting to see the light at the end of the tunnel in getting to a stable 4.0 release. Maybe by SambaXP next year we'll have an exciting new announcement to make./p - -pIn a Team meeting and after consultations with OEM's and Linux distributions -we decided to move to a nine month period between major Samba releases instead -of our previous six month release cycle. The strain of keeping to the six -monthly cycle was too great on the release process, and nine months should give -us a better balance between having time for feature development and time for -testing of the Samba production release code./p - -pPlans for the
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9732955 s3: Added file for clang complete support in vim. via 12913c9 s3: Added missing files in .gitignore. from be5edba libndr: share some uuid helpers. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9732955038d9f3631a849e81f03308acc0aeb9f7 Author: Andreas Schneider a...@samba.org Date: Mon Feb 7 18:06:40 2011 +0100 s3: Added file for clang complete support in vim. Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Tue Feb 8 10:40:42 CET 2011 on sn-devel-104 commit 12913c90f7789109c328a6e5e6bdd6002c096b12 Author: Andreas Schneider a...@samba.org Date: Mon Feb 7 18:06:04 2011 +0100 s3: Added missing files in .gitignore. --- Summary of changes: .gitignore |4 +++- source3/.clang_complete |2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) create mode 100644 source3/.clang_complete Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index 51a1247..a8eacd5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ st/ *.swp tags TAGS -cscope.out +cscope*.out *.x autom4te.cache config.cache @@ -17,6 +17,8 @@ config.h config.h.in config.log config.status +source3/.build.log +source3/.clang_complete source3/configure source3/Makefile examples/libsmbclient/Makefile.internal diff --git a/source3/.clang_complete b/source3/.clang_complete new file mode 100644 index 000..a13b5cd --- /dev/null +++ b/source3/.clang_complete @@ -0,0 +1,2 @@ +-I. -I./.. -Iinclude -I./../lib/replace -I./../lib/tevent -I./../lib/addns -I./librpc -I./../lib/talloc -I../lib/tdb/include +-Iinclude/includes.h.gch -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-02-08-1042/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-02-08-1042/samba3.stderr http://git.samba.org/autobuild.flakey/2011-02-08-1042/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-02-08-1042/samba4.stderr http://git.samba.org/autobuild.flakey/2011-02-08-1042/samba4.stdout The top commit at the time of the failure was: commit be5edba117d3af9c9289bc5d37e7e037cb0a05f1 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 00:04:20 2011 +0100 libndr: share some uuid helpers. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 09:52:56 CET 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 01d3da3 s3:net: remove unused net_idmap_help from 9732955 s3: Added file for clang complete support in vim. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 01d3da3c7c1dfc36353b423da5d28a8edd397e5b Author: Gregor Beck gb...@sernet.de Date: Fri Jan 28 10:58:03 2011 +0100 s3:net: remove unused net_idmap_help Signed-off-by: Michael Adam ob...@samba.org Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Tue Feb 8 11:50:37 CET 2011 on sn-devel-104 --- Summary of changes: source3/utils/net_idmap.c | 16 source3/utils/net_proto.h |1 - 2 files changed, 0 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index e3640bd..7551354 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -372,22 +372,6 @@ static int net_idmap_secret(struct net_context *c, int argc, const char **argv) return 0; } -int net_help_idmap(struct net_context *c, int argc, const char **argv) -{ - d_printf(_(net idmap dump inputfile\n - Dump current id mapping\n)); - - d_printf(_(net idmap restore\n - Restore entries from stdin\n)); - - /* Deliberately *not* document net idmap delete */ - - d_printf(_(net idmap secret DOMAIN secret\n - Set the secret for the specified DOMAIN module)\n)); - - return -1; -} - static int net_idmap_aclmapset(struct net_context *c, int argc, const char **argv) { TALLOC_CTX *mem_ctx; diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index 22a44c4..7567b8c 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -86,7 +86,6 @@ int net_help(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_idmap.c */ -int net_help_idmap(struct net_context *c, int argc, const char **argv); int net_idmap(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_join.c */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via f31861e s3:net: remove unused net_idmap_help from 3720d13 libndr: share some uuid helpers. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit f31861e02e01cba20f42495b37ddf4b4119dac12 Author: Gregor Beck gb...@sernet.de Date: Fri Jan 28 10:58:03 2011 +0100 s3:net: remove unused net_idmap_help Signed-off-by: Michael Adam ob...@samba.org Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Tue Feb 8 11:50:37 CET 2011 on sn-devel-104 --- Summary of changes: source3/utils/net_idmap.c | 16 source3/utils/net_proto.h |1 - 2 files changed, 0 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index e3640bd..7551354 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -372,22 +372,6 @@ static int net_idmap_secret(struct net_context *c, int argc, const char **argv) return 0; } -int net_help_idmap(struct net_context *c, int argc, const char **argv) -{ - d_printf(_(net idmap dump inputfile\n - Dump current id mapping\n)); - - d_printf(_(net idmap restore\n - Restore entries from stdin\n)); - - /* Deliberately *not* document net idmap delete */ - - d_printf(_(net idmap secret DOMAIN secret\n - Set the secret for the specified DOMAIN module)\n)); - - return -1; -} - static int net_idmap_aclmapset(struct net_context *c, int argc, const char **argv) { TALLOC_CTX *mem_ctx; diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index 22a44c4..7567b8c 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -86,7 +86,6 @@ int net_help(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_idmap.c */ -int net_help_idmap(struct net_context *c, int argc, const char **argv); int net_idmap(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_join.c */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 242797a pysecurity: Add missing dependency on pytalloc-util. from 01d3da3 s3:net: remove unused net_idmap_help http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 242797aca93a2f8d1e1670a1eaeb5d8e5cd07a1d Author: Jelmer Vernooij jel...@samba.org Date: Sun Jan 30 10:57:30 2011 +0100 pysecurity: Add missing dependency on pytalloc-util. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Tue Feb 8 13:16:43 CET 2011 on sn-devel-104 --- Summary of changes: libcli/security/wscript_build |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build index ca60a44..3526e66 100644 --- a/libcli/security/wscript_build +++ b/libcli/security/wscript_build @@ -10,6 +10,6 @@ bld.SAMBA_LIBRARY('security', if getattr(bld.env, '_SAMBA_BUILD_', 0) == 4: bld.SAMBA_PYTHON('pysecurity', source='pysecurity.c', - deps='security', + deps='security pytalloc-util', realname='samba/security.so' ) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4086c1e s4-waf: split out wscript_build for ndrdump binary. via 56fe080 lib/compression: add shared wscript_build. via 947ba44 libndr: apply some const and make is_valid_policy_hnd a callback to policy_handle_empty. via 34722c7 pam: share pam errors in a common location. from 242797a pysecurity: Add missing dependency on pytalloc-util. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4086c1e382a22f08a5b138bb6617451de2042ad9 Author: Günther Deschner g...@samba.org Date: Fri Jan 28 14:02:55 2011 +0100 s4-waf: split out wscript_build for ndrdump binary. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 14:50:54 CET 2011 on sn-devel-104 commit 56fe080d87952c6f1f1175444327769c67c55167 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:00:02 2011 +0100 lib/compression: add shared wscript_build. Guenther commit 947ba448a4d52bfbf03f6ed96e96d172a0c69dce Author: Günther Deschner g...@samba.org Date: Tue Feb 8 11:49:33 2011 +0100 libndr: apply some const and make is_valid_policy_hnd a callback to policy_handle_empty. Guenther commit 34722c72f687ad8a357656152aed9f6bafab1cad Author: Günther Deschner g...@samba.org Date: Tue Feb 8 10:45:39 2011 +0100 pam: share pam errors in a common location. Guenther --- Summary of changes: lib/compression/wscript_build |6 + {source3/lib = libcli/auth}/pam_errors.c | 14 ++-- {source4/auth/ntlm = libcli/auth}/pam_errors.h | 15 ++-- libcli/auth/wscript_build |4 + librpc/ndr/libndr.h |2 +- librpc/ndr/uuid.c |6 +- librpc/tools/wscript_build |7 ++ librpc/wscript_build|1 + source3/Makefile.in | 10 +- source3/auth/pampass.c |1 + source3/include/proto.h |7 -- source3/pam_smbpass/general.h |1 + source3/pam_smbpass/wscript_build |2 +- source3/winbindd/winbindd_util.c|1 + source3/wscript_build |9 +- source4/auth/ntlm/auth_unix.c |2 +- source4/auth/ntlm/pam_errors.c | 125 --- source4/auth/ntlm/wscript_build |6 - source4/lib/wscript_build |6 - source4/librpc/wscript_build|9 +-- source4/torture/winbind/struct_based.c |2 +- source4/winbind/wb_samba3_cmd.c |2 +- 22 files changed, 52 insertions(+), 186 deletions(-) create mode 100644 lib/compression/wscript_build rename {source3/lib = libcli/auth}/pam_errors.c (98%) rename {source4/auth/ntlm = libcli/auth}/pam_errors.h (90%) create mode 100644 librpc/tools/wscript_build delete mode 100644 source4/auth/ntlm/pam_errors.c Changeset truncated at 500 lines: diff --git a/lib/compression/wscript_build b/lib/compression/wscript_build new file mode 100644 index 000..7ad5333 --- /dev/null +++ b/lib/compression/wscript_build @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +bld.SAMBA_SUBSYSTEM('LZXPRESS', +deps='replace', + source='lzxpress.c' + ) diff --git a/source3/lib/pam_errors.c b/libcli/auth/pam_errors.c similarity index 98% rename from source3/lib/pam_errors.c rename to libcli/auth/pam_errors.c index e55d7a0..978f8ff 100644 --- a/source3/lib/pam_errors.c +++ b/libcli/auth/pam_errors.c @@ -1,23 +1,24 @@ -/* +/* * Unix SMB/CIFS implementation. * PAM error mapping functions * Copyright (C) Andrew Bartlett 2002 - * + * * 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 +#include ../libcli/auth/pam_errors.h #ifdef WITH_PAM #if defined(HAVE_SECURITY_PAM_APPL_H) @@ -28,7 +29,7 @@ #if defined(PAM_AUTHTOK_RECOVERY_ERR) !defined(PAM_AUTHTOK_RECOVER_ERR) #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR -#endif +#endif /* PAM - NT_STATUS map */ static const struct { @@
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 519a85b s4-waf: split out wscript_build for ndrdump binary. via 0c3034f lib/compression: add shared wscript_build. via 3a013a1 libndr: apply some const and make is_valid_policy_hnd a callback to policy_handle_empty. via 67b67ad pam: share pam errors in a common location. from f31861e s3:net: remove unused net_idmap_help http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 519a85b10ed184c9c22f14805191f6dc28cac8a5 Author: Günther Deschner g...@samba.org Date: Fri Jan 28 14:02:55 2011 +0100 s4-waf: split out wscript_build for ndrdump binary. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 14:50:54 CET 2011 on sn-devel-104 (cherry picked from commit 4086c1e382a22f08a5b138bb6617451de2042ad9) commit 0c3034fee492fc0a8814c13d57bf3880b9be6510 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:00:02 2011 +0100 lib/compression: add shared wscript_build. Guenther (cherry picked from commit 56fe080d87952c6f1f1175444327769c67c55167) commit 3a013a1a765e036a8af547985778c91707d7d7d3 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 11:49:33 2011 +0100 libndr: apply some const and make is_valid_policy_hnd a callback to policy_handle_empty. Guenther (cherry picked from commit 947ba448a4d52bfbf03f6ed96e96d172a0c69dce) commit 67b67ad9cf8edb09f49276f27252a4b3b34780e0 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 10:45:39 2011 +0100 pam: share pam errors in a common location. Guenther (cherry picked from commit 34722c72f687ad8a357656152aed9f6bafab1cad) --- Summary of changes: lib/compression/wscript_build |6 + {source3/lib = libcli/auth}/pam_errors.c | 14 ++-- {source4/auth/ntlm = libcli/auth}/pam_errors.h | 15 ++-- libcli/auth/wscript_build |4 + librpc/ndr/libndr.h |2 +- librpc/ndr/uuid.c |6 +- librpc/tools/wscript_build |7 ++ librpc/wscript_build|1 + source3/Makefile.in | 10 +- source3/auth/pampass.c |1 + source3/include/proto.h |7 -- source3/pam_smbpass/general.h |1 + source3/pam_smbpass/wscript_build |2 +- source3/winbindd/winbindd_util.c|1 + source3/wscript_build |9 +- source4/auth/ntlm/auth_unix.c |2 +- source4/auth/ntlm/pam_errors.c | 125 --- source4/auth/ntlm/wscript_build |6 - source4/lib/wscript_build |6 - source4/librpc/wscript_build|9 +-- source4/torture/winbind/struct_based.c |2 +- source4/winbind/wb_samba3_cmd.c |2 +- 22 files changed, 52 insertions(+), 186 deletions(-) create mode 100644 lib/compression/wscript_build rename {source3/lib = libcli/auth}/pam_errors.c (98%) rename {source4/auth/ntlm = libcli/auth}/pam_errors.h (90%) create mode 100644 librpc/tools/wscript_build delete mode 100644 source4/auth/ntlm/pam_errors.c Changeset truncated at 500 lines: diff --git a/lib/compression/wscript_build b/lib/compression/wscript_build new file mode 100644 index 000..7ad5333 --- /dev/null +++ b/lib/compression/wscript_build @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +bld.SAMBA_SUBSYSTEM('LZXPRESS', +deps='replace', + source='lzxpress.c' + ) diff --git a/source3/lib/pam_errors.c b/libcli/auth/pam_errors.c similarity index 98% rename from source3/lib/pam_errors.c rename to libcli/auth/pam_errors.c index e55d7a0..978f8ff 100644 --- a/source3/lib/pam_errors.c +++ b/libcli/auth/pam_errors.c @@ -1,23 +1,24 @@ -/* +/* * Unix SMB/CIFS implementation. * PAM error mapping functions * Copyright (C) Andrew Bartlett 2002 - * + * * 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 +#include ../libcli/auth/pam_errors.h
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8b64d06 s3-spoolss: Dont wipe out all drivers when only one should be deleted. via 9e6d61f s4-smbtorture: add torture test to check proper add and delete driver operations. via 541bf80 s3-selftest: mark the driver timestamp test as knownfail for now. via 7d107cd s4-smbtorture: also run the driver timestamp spoolss test against samba. from 4086c1e s4-waf: split out wscript_build for ndrdump binary. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 17:19:23 2011 +0100 s3-spoolss: Dont wipe out all drivers when only one should be deleted. Great catch from Bjoern Baumbach b...@sernet.de ! Andreas, Simo, please check. We now have a torture test (rpc.spoolss.driver.driver.multiple_drivers) for this. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 18:11:48 CET 2011 on sn-devel-104 commit 9e6d61fb8571683ddf02a7796e569ee8e4da907e Author: Günther Deschner g...@samba.org Date: Tue Feb 8 17:16:51 2011 +0100 s4-smbtorture: add torture test to check proper add and delete driver operations. Thanks to Bjoern Baumbach b...@sernet.de for pushing us to test and verify this. Guenther commit 541bf8068d5f9236ba63630f09cbc3cf02a8882f Author: Günther Deschner g...@samba.org Date: Tue Feb 8 15:16:44 2011 +0100 s3-selftest: mark the driver timestamp test as knownfail for now. Guenther commit 7d107cda8936edfe3e0ce916600cc3cea91cd490 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 15:16:20 2011 +0100 s4-smbtorture: also run the driver timestamp spoolss test against samba. Guenther --- Summary of changes: source3/rpc_server/srv_spoolss_util.c |5 +- source3/selftest/knownfail|1 + source4/torture/rpc/spoolss.c | 81 +++-- 3 files changed, 81 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 5640711..dc861f8 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -4126,9 +4126,10 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, } key_name = talloc_asprintf(tmp_ctx, - %s\\Environments\\%s\\Drivers\\Version-%u, + %s\\Environments\\%s\\Drivers\\Version-%u\\%s, TOP_LEVEL_CONTROL_KEY, - info8-architecture, version); + info8-architecture, version, + info8-driver_name); if (key_name == NULL) { result = WERR_NOMEM; goto done; diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index fde9b76..661ec50 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -4,3 +4,4 @@ samba3.posix_s3.rap.printing # fails sometimes on sn-devel samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ? samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure +.*driver.add_driver_timestamps # we only can store dates, not timestamps diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index dc9f704..6ba1c3d 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -9269,10 +9269,6 @@ static bool test_add_driver_timestamps(struct torture_context *tctx, struct torture_driver_context *d; struct timeval t = timeval_current(); - if (torture_setting_bool(tctx, samba3, false)) { - torture_skip(tctx, skipping timestamps test against samba); - } - d = talloc_zero(tctx, struct torture_driver_context); d-info8.version= SPOOLSS_DRIVER_VERSION_200X; @@ -9299,6 +9295,81 @@ static bool test_add_driver_timestamps(struct torture_context *tctx, return true; } +static bool test_multiple_drivers(struct torture_context *tctx, + struct dcerpc_pipe *p) +{ + struct torture_driver_context *d; + struct dcerpc_binding_handle *b = p-binding_handle; + const char *server_name_slash = talloc_asprintf(tctx, %s, dcerpc_server_name(p)); + int i; + struct spoolss_AddDriverInfo8 info8; + uint32_t add_flags = APD_COPY_NEW_FILES; + uint32_t delete_flags = 0; + + d = talloc_zero(tctx, struct torture_driver_context); + +
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 5624aa8 s3-spoolss: Dont wipe out all drivers when only one should be deleted. via abd4a39 s4-smbtorture: add torture test to check proper add and delete driver operations. via 1065ecc s3-selftest: mark the driver timestamp test as knownfail for now. via 4d9492e s4-smbtorture: also run the driver timestamp spoolss test against samba. from 519a85b s4-waf: split out wscript_build for ndrdump binary. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 5624aa8eafa9220d93db4bd47e6a383e9bca47ef Author: Günther Deschner g...@samba.org Date: Tue Feb 8 17:19:23 2011 +0100 s3-spoolss: Dont wipe out all drivers when only one should be deleted. Great catch from Bjoern Baumbach b...@sernet.de ! Andreas, Simo, please check. We now have a torture test (rpc.spoolss.driver.driver.multiple_drivers) for this. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 18:11:48 CET 2011 on sn-devel-104 (cherry picked from commit 8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7) commit abd4a396ca25433dfcbbffe76911baea065a706e Author: Günther Deschner g...@samba.org Date: Tue Feb 8 17:16:51 2011 +0100 s4-smbtorture: add torture test to check proper add and delete driver operations. Thanks to Bjoern Baumbach b...@sernet.de for pushing us to test and verify this. Guenther (cherry picked from commit 9e6d61fb8571683ddf02a7796e569ee8e4da907e) commit 1065ecca34e1aa0ce9807867961a93be67359d69 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 15:16:44 2011 +0100 s3-selftest: mark the driver timestamp test as knownfail for now. Guenther (cherry picked from commit 541bf8068d5f9236ba63630f09cbc3cf02a8882f) commit 4d9492ed6b965b912d7f31d5664f373306f0f722 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 15:16:20 2011 +0100 s4-smbtorture: also run the driver timestamp spoolss test against samba. Guenther (cherry picked from commit 7d107cda8936edfe3e0ce916600cc3cea91cd490) --- Summary of changes: source3/rpc_server/srv_spoolss_util.c |5 +- source3/selftest/knownfail|1 + source4/torture/rpc/spoolss.c | 81 +++-- 3 files changed, 81 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 5640711..dc861f8 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -4126,9 +4126,10 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, } key_name = talloc_asprintf(tmp_ctx, - %s\\Environments\\%s\\Drivers\\Version-%u, + %s\\Environments\\%s\\Drivers\\Version-%u\\%s, TOP_LEVEL_CONTROL_KEY, - info8-architecture, version); + info8-architecture, version, + info8-driver_name); if (key_name == NULL) { result = WERR_NOMEM; goto done; diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index fde9b76..661ec50 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -4,3 +4,4 @@ samba3.posix_s3.rap.printing # fails sometimes on sn-devel samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ? samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure +.*driver.add_driver_timestamps # we only can store dates, not timestamps diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index dc9f704..6ba1c3d 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -9269,10 +9269,6 @@ static bool test_add_driver_timestamps(struct torture_context *tctx, struct torture_driver_context *d; struct timeval t = timeval_current(); - if (torture_setting_bool(tctx, samba3, false)) { - torture_skip(tctx, skipping timestamps test against samba); - } - d = talloc_zero(tctx, struct torture_driver_context); d-info8.version= SPOOLSS_DRIVER_VERSION_200X; @@ -9299,6 +9295,81 @@ static bool test_add_driver_timestamps(struct torture_context *tctx, return true; } +static bool test_multiple_drivers(struct torture_context *tctx, + struct dcerpc_pipe *p) +{ + struct torture_driver_context *d; + struct dcerpc_binding_handle *b = p-binding_handle; + const char
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via c7344c4 If possible (O_DIRECTORY exists) open an fd for a directory open. from 5624aa8 s3-spoolss: Dont wipe out all drivers when only one should be deleted. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit c7344c49188a2b2149327db82712f693eba96f17 Author: Jeremy Allison j...@samba.org Date: Mon Feb 7 20:46:36 2011 -0800 If possible (O_DIRECTORY exists) open an fd for a directory open. Start of the move towards handle-based code for directory access. Currently makes fstat/fchown code work for directories rather than falling back to pathnames. Jeremy. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Tue Feb 8 06:34:41 CET 2011 on sn-devel-104 (cherry picked from commit e68f6adca9494166bf7c24c358ea1af718970b0d) --- Summary of changes: source3/modules/nfs4_acls.c |2 +- source3/modules/vfs_afsacl.c |2 +- source3/smbd/open.c | 15 +++ source3/smbd/smb2_getinfo.c |2 +- source3/smbd/smb2_setinfo.c |2 +- source3/smbd/trans2.c| 16 source3/smbd/vfs.c |4 ++-- 7 files changed, 25 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 6e6b015..952bc9c 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -186,7 +186,7 @@ static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf) { memset(psbuf, 0, sizeof(SMB_STRUCT_STAT)); - if (fsp-is_directory || fsp-fh-fd == -1) { + if (fsp-fh-fd == -1) { return smbacl4_GetFileOwner(fsp-conn, fsp-fsp_name-base_name, psbuf); } diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 8e61351..df4a20a 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -682,7 +682,7 @@ static size_t afs_fto_nt_acl(struct afs_acl *afs_acl, { SMB_STRUCT_STAT sbuf; - if (fsp-is_directory || fsp-fh-fd == -1) { + if (fsp-fh-fd == -1) { /* Get the stat struct for the owner info. */ return afs_to_nt_acl(afs_acl, fsp-conn, fsp-fsp_name, security_info, ppdesc); diff --git a/source3/smbd/open.c b/source3/smbd/open.c index e6a70bc..ded3d34 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2726,12 +2726,25 @@ static NTSTATUS open_directory(connection_struct *conn, mtimespec = smb_dname-st.st_ex_mtime; +#ifdef O_DIRECTORY + status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(5, (open_directory: Could not open fd for + %s (%s)\n, + smb_fname_str_dbg(smb_dname), + nt_errstr(status))); + file_free(req, fsp); + return status; + } +#endif + lck = get_share_mode_lock(talloc_tos(), fsp-file_id, conn-connectpath, smb_dname, mtimespec); if (lck == NULL) { DEBUG(0, (open_directory: Could not get share mode lock for %s\n, smb_fname_str_dbg(smb_dname))); + fd_close(fsp); file_free(req, fsp); return NT_STATUS_SHARING_VIOLATION; } @@ -2742,6 +2755,7 @@ static NTSTATUS open_directory(connection_struct *conn, if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(lck); + fd_close(fsp); file_free(req, fsp); return status; } @@ -2754,6 +2768,7 @@ static NTSTATUS open_directory(connection_struct *conn, status = can_set_delete_on_close(fsp, 0); if (!NT_STATUS_IS_OK(status) !NT_STATUS_EQUAL(status, NT_STATUS_DIRECTORY_NOT_EMPTY)) { TALLOC_FREE(lck); + fd_close(fsp); file_free(req, fsp); return status; } diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 5f5cd02..123531c 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -321,7 +321,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx, /* We know this name is ok, it's already passed the checks. */ - } else if (fsp (fsp-is_directory || fsp-fh-fd == -1)) { + } else if (fsp fsp-fh-fd == -1) { /* * This is actually a QFILEINFO on a directory * handle (returned from an NT SMB). NT5.0 seems diff --git
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 698d339 selftest: remove make oldtest. via 4806714 s3-selftest: let valgrindtest use the new make test. via 587cfd1 waf: bring back shared Makefile and configure (needed by s3-waf). from 8b64d06 s3-spoolss: Dont wipe out all drivers when only one should be deleted. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 698d339ffd8abf59f0f000d4155241c267975c68 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:56:32 2011 +0100 selftest: remove make oldtest. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 22:16:31 CET 2011 on sn-devel-104 commit 480671481e69f0646ab78086dc275f798f713af6 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:55:12 2011 +0100 s3-selftest: let valgrindtest use the new make test. Guenther commit 587cfd1832d297a1a7e472e20889da356f9e6815 Author: Günther Deschner g...@samba.org Date: Tue Feb 8 20:44:55 2011 +0100 waf: bring back shared Makefile and configure (needed by s3-waf). Guenther Revert build: removed unused build scripts This reverts commit 2e520ca91180920e4c8b71be4eaa7fabb56d2a12. --- Summary of changes: Makefile = buildtools/scripts/Makefile.waf| 19 +- {source3 = buildtools/scripts}/autogen-waf.sh |4 +- .../configure = buildtools/scripts/configure.waf |4 +- source3/Makefile.in|9 +- source3/script/tests/selftest.sh | 513 5 files changed, 14 insertions(+), 535 deletions(-) copy Makefile = buildtools/scripts/Makefile.waf (74%) copy {source3 = buildtools/scripts}/autogen-waf.sh (83%) copy source4/configure = buildtools/scripts/configure.waf (81%) delete mode 100755 source3/script/tests/selftest.sh Changeset truncated at 500 lines: diff --git a/Makefile b/buildtools/scripts/Makefile.waf similarity index 74% copy from Makefile copy to buildtools/scripts/Makefile.waf index cbbf045..716ab93 100644 --- a/Makefile +++ b/buildtools/scripts/Makefile.waf @@ -1,6 +1,6 @@ # simple makefile wrapper to run waf -WAF_BINARY=./buildtools/bin/waf +WAF_BINARY=BUILDTOOLS/bin/waf WAF=WAF_MAKE=1 $(WAF_BINARY) all: @@ -19,9 +19,6 @@ help: @echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH $(WAF) --help -subunit-test: - $(WAF) test --filtered-subunit $(TEST_OPTIONS) - testenv: $(WAF) test --testenv $(TEST_OPTIONS) @@ -29,12 +26,10 @@ quicktest: $(WAF) test --quick $(TEST_OPTIONS) dist: - touch .tmplock - WAFLOCK=.tmplock $(WAF) dist + $(WAF) dist distcheck: - touch .tmplock - WAFLOCK=.tmplock $(WAF) distcheck + $(WAF) distcheck clean: $(WAF) clean @@ -66,10 +61,12 @@ etags: ctags: $(WAF) ctags -# this allows for things like make bin/smbtorture bin/%:: FORCE $(WAF) --targets=`basename $@` FORCE: -pydoctor: - $(WAF) pydoctor +configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf + ./autogen-waf.sh + +Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf + ./autogen-waf.sh diff --git a/source3/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh similarity index 83% copy from source3/autogen-waf.sh copy to buildtools/scripts/autogen-waf.sh index 432b523..7a6e94c 100755 --- a/source3/autogen-waf.sh +++ b/buildtools/scripts/autogen-waf.sh @@ -22,6 +22,6 @@ sed s|BUILDTOOLS|$d|g $p/$d/scripts/Makefile.waf $p/Makefile echo done. Now run $p/configure or $p/configure.developer then make. if [ $p != . ]; then - echo Notice: The build invoke path is not 'source3'! Use make with the parameter - echo -C 'source3' path. Example: make -C source3 all + echo Notice: The build invoke path is not 'source4'! Use make with the parameter + echo -C 'source4' path. Example: make -C source4 all fi diff --git a/source4/configure b/buildtools/scripts/configure.waf similarity index 81% copy from source4/configure copy to buildtools/scripts/configure.waf index fbd81fe..a7d8d1d 100755 --- a/source4/configure +++ b/buildtools/scripts/configure.waf @@ -2,13 +2,13 @@ PREVPATH=`dirname $0` -WAF=../buildtools/bin/waf +WAF=BUILDTOOLS/bin/waf # using JOBS=1 gives maximum compatibility with # systems like AIX which have broken threading in python JOBS=1 export JOBS -cd . || exit 1 +cd BUILDPATH || exit 1 $WAF configure $@ || exit 1 cd $PREVPATH diff --git a/source3/Makefile.in b/source3/Makefile.in index 2055a6e..15d854e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3402,18 +3402,13 @@ test_pam_modules:: pam_modules TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf} -oldtest:: all
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via c7cb524 selftest: remove make oldtest. via 08801aa s3-selftest: let valgrindtest use the new make test. from c7344c4 If possible (O_DIRECTORY exists) open an fd for a directory open. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit c7cb524dd3d7d2bda0ee1ed1e8919def5f85a67c Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:56:32 2011 +0100 selftest: remove make oldtest. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Feb 8 22:16:31 CET 2011 on sn-devel-104 (cherry picked from commit 698d339ffd8abf59f0f000d4155241c267975c68) commit 08801aa1f92721c467b5bc748dfda3ec0561c39d Author: Günther Deschner g...@samba.org Date: Tue Feb 8 14:55:12 2011 +0100 s3-selftest: let valgrindtest use the new make test. Guenther (cherry picked from commit 480671481e69f0646ab78086dc275f798f713af6) --- Summary of changes: source3/Makefile.in |9 +- source3/script/tests/selftest.sh | 513 -- 2 files changed, 2 insertions(+), 520 deletions(-) delete mode 100755 source3/script/tests/selftest.sh Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 7ef7d82..f9d6a32 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3402,18 +3402,13 @@ test_pam_modules:: pam_modules TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf} -oldtest:: all torture timelimit - @echo Running Test suite - @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL=$(PERL) NSS_WRAPPER_WINBIND_SO_PATH=$(srcdir)/@WINBIND_NSS@ $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS} - valgrindtest:: all torture timelimit @echo Running Test suite with valgrind - @LIB_PATH_VAR=$(LIB_PATH_VAR) \ + @$(MAKE) test \ NMBD_VALGRIND=xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30 \ WINBINDD_VALGRIND=xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30 \ SMBD_VALGRIND=xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30 \ -VALGRIND=valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log \ -PERL=$(PERL) $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS} +VALGRIND=valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log selftestdir = ../selftest diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh deleted file mode 100755 index 3da4fac..000 --- a/source3/script/tests/selftest.sh +++ /dev/null @@ -1,513 +0,0 @@ -#!/bin/sh - -if [ $# -lt 2 ]; then - echo $0 directory all | quick [-t smbtorture4] [-s shrdir] \ -[-c custom conf] - exit 1 -fi - -## -## Setup the required args -## -DIRECTORY=$1; shift; -SUBTESTS=$1; shift; - -## -## Parse oprtional args -## -while getopts s:c:t: f -do -case $f in - t) SMBTORTURE4=$OPTARG;; - s) ALT_SHRDIR_ARG=$OPTARG;; - c) CUSTOM_CONF_ARG=$OPTARG;; -esac -done - -echo Running selftest with the following -echo Selftest Directory: $DIRECTORY -echo Subtests to Run: $SUBTESTS -echo smbtorture4 Path: $SMBTORTURE4 -echo Alternative Share Dir: $ALT_SHRDIR_ARG -echo Custom Configuration: $CUSTOM_CONF_ARG - -if [ $CUSTOM_CONF_ARG ]; then -INCLUDE_CUSTOM_CONF=include = $CUSTOM_CONF_ARG -fi - -## -## create the test directory layout -## -PREFIX=`echo $DIRECTORY | sed s+//+/+` -printf %s CREATE TEST ENVIRONMENT IN '$PREFIX'... -/bin/rm -rf $PREFIX -if [ -e $PREFIX ]; then - echo *** - echo *** Failed to delete test environment $PREFIX - echo *** Was a previous run done as root ? - echo *** - exit 1 -fi - -## -## create the test directory -## -mkdir -p $PREFIX || exit $? -OLD_PWD=`pwd` -cd $PREFIX || exit $? -PREFIX_ABS=`pwd` -cd $OLD_PWD - -if [ -z $TORTURE_MAXTIME ]; then -TORTURE_MAXTIME=300 -fi -export TORTURE_MAXTIME - -## -## setup the various environment variables we need -## - -WORKGROUP=SAMBA-TEST -SERVER=localhost2 -SERVER_IP=127.0.0.2 -if [ ! x$USER = x ]; then -USERNAME=$USER -else -if [ ! x$LOGNAME = x ]; then -USERNAME=$LOGNAME -else -USERNAME=`PATH=/usr/ucb:$PATH whoami || id -un` -fi -fi -USERID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f1 | sed -e 's/uid=\([0-9]*\).*/\1/g'` -GROUPID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f2 | sed -e 's/gid=\([0-9]*\).*/\1/g'` -PASSWORD=testPw - -SRCDIR=`dirname $0`/../.. -BINDIR=`pwd`/bin -SCRIPTDIR=$SRCDIR/script/tests -LIBDIR=$PREFIX_ABS/lib -VFS_MODULESDIR=$BINDIR -PIDDIR=$PREFIX_ABS/pid -CONFFILE=$LIBDIR/client.conf -SAMBA4CONFFILE=$LIBDIR/samba4client.conf -SERVERCONFFILE=$LIBDIR/server.conf
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5a0ee95 s3: Fix some nonempty blank lines and some typos from 698d339 selftest: remove make oldtest. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5a0ee95b95d22f8eee7cc86d350fb0e60ab54b69 Author: Volker Lendecke v...@samba.org Date: Tue Feb 8 23:08:21 2011 +0100 s3: Fix some nonempty blank lines and some typos Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Wed Feb 9 00:01:45 CET 2011 on sn-devel-104 --- Summary of changes: source3/include/packet.h |6 +++--- source3/lib/packet.c |6 +++--- source3/lib/util_sock.c |2 +- source3/rpc_server/srv_spoolss_util.c |2 +- source3/utils/smbfilter.c | 14 +++--- source3/winbindd/winbindd_samr.c |2 +- 6 files changed, 16 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/packet.h b/source3/include/packet.h index 45a9bc2..a77a1a7 100644 --- a/source3/include/packet.h +++ b/source3/include/packet.h @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Packet handling Copyright (C) Volker Lendecke 2007 - + 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/. */ diff --git a/source3/lib/packet.c b/source3/lib/packet.c index fefb74a..1abf35c 100644 --- a/source3/lib/packet.c +++ b/source3/lib/packet.c @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Packet handling Copyright (C) Volker Lendecke 2007 - + 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/. */ diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 8b25e01..d0ff960 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -111,7 +111,7 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx, } else { dest = talloc_asprintf(ctx, %s, addr); } - + return dest; } diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index dc861f8..db57574 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -208,7 +208,7 @@ static uint32_t winreg_printer_rev_changeid(void) #else /* * This setting seems to work well but is too untested -* to replace the above calculation. Left in for experiementation +* to replace the above calculation. Left in for experimentation * of the reader--jerry (Tue Mar 12 09:15:05 CST 2002) */ return tv.tv_sec * 10 + tv.tv_usec / 10; diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c index 136047a..3e683b9 100644 --- a/source3/utils/smbfilter.c +++ b/source3/utils/smbfilter.c @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. SMB filter/socket plugin Copyright (C) Andrew Tridgell 1999 - + 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/. */ @@ -193,14 +193,14 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
[SCM] build.samba.org - branch master updated
The branch, master has been updated via ecacea8 enable samba_3_waf build via 64bff4a don't send emails about samba_3_waf builds yet via 6c458e6 support samba_3_waf builds from 00aea84 switch the build farm to using the top level Samba4 build http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit ecacea86a2010b814daff025f5575b8d5bf9141c Author: Andrew Tridgell tri...@samba.org Date: Wed Feb 9 10:19:00 2011 +1100 enable samba_3_waf build also switch to source3 for s3 builds, which better matches what end users do commit 64bff4a492fb94f8e45b0998ab24a79aec86ed84 Author: Andrew Tridgell tri...@samba.org Date: Wed Feb 9 10:18:30 2011 +1100 don't send emails about samba_3_waf builds yet commit 6c458e631fb03370d57724bb917e58053e04b306 Author: Andrew Tridgell tri...@samba.org Date: Wed Feb 9 10:18:18 2011 +1100 support samba_3_waf builds --- Summary of changes: SerNet-IRIX.fns |8 SerNet-Tru64.fns |7 --- SerNet-aix.fns|7 --- SerNet-solaris8.fns |7 --- build_test.fns| 11 ++- charis.fns|3 ++- fjall.fns |7 --- generic.fns |7 --- gwen.fns |7 --- hape.fns |7 --- import-and-analyse.py |4 m104.fns |7 --- magni.fns |7 --- opi.fns |7 --- qnx18.fns |7 --- sunX.fns |7 --- 16 files changed, 68 insertions(+), 42 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns index 8713691..1a4d7b4 100644 --- a/SerNet-IRIX.fns +++ b/SerNet-IRIX.fns @@ -17,10 +17,10 @@ for compiler in $compilers; do test_tree samba_4_0_test . $compiler - test_tree samba_3_current source $compiler - test_tree samba_3_next source $compiler - test_tree samba_3_master source $compiler - + test_tree samba_3_current source3 $compiler + test_tree samba_3_next source3 $compiler + test_tree samba_3_master source3 $compiler + test_tree samba_3_waf source3 $compiler done global_unlock diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index 188991b..efb706d 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -23,9 +23,10 @@ for compiler in $compilers; do CPPFLAGS=$SAVED_CPPFLAGS export CPPFLAGS - test_tree samba_3_current source $compiler - test_tree samba_3_next source $compiler - test_tree samba_3_master source $compiler + test_tree samba_3_current source3 $compiler + test_tree samba_3_next source3 $compiler + test_tree samba_3_master source3 $compiler + test_tree samba_3_waf source3 $compiler TDB_NO_FSYNC=0 export TDB_NO_FSYNC diff --git a/SerNet-aix.fns b/SerNet-aix.fns index 56632ef..d7bb98a 100644 --- a/SerNet-aix.fns +++ b/SerNet-aix.fns @@ -24,9 +24,10 @@ compiler=cc . common.fns test_tree lorikeet-heimdal . $compiler -test_tree samba_3_current source $compiler -test_tree samba_3_next source $compiler -test_tree samba_3_master source $compiler +test_tree samba_3_current source3 $compiler +test_tree samba_3_next source3 $compiler +test_tree samba_3_master source3 $compiler +test_tree samba_3_waf source3 $compiler test_tree pidl . cc build test compiler=xlc_r diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns index b76abda..6798044 100644 --- a/SerNet-solaris8.fns +++ b/SerNet-solaris8.fns @@ -35,9 +35,10 @@ for compiler in $compilers; do TDB_NO_FSYNC=1 export TDB_NO_FSYNC test_tree samba_4_0_test . $compiler - test_tree samba_3_current source $compiler - test_tree samba_3_next source $compiler - test_tree samba_3_master source $compiler + test_tree samba_3_current source3 $compiler + test_tree samba_3_next source3 $compiler + test_tree samba_3_master source3 $compiler + test_tree samba_3_waf source3 $compiler TDB_NO_FSYNC=0 export TDB_NO_FSYNC done diff --git a/build_test.fns b/build_test.fns index 552862a..7b2bff8 100644 --- a/build_test.fns +++ b/build_test.fns @@ -345,7 +345,7 @@ action_lcovreport() { action_configure() { - +# special handling for some trees case $tree in waf*) $builddir/timelimit $MAXTIME ./waf configure @@ -353,6 +353,15 @@ action_configure() { echo CONFIGURE STATUS: $cstatus return $cstatus ;; + samba_3_waf) + $builddir/timelimit $MAXTIME $srcdir/autogen-waf.sh + cstatus=$? + echo autogen-waf.sh STATUS: $cstatus + if [ x$cstatus != x0 ]; then +
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 553d9b4 added samba_3_waf to the list of trees in the web interface from ecacea8 enable samba_3_waf build http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 553d9b4dbf9f49e20a666706e4848ede60155674 Author: Andrew Tridgell tri...@samba.org Date: Wed Feb 9 10:21:18 2011 +1100 added samba_3_waf to the list of trees in the web interface --- Summary of changes: web/trees.conf | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/web/trees.conf b/web/trees.conf index 10bf3eb..9ab398a 100644 --- a/web/trees.conf +++ b/web/trees.conf @@ -22,19 +22,25 @@ branch = trunk scm = git repo = samba.git branch = v3-5-test -srcdir = source +srcdir = source3 [samba_3_next] scm = git repo = samba.git branch = v3-6-test -srcdir = source +srcdir = source3 [samba_3_master] scm = git repo = samba.git branch = master -srcdir = source +srcdir = source3 + +[samba_3_waf] +scm = git +repo = samba.git +branch = master +srcdir = source3 [samba_4_0_test] scm = git -- build.samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a674a56 Add fdopendir to the VFS. We will use this to reuse a directory fd already open by NtCreateX. via 224fc03 Pass fsp to dptr_CloseDir(). Cope with setting the fd if we're closing an fd that opendir knows about. via ad3d1ad Add configure checks for fdopendir. via 1911d48 Add fdopendir(). from 5a0ee95 s3: Fix some nonempty blank lines and some typos http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a674a56a97c78a44bf43f1c175d106fbe70c7485 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:07:48 2011 -0800 Add fdopendir to the VFS. We will use this to reuse a directory fd already open by NtCreateX. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Wed Feb 9 00:55:22 CET 2011 on sn-devel-104 commit 224fc03cb56b0d76f6ad7f18dd0528d6b0e57fb1 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:05:00 2011 -0800 Pass fsp to dptr_CloseDir(). Cope with setting the fd if we're closing an fd that opendir knows about. commit ad3d1adea3cdf42aee644dd853193b53a142c2f1 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:04:47 2011 -0800 Add configure checks for fdopendir. commit 1911d483e552a6ec73b2c107b968268e7e9111e5 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 14:43:07 2011 -0800 Add fdopendir(). --- Summary of changes: examples/VFS/skel_opaque.c|6 examples/VFS/skel_transparent.c |6 source3/configure.in |1 + source3/include/proto.h |3 +- source3/include/smbprofile.h |4 +++ source3/include/vfs.h |6 source3/include/vfs_macros.h |5 +++ source3/lib/system.c | 16 +++ source3/modules/vfs_default.c | 14 ++ source3/modules/vfs_dirsort.c | 43 ++ source3/modules/vfs_full_audit.c | 16 +++ source3/modules/vfs_netatalk.c| 26 ++ source3/modules/vfs_scannedonly.c | 30 + source3/modules/vfs_shadow_copy.c | 53 + source3/modules/vfs_time_audit.c | 21 ++ source3/smbd/close.c |4 --- source3/smbd/dir.c| 12 ++-- source3/smbd/open.c |3 ++ source3/smbd/smb2_find.c |5 +--- source3/smbd/vfs.c|9 ++ source3/utils/status_profile.c|2 + source3/wscript |1 + 22 files changed, 274 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index e506a20..da126e3 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -87,6 +87,11 @@ static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle, const char *fnam return NULL; } +static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr) +{ + return NULL; +} + static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf) @@ -784,6 +789,7 @@ struct vfs_fn_pointers skel_transparent_fns = { /* Directory operations */ .opendir = skel_opendir, + .fdopendir = skel_fdopendir, .readdir = skel_readdir, .seekdir = skel_seekdir, .telldir = skel_telldir, diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index 3ab3b63..0ffdc11 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -84,6 +84,11 @@ static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle, const char *fnam return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr); } +static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr) +{ + return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr); +} + static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf) @@ -728,6 +733,7 @@ struct vfs_fn_pointers skel_transparent_fns = { /* Directory operations */ .opendir = skel_opendir, + .fdopendir = skel_fdopendir, .readdir = skel_readdir, .seekdir = skel_seekdir, .telldir = skel_telldir, diff --git a/source3/configure.in b/source3/configure.in index f0d8de7..363fbac 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1099,6 +1099,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocat AC_CHECK_FUNCS(fallocate fallocate64)
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via e58ac20 Add fdopendir to the VFS. We will use this to reuse a directory fd already open by NtCreateX. via d0e5477 Pass fsp to dptr_CloseDir(). Cope with setting the fd if we're closing an fd that opendir knows about. (cherry picked from commit 224fc03cb56b0d76f6ad7f18dd0528d6b0e57fb1) via 07fa270 Add configure checks for fdopendir. (cherry picked from commit ad3d1adea3cdf42aee644dd853193b53a142c2f1) via 6bbd85d Add fdopendir(). (cherry picked from commit 1911d483e552a6ec73b2c107b968268e7e9111e5) via 84b98e5 s3: Fix some nonempty blank lines and some typos from c7cb524 selftest: remove make oldtest. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit e58ac20a8ac5ae4cf717f7f8f9fb4679a8106068 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:07:48 2011 -0800 Add fdopendir to the VFS. We will use this to reuse a directory fd already open by NtCreateX. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Wed Feb 9 00:55:22 CET 2011 on sn-devel-104 (cherry picked from commit a674a56a97c78a44bf43f1c175d106fbe70c7485) commit d0e5477d89f3e0f8c06ebb3c2345ae4e0896b475 Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:05:00 2011 -0800 Pass fsp to dptr_CloseDir(). Cope with setting the fd if we're closing an fd that opendir knows about. (cherry picked from commit 224fc03cb56b0d76f6ad7f18dd0528d6b0e57fb1) commit 07fa270bc016e4f81b1e1c675a965081b340287a Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 15:04:47 2011 -0800 Add configure checks for fdopendir. (cherry picked from commit ad3d1adea3cdf42aee644dd853193b53a142c2f1) commit 6bbd85d00ac0399a6f1021ebb089a85000db05ef Author: Jeremy Allison j...@samba.org Date: Tue Feb 8 14:43:07 2011 -0800 Add fdopendir(). (cherry picked from commit 1911d483e552a6ec73b2c107b968268e7e9111e5) commit 84b98e548e27bfaf01cdceddc97dd37cc508d6fa Author: Volker Lendecke v...@samba.org Date: Tue Feb 8 23:08:21 2011 +0100 s3: Fix some nonempty blank lines and some typos Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Wed Feb 9 00:01:45 CET 2011 on sn-devel-104 (cherry picked from commit 5a0ee95b95d22f8eee7cc86d350fb0e60ab54b69) --- Summary of changes: examples/VFS/skel_opaque.c|6 examples/VFS/skel_transparent.c |6 source3/configure.in |1 + source3/include/packet.h |6 ++-- source3/include/proto.h |3 +- source3/include/smbprofile.h |4 ++ source3/include/vfs.h |6 source3/include/vfs_macros.h |5 +++ source3/lib/packet.c |6 ++-- source3/lib/system.c | 16 ++ source3/lib/util_sock.c |2 +- source3/modules/vfs_default.c | 14 + source3/modules/vfs_dirsort.c | 43 ++ source3/modules/vfs_full_audit.c | 16 ++ source3/modules/vfs_netatalk.c| 26 source3/modules/vfs_scannedonly.c | 30 ++ source3/modules/vfs_shadow_copy.c | 53 + source3/modules/vfs_time_audit.c | 21 + source3/rpc_server/srv_spoolss_util.c |2 +- source3/smbd/close.c |4 -- source3/smbd/dir.c| 12 +-- source3/smbd/open.c |3 ++ source3/smbd/smb2_find.c |5 +-- source3/smbd/vfs.c|9 + source3/utils/smbfilter.c | 14 source3/utils/status_profile.c|2 + source3/winbindd/winbindd_samr.c |2 +- source3/wscript |1 + 28 files changed, 290 insertions(+), 28 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index e506a20..da126e3 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -87,6 +87,11 @@ static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle, const char *fnam return NULL; } +static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr) +{ + return NULL; +} + static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf) @@ -784,6 +789,7 @@ struct vfs_fn_pointers skel_transparent_fns = { /* Directory operations */ .opendir = skel_opendir, + .fdopendir = skel_fdopendir, .readdir = skel_readdir, .seekdir = skel_seekdir, .telldir = skel_telldir,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6c89bb8 waf Remove debugging hacks left in the top level build via 45b16de s4-waf Remove source4 build system. via 7e76367 s4-auth Fix setting of bad_password_count in auth_convert_user_info_dc_sambaseinfo() via ce461a7 s4-selftest Fix valgrind and gdb options for top level build via a2ce53c s4-auth Rework auth subsystem to remove struct auth_serversupplied_info via f1c0e95 s4-auth Add auth.idl to encode auth subsystem structures in IDL from a674a56 Add fdopendir to the VFS. We will use this to reuse a directory fd already open by NtCreateX. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6c89bb8d85c0f7cfe781dbcb7db2d23fba12afce Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 9 10:59:18 2011 +1100 waf Remove debugging hacks left in the top level build Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Wed Feb 9 01:55:15 CET 2011 on sn-devel-104 commit 45b16de1fcc6a76bd4d9dcdd41616942065f7fc4 Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 9 10:50:57 2011 +1100 s4-waf Remove source4 build system. The top level build is the official build system now. Andrew Bartlett commit 7e76367e59452bc8f516572eb05ed614b776087d Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 9 10:46:21 2011 +1100 s4-auth Fix setting of bad_password_count in auth_convert_user_info_dc_sambaseinfo() Discovered during the convertion to auth_user_info. Andrew Bartlett commit ce461a7857cfc1658b31f43ebfda0cccf73fb5fb Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 8 20:38:05 2011 +1100 s4-selftest Fix valgrind and gdb options for top level build Andrew Bartlett commit a2ce53c1f5301ffcf990dbab837c328ea22739b6 Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 8 16:53:13 2011 +1100 s4-auth Rework auth subsystem to remove struct auth_serversupplied_info This changes auth_serversupplied_info into the IDL-defined struct auth_user_info_dc. This then in turn contains a struct auth_user_info, which is the only part of the structure that is mainted into the struct session_info. The idea here is to avoid keeping the incomplete results of the authentication (such as session keys, lists of SID memberships etc) in a namespace where it may be confused for the finalised results. Andrew Barltett commit f1c0e9532d8e3fb0d8942e4d4e1a122429266b16 Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 8 16:39:34 2011 +1100 s4-auth Add auth.idl to encode auth subsystem structures in IDL This is not only a useful way to encode stuff, it also allows python to handle the structures, and natrually allows them to be NDR encoded. Andrew Bartlett --- Summary of changes: librpc/idl/auth.idl | 70 ++ librpc/idl/wscript_build |2 +- source4/Makefile | 75 -- source4/VERSION | 117 - source4/auth/auth.h | 80 ++- source4/auth/auth_sam_reply.c | 220 +- source4/auth/gensec/gensec.c |8 +- source4/auth/gensec/gensec.h |2 +- source4/auth/gensec/gensec_gssapi.c | 39 +++- source4/auth/gensec/gensec_krb5.c | 14 +- source4/auth/kerberos/kerberos.h |4 +- source4/auth/kerberos/kerberos_pac.c | 103 + source4/auth/ntlm/auth.c | 50 ++-- source4/auth/ntlm/auth_anonymous.c|4 +- source4/auth/ntlm/auth_developer.c| 82 --- source4/auth/ntlm/auth_sam.c | 20 +- source4/auth/ntlm/auth_server.c | 70 +++--- source4/auth/ntlm/auth_simple.c |8 +- source4/auth/ntlm/auth_unix.c | 99 source4/auth/ntlm/auth_winbind.c | 12 +- source4/auth/ntlmssp/ntlmssp.h|2 +- source4/auth/ntlmssp/ntlmssp_server.c | 20 +- source4/auth/sam.c| 164 +++--- source4/auth/session.c| 43 ++-- source4/auth/session.h| 16 +- source4/auth/system_session.c | 314 + source4/configure | 14 - source4/configure.nodebug.developer |3 - source4/configure.tridge.opt |2 - source4/dsdb/samdb/ldb_modules/acl_util.c |4 +- source4/kdc/kpasswdd.c| 10 +- source4/kdc/pac-glue.c| 21 +- source4/ntvfs/ipc/vfs_ipc.c
Re: [SCM] Samba Shared Repository - branch v3-6-test updated
On Tue, 2011-02-08 at 19:19 +0100, Günther Deschner wrote: s3-spoolss: Dont wipe out all drivers when only one should be deleted. Great catch from Bjoern Baumbach b...@sernet.de ! Andreas, Simo, please check. We now have a torture test (rpc.spoolss.driver.driver.multiple_drivers) for this. Good catch indeed. Looks good to me. Simo. -- Simo Sorce Samba Team GPL Compliance Officer s...@samba.org Principal Software Engineer at Red Hat, Inc. s...@redhat.com