[Samba] smbmount: reading changes ntfs journal
Hi @all! I'm new to this list and neither a samba nor a Windows specialist. That said: We have some linux servers mounting windows shares. The problem is that reading files on the share changes the journal / USN on the Windows side. Now our backup guys are backing up a lot of stuff that hasn't really changed because the journal tells them different. Even when I mount read- only a simple cat or less on a file causes this. Is there a way to fix this? Thanks in advance Mario -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Group issues - LDAP
On 9/5/08, JB Hewitt - Blade [EMAIL PROTECTED] wrote: I'm trying to find a command with net to show what users belong into groups. I don't use winbind so it's a bit tricky to find out. You can do this with net rpc group members group_name even without winbind. I would carefully inspect the LDAP entries for user1, user2 and user3 and the relevant groups using ldapsearch. There must be some difference between user3 and the others. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Missing files and folders on Vista
this happens with windows 2003 servers too it's a problem with explorer. the best way it s to limit the folder list to 100 and use subfolders with a max of 100 etc the xp64 and vista 64 have a different limit of 1000 in my experience. Antoine Leblanc wrote: Antoine Leblanc a écrit : Antoine Leblanc a écrit : Hello everyone. I'm having a small problem while using samba 3.0.30 on FreeBSD that two months of googling haven't managed to fix: when a folder contains two many elements, Vista only lists a small amount of them. I made my tests with a folder containing around 1000 sub-folders (which have the same unix file mode). Vista was first only showing around 250 of them. After upgrading samba to 3.0.30, Vista sees around 400... When connecting from Mac OS X I can see the whole 1000 sub-folders. Has anyone already met this kind of problem? Thanks for reading (and sorry for my poor English). Some news from that: - the missing folders contain no accent or any specific character that may cause any problem, - if I move any of the missing folders into any other less crowded folder, I can see it and access it without any problem, - if I enter the name of the missing folder in the address bar, I can also access it without any problem. - XP sees exactly the same amount of folders that Vista does, - by just creating a new directory (`mkdir test`) in the folder, the number of folders seen jumped from 411 to 548. Thanks in advance for your help! I might even add (sorry for spamming) that the number of folders seen highly depends on actions such as creating a new sub-folder : - as mentioned, creating a test folder increases the number of folders seen to 548 ; deleting it brings back the counter to 411, - creating a new folder test with Vista brings down the counter to 135, - if I move all the folders in a new sub-folder, Vista now sees n - 1 of them. Moving them back brings the number of folders seen to what it was. That seems to be highly irrational... I tried to set a high debug level, but accessing and refreshing the folder does not seem to trigger any log. I also tried to deinstall and reinstall samba then reboot the server, but that didn't change anything. Thanks in advance for any help! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] How to add registry file via netlogon script ?
Hello I have netlogon script.cmd C: CD \ NET TIME \\SERWER /SET /YES NET USE * /D /YES REM NET USE H: /HOME NET USE W: \\SERWER\SKANY NET USE U: \\SERWER\TMP$ regedit /s \\serwer\netlogon\placesbarskanery.reg And file placesbarskanery.reg doesn't add to clients registry (Windows XP Pro sp3) after logon to samba PDC Power users have error file can't be imported to registry ... The file placesbarskanery looks like Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\ComDlg32\Placesbar] Place0=D:\\skany Place1=W:\\skany2 Place2=dword:0011 Place3=dword: Place4=dword:0012 PLEASE HELP !!! Sopot Bards Meeting 6 września.Opera Leśna w Sopocie. Antonina Krzysztoń, Jacek Kleyff, Andrzej Garczarek, Phoebe Killdeer.http://klik.wp.pl/?adr=http%3A%2F%2Fcorto.www.wp.pl%2Fas%2Fbards.htmlsid=474 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Missing files and folders on Vista
Damien Dye a écrit : this happens with windows 2003 servers too it's a problem with explorer. the best way it s to limit the folder list to 100 and use subfolders with a max of 100 etc the xp64 and vista 64 have a different limit of 1000 in my experience. Ok, thanks! That's pretty weird... I don't remember having this problem when I was running an older version of samba under Gentoo Linux and accessing it with a XP 32, though... Well, I'll try to find a way to work around that. -- Antoine Leblanc -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] How to add registry file via netlogon script ?
ever heard of runas... open a dosbox and try runas /? its in there. Louis -Oorspronkelijk bericht- Van: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Namens Hubert Choma Verzonden: vrijdag 5 september 2008 10:34 Aan: samba Onderwerp: [Samba] How to add registry file via netlogon script ? Hello I have netlogon script.cmd C: CD \ NET TIME \\SERWER /SET /YES NET USE * /D /YES REM NET USE H: /HOME NET USE W: \\SERWER\SKANY NET USE U: \\SERWER\TMP$ regedit /s \\serwer\netlogon\placesbarskanery.reg And file placesbarskanery.reg doesn't add to clients registry (Windows XP Pro sp3) after logon to samba PDC Power users have error file can't be imported to registry ... The file placesbarskanery looks like Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Po licies\ComDlg32\Placesbar] Place0=D:\\skany Place1=W:\\skany2 Place2=dword:0011 Place3=dword: Place4=dword:0012 PLEASE HELP !!! Sopot Bards Meeting 6 września.Opera Leśna w Sopocie. Antonina Krzysztoń, Jacek Kleyff, Andrzej Garczarek, Phoebe Killdeer.http://klik.wp.pl/?adr=http%3A%2F%2Fcorto.www.wp.pl%2F as%2Fbards.htmlsid=474 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Missing files and folders on Vista
Actually, I doubt this is a Windows issue. As Antoine pointed out, the number of folders displayed changed after a Samba update, why would this effect Windows Explorer limits? Anyway, I just tested this on both Gentoo/Samba 3.0.32 and CentOS 5/Samba 3.2.3 with 1100 subfolders and WinXP 32bit / Vista 32bit clients, and both had no problem displaying all folders. On 9/5/08, Damien Dye [EMAIL PROTECTED] wrote: this happens with windows 2003 servers too it's a problem with explorer. the best way it s to limit the folder list to 100 and use subfolders with a max of 100 etc the xp64 and vista 64 have a different limit of 1000 in my experience. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Missing files and folders on Vista
Richard Foltyn a écrit : Actually, I doubt this is a Windows issue. As Antoine pointed out, the number of folders displayed changed after a Samba update, why would this effect Windows Explorer limits? Anyway, I just tested this on both Gentoo/Samba 3.0.32 and CentOS 5/Samba 3.2.3 with 1100 subfolders and WinXP 32bit / Vista 32bit clients, and both had no problem displaying all folders. On 9/5/08, Damien Dye [EMAIL PROTECTED] wrote: this happens with windows 2003 servers too it's a problem with explorer. the best way it s to limit the folder list to 100 and use subfolders with a max of 100 etc the xp64 and vista 64 have a different limit of 1000 in my experience. As I answered to Damien, I also never had that kind of problem when using an earlier version of Samba on Gentoo. I'm starting to think this might be a FreeBSD issue... -- Antoine Leblanc -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Permission denied on mounted CIFS share
From: Damien Dye could you also show whats logged when you do this you might need to turn up the log level. I'd send Damian the whole log but he wrote going though the log it doesn't appear that the smbd server is denying it. Any other ideas? Or suggestions how to debug the problem? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] On way trust issue
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ephi Dror wrote: Hello, Pam based authentication is failing for trusted domain users when the trust was set to one way. One way trust support for Winbind was introduced in Samba 3.2.0 What version are you running ? cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software - http://www.likewisesoftware.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIwT0AIR7qMdg1EfYRAjWqAJ9liZfSJED+zUoJHWTdXbUxMucMmwCguDhu cxfcuxti41bqAozCYl1F46E= =qG04 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba server as part of AD domain keeps asking for username and password
Sorry, My german is not that good so I´ll stick to english. I had a similar problem which was cause by samba not being able to recognize machines (AWM013 is a machine account or a user?), we have a unix heavy samba enviroment with user in both AD and unix both computers only in AD. We had problems when the computer account tried to gain access to IPC$? but where denied because the account not being recognized by samba. If you to allow guest for bad users that would go away, security might be solvable by mapping guest to nobody? Not that I would run this in production but it´s a way to test. Also if wbinfo -u or -g doesn´t work to set a valid user account in winbind to use when connecting to the domain. /Henrik 2008/9/5 Andreas Ladanyi [EMAIL PROTECTED] Hallo Hendrik, Dein Beitrag ist leider nur bei mir gelandet ! Weder bei Wolfgang, noch auf der Mailingliste :-( Zum testen finde ich den parameter: map to guest = Bad User ok, aber nicht unbedingt fürs Produktivsystem. Was meinst Du ? Sollte ein öffentliches share public=yes oder guest ok = yes nicht dazu führen, dass Du eben kein Passwort Popup bekommst ? Sonst macht das ja irgendwo keinen Sinn oder ? Grüße, Andy -Ursprüngliche Nachricht- Von: Henrik Beckman [EMAIL PROTECTED] Gesendet: 04.09.08 22:06:33 An: Andreas Ladanyi [EMAIL PROTECTED] Betreff: Re: [Samba] Re: Samba server as part of AD domain keeps asking for username and password On Thu, Sep 4, 2008 at 8:45 PM, Andreas Ladanyi [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] schrieb: Hi Andy, Thanks for the answer but I've tryed this already. With guest ok = yes And/or valid users = TESTDOM\awm013 awm013 testdom\awm013 AWM013 I haven't set the winbind seperator so it should be ok to use \ And also with guest ok = yes I still get the password promt. Thanks Wolfgang Hi Wolfgang, The error message is: Username TESTDOM\AWM013 is invalid on this system -- -- There it is [2008/08/29 11:40:00, 3] smbd/error.c:error_packet_set(106) error packet at smbd/sesssetup.c(444) cmd=115 (SMBsesssetupX) NT_STATUS_LOGON_FAILURE The username is invalid !! Is AWM013 really a user with unix attributes in the Active Directory ? You are working with winbind. Which backend do you use to save you unix user information ? Windows Server 2003 R2 ? Iam wondering i cant read an idmap backend = parameter in your smb.conf ! What is the result of wbinfo -u and wbinfo -g and wbinfo -t ??? Bye, Andy Is awm013 a computer? If so try guest = Ok and map to guest = Bad User. Also as Andy asks does wbinfo -u and -g work, otherwise what user does winbindd use? Do you have 2008 server as password servers? /Henrik _ Der WEB.DE SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! http://smartsurfer.web.de/?mc=100071distributionid=0066 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] On way trust issue
Hi Jerry, I used 3.0.25 and 3.0.31 I will look into this again as soon as we move on to 3.2. Cheers, Ephi -Original Message- From: Gerald (Jerry) Carter [mailto:[EMAIL PROTECTED] Sent: Friday, September 05, 2008 7:07 AM To: Ephi Dror Cc: samba@lists.samba.org Subject: Re: [Samba] On way trust issue -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ephi Dror wrote: Hello, Pam based authentication is failing for trusted domain users when the trust was set to one way. One way trust support for Winbind was introduced in Samba 3.2.0 What version are you running ? cheers, jerry - -- = Samba--- http://www.samba.org Likewise Software - http://www.likewisesoftware.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIwT0AIR7qMdg1EfYRAjWqAJ9liZfSJED+zUoJHWTdXbUxMucMmwCguDhu cxfcuxti41bqAozCYl1F46E= =qG04 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] The specified network name is no longer available
I feel stupid even asking, and I have a feeling the solution is something that has been staring me right in the face for hours. I can't seem to access network shared on my samba PDC. I've done this before, and I am using a similar smb.conf file and I am just at the point where I can't get anything else to happen with this thing. My original problem was that I could not get WINXP machines to join the domain and I upgraded my version of Samba in hopes that it was just a fluke. It made things worse. Everytime I navigate to \\server I just receive the error The specified network name is no longer available. Same thing when I try to join the domain. It does prompt me for a username and password, but beyond that, I have nothing. I need help!! Thank you!! current versions: CentOS 5.2 Samba 3.0.28-1.el5_2.1.x86_64 /etc/samba/smb.conf [global] log file = /var/log/samba/log.%m max log size = 50 workgroup = NMTWebDev netbios name = Server passdb backend = tdbsam security = user add user script = /usr/sbin/useradd -m %u delete user script = /usr/sbin/userdel -r %u add group script = /usr/sbin/groupadd %g delete group script = /usr/sbin/groupdel %g add user to group script = /usr/sbin/usermod -G %g %u add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null -g machines %u # The following specifies the default logon script # Per user logon scripts can be specified in the user # account using pdbedit logon script = logon.bat # This sets the default profile path. # Set per user paths with pdbedit logon drive = U: domain logons = Yes os level = 65 preferred master = Yes domain master = Yes local master = Yes wins support = Yes name resolve order = wins lmhosts hosts bcast dns proxy = Yes socket options = IPTOS_LOWDELAY TCP_NODELAY load printers = Yes printing = cups printcap name = cups # bind interfaces only = yes logon path = \\%L\%U\windowsprofile server string = PDC encrypt passwords = yes null passwords = no # interfaces = lo eth0 map to guest = Never hide unreadable = yes [homes] comment = Home Directory for %u browseable = no valid users = %S read only = no guest ok = no create mask = 0600 directory mask = 0700 inherit permissions = yes [netlogon] path = /var/lib/samba/netlogon guest ok = no read only = yes browseable = no [Public] comment = Public File Share writeable = yes path = /home/public force directory mode = 777 force group = users force create mode = 777 force user = root valid users = @users create mode = 777 directory mode = 777 [www] comment = Website Share writeable = yes path = /www force directory mode = 777 force group = users force create mode = 777 force user = root valid users = @users create mode = 777 directory mode = 777 [printers] comment = All Printers path = /var/spool/samba/print printer = IBMInfoP browseable = No public = Yes guest ok = Yes writable = No printable = Yes [print$] comment = Printer Drivers Share path = /var/lib/samba/drivers write list = @users Greg Koch -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] OPLOCK1 and OPLOCK2 tests failing
Samba 3.2.3 on Solaris 9. Two (and only two) of the tests are failing when I 'make test': ---snip--- Testing OPLOCK1 (0) TEST OUTPUT: using seed 1220649638 host=127.0.0.2 share=tmp user=me myname=thehost Running OPLOCK1 starting oplock test 1 failed to open share connection: //127.0.0.2/tmp port:0 - NT_STATUS_IO_TIMEOUT TEST OPLOCK1 FAILED! OPLOCK1 took 10.054493 secs TEST FAILED: /pathto/samba-3.2.3/source/bin/smbtorture //127.0.0.2/tmp -Ume%test -e OPLOCK1 (status 1) Testing OPLOCK2 (1) TEST OUTPUT: using seed 1220649648 host=127.0.0.2 share=tmp user=me myname=thehost Running OPLOCK2 starting oplock test 2 failed to open share connection: //127.0.0.2/tmp port:0 - NT_STATUS_IO_TIMEOUT TEST OPLOCK2 FAILED! OPLOCK2 took 10.046123 secs TEST FAILED: /pathto/samba-3.2.3/source/bin/smbtorture //127.0.0.2/tmp -Ume%test -e OPLOCK2 (status 1) ---snip--- Has anybody else seen this? -David -- David Eisner http://cradle.brokenglass.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3973-gc815414
The branch, v3-devel has been updated via c8154142d97ccf973feb36d77f932c893fda0af5 (commit) from d4f5caa3d38b5afc1e8b3d0e0c6d7d68a152fe0a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit c8154142d97ccf973feb36d77f932c893fda0af5 Author: Gerald (Jerry) Carter [EMAIL PROTECTED] Date: Mon Aug 25 16:08:28 2008 -0500 Add workaround for docs build and dependency on parameters.all.xml (cherry picked from commit d4f5b5255f9b95050ddd9d67bd3958402be77918) --- Summary of changes: release-scripts/build-docs |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/release-scripts/build-docs b/release-scripts/build-docs index 529a1c0..fa38d8d 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -5,7 +5,10 @@ DOCSRCDIR=`dirname $0`/../docs-xml cd $DOCSRCDIR || exit 1 git-clean -d -x -f -autoconf ./configure --with-papersize=letter make release +autoconf \ + ./configure --with-papersize=letter \ + make smbdotconf/parameters.all.xml \ + make release if [ $? != 0 ]; then echo Docs build failed! @@ -22,4 +25,4 @@ cd ../docs || exit 1 mv manpages-3 manpages mv htmldocs/manpages-3 htmldocs/manpages -exit \ No newline at end of file +exit -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3940-gc91e7e9
The branch, v3-3-test has been updated via c91e7e9f7f392d5ba850619395eddac34617f1e4 (commit) from ea4d67cc7ba4eb05f0761208d70849a42bf25864 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit c91e7e9f7f392d5ba850619395eddac34617f1e4 Author: Gerald (Jerry) Carter [EMAIL PROTECTED] Date: Mon Aug 25 16:08:28 2008 -0500 Add workaround for docs build and dependency on parameters.all.xml (cherry picked from commit d4f5b5255f9b95050ddd9d67bd3958402be77918) (cherry picked from commit c8154142d97ccf973feb36d77f932c893fda0af5) --- Summary of changes: release-scripts/build-docs |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/release-scripts/build-docs b/release-scripts/build-docs index 529a1c0..fa38d8d 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -5,7 +5,10 @@ DOCSRCDIR=`dirname $0`/../docs-xml cd $DOCSRCDIR || exit 1 git-clean -d -x -f -autoconf ./configure --with-papersize=letter make release +autoconf \ + ./configure --with-papersize=letter \ + make smbdotconf/parameters.all.xml \ + make release if [ $? != 0 ]; then echo Docs build failed! @@ -22,4 +25,4 @@ cd ../docs || exit 1 mv manpages-3 manpages mv htmldocs/manpages-3 htmldocs/manpages -exit \ No newline at end of file +exit -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-98-gbdb0a5d
The branch, v3-3-stable has been updated via bdb0a5d5fdbc331e11391f7b6e0aae963cebd3fc (commit) from be88a56482292bdfe274b460def46b90ff0b0d3b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit bdb0a5d5fdbc331e11391f7b6e0aae963cebd3fc Author: Gerald (Jerry) Carter [EMAIL PROTECTED] Date: Mon Aug 25 16:08:28 2008 -0500 Add workaround for docs build and dependency on parameters.all.xml (cherry picked from commit d4f5b5255f9b95050ddd9d67bd3958402be77918) (cherry picked from commit c8154142d97ccf973feb36d77f932c893fda0af5) (cherry picked from commit c91e7e9f7f392d5ba850619395eddac34617f1e4) --- Summary of changes: release-scripts/build-docs |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/release-scripts/build-docs b/release-scripts/build-docs index 529a1c0..fa38d8d 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -5,7 +5,10 @@ DOCSRCDIR=`dirname $0`/../docs-xml cd $DOCSRCDIR || exit 1 git-clean -d -x -f -autoconf ./configure --with-papersize=letter make release +autoconf \ + ./configure --with-papersize=letter \ + make smbdotconf/parameters.all.xml \ + make release if [ $? != 0 ]; then echo Docs build failed! @@ -22,4 +25,4 @@ cd ../docs || exit 1 mv manpages-3 manpages mv htmldocs/manpages-3 htmldocs/manpages -exit \ No newline at end of file +exit -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2980-gbabe47a
The branch, v3-2-test has been updated
via babe47a0ca130888eb478e2f5ff8d5ec04810938 (commit)
via 4a5830fb03152cf59f27c762046554eb6df5cb65 (commit)
via 16fe020367f3d63c4ff1391f265bdaa48764900f (commit)
from 2d84b9a1024f68657f75aa7e0c4091b8c7afd194 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit babe47a0ca130888eb478e2f5ff8d5ec04810938
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Mon Aug 25 16:08:28 2008 -0500
Add workaround for docs build and dependency on parameters.all.xml
(cherry picked from commit d4f5b5255f9b95050ddd9d67bd3958402be77918)
(cherry picked from commit c8154142d97ccf973feb36d77f932c893fda0af5)
(cherry picked from commit c91e7e9f7f392d5ba850619395eddac34617f1e4)
(cherry picked from commit bdb0a5d5fdbc331e11391f7b6e0aae963cebd3fc)
commit 4a5830fb03152cf59f27c762046554eb6df5cb65
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Tue May 27 16:27:21 2008 -0500
Release scripts: Update create-tarball to include docs and other packaging
details.
I've updated the create-tarball script to support command line options,
docs build (or copy and existing build), and to run the packaging update
scripts.
$ release-scripts/create-tarball --help
Usage release-scripts/create-tarball [options]
--help Print command usage
--branch nameSpecify the branch to to create the archive file
from
--copy-docs dir Copy documentation from dir rather than building
--tag name Tag name for release
--keyid emailThe GnuPG key ID used to sign the release tag
(cherry picked from commit 7c96795e5954b6a716beb6f5a30d6c7bb1647717)
commit 16fe020367f3d63c4ff1391f265bdaa48764900f
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Tue May 27 12:00:00 2008 -0500
Add simple script to build docs
(cherry picked from commit 0865f4615d3ee91673dd6d02c6537765f34b3129)
---
Summary of changes:
release-scripts/build-docs | 28
release-scripts/create-tarball | 314
2 files changed, 247 insertions(+), 95 deletions(-)
create mode 100755 release-scripts/build-docs
Changeset truncated at 500 lines:
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
new file mode 100755
index 000..fa38d8d
--- /dev/null
+++ b/release-scripts/build-docs
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+DOCSRCDIR=`dirname $0`/../docs-xml
+
+cd $DOCSRCDIR || exit 1
+
+git-clean -d -x -f
+autoconf \
+ ./configure --with-papersize=letter \
+ make smbdotconf/parameters.all.xml \
+ make release
+
+if [ $? != 0 ]; then
+echo Docs build failed!
+exit 1
+fi
+
+mkdir ../docs
+rsync -Ca --delete --exclude=.git output/ ../docs/
+rsync -Ca --exclude=.svn registry ../docs/
+rsync -Ca --exclude=.svn archives/ ../docs/
+
+cd ../docs || exit 1
+/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+mv manpages-3 manpages
+mv htmldocs/manpages-3 htmldocs/manpages
+
+exit
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index a689e69..3463f01 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -1,98 +1,222 @@
#!/bin/bash
-TOPDIR=`dirname $0`/..
+## option defaults
+OPT_BRANCH=
+OPT_DOCSDIR=
+OPT_TAG=
+OPT_KEYID=
-cd $TOPDIR
-
-echo -n Please enter branch to cut tarball from:
-read branch
-
-if [ x$branch = x ]; then
- echo You must enter a name! Exiting
- exit 1
-fi
-
-git-checkout $branch
-if [ $? -ne 0 ]; then
- echo Invalid branch name! Exiting
- exit 2
-fi
-
-VER_H=source/include/version.h
-(cd source ./script/mkversion.sh)
-
-if [ ! -f $VER_H ]; then
- echo Failed to find $VER_H! Exiting
- exit 1
-fi
-
-version=`grep SAMBA_VERSION_OFFICIAL_STRING $VER_H | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`
-if [ -n $vendor_version ]; then
-version=$version-$vendor_version
-fi
-version=`echo $version | sed 's/\//g'`
-
-echo Creating release tarball for Samba $version
-
-/bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. tar xf -)
-
-pushd ../samba-${version}
-
-echo Enter the absolute path to the generated Samba docs directory.
-echo -n Just hit return to exclude the docs from the generate tarball:
-read docsdir
-
-if [ x$docsdir != x ]; then
- if [ ! -d $docsdir ]; then
- echo $docsdir does not exist! Exiting
- exit 1
- fi
-
- /bin/rm -rf docs
- mkdir docs
- rsync -a --exclude=.svn $docsdir/ docs/
-
- cd docs
- /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
- /bin/mv manpages-3 manpages
- /bin/mv htmldocs/manpages-3 htmldocs/manpages
- cd ..
-fi
-
-cd source
-./autogen.sh
-cd
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-3-34-g00a721a
The branch, v3-2-stable has been updated
via 00a721a2d2d2e8d753713869e91cf8d8df745c63 (commit)
via f9361137adfa5a729ba9cd44d372df4bfa120bff (commit)
via 62693b9d4c1f68f087726c1f1805defe1ae0c583 (commit)
from 709bb4106ae927ae2260d4499f5b246b854627bf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 00a721a2d2d2e8d753713869e91cf8d8df745c63
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Mon Aug 25 16:08:28 2008 -0500
Add workaround for docs build and dependency on parameters.all.xml
(cherry picked from commit d4f5b5255f9b95050ddd9d67bd3958402be77918)
(cherry picked from commit c8154142d97ccf973feb36d77f932c893fda0af5)
(cherry picked from commit c91e7e9f7f392d5ba850619395eddac34617f1e4)
(cherry picked from commit bdb0a5d5fdbc331e11391f7b6e0aae963cebd3fc)
(cherry picked from commit babe47a0ca130888eb478e2f5ff8d5ec04810938)
commit f9361137adfa5a729ba9cd44d372df4bfa120bff
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Tue May 27 16:27:21 2008 -0500
Release scripts: Update create-tarball to include docs and other packaging
details.
I've updated the create-tarball script to support command line options,
docs build (or copy and existing build), and to run the packaging update
scripts.
$ release-scripts/create-tarball --help
Usage release-scripts/create-tarball [options]
--help Print command usage
--branch nameSpecify the branch to to create the archive file
from
--copy-docs dir Copy documentation from dir rather than building
--tag name Tag name for release
--keyid emailThe GnuPG key ID used to sign the release tag
(cherry picked from commit 7c96795e5954b6a716beb6f5a30d6c7bb1647717)
(cherry picked from commit 4a5830fb03152cf59f27c762046554eb6df5cb65)
commit 62693b9d4c1f68f087726c1f1805defe1ae0c583
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Tue May 27 12:00:00 2008 -0500
Add simple script to build docs
(cherry picked from commit 0865f4615d3ee91673dd6d02c6537765f34b3129)
(cherry picked from commit 16fe020367f3d63c4ff1391f265bdaa48764900f)
---
Summary of changes:
release-scripts/build-docs | 28
release-scripts/create-tarball | 314
2 files changed, 247 insertions(+), 95 deletions(-)
create mode 100755 release-scripts/build-docs
Changeset truncated at 500 lines:
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
new file mode 100755
index 000..fa38d8d
--- /dev/null
+++ b/release-scripts/build-docs
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+DOCSRCDIR=`dirname $0`/../docs-xml
+
+cd $DOCSRCDIR || exit 1
+
+git-clean -d -x -f
+autoconf \
+ ./configure --with-papersize=letter \
+ make smbdotconf/parameters.all.xml \
+ make release
+
+if [ $? != 0 ]; then
+echo Docs build failed!
+exit 1
+fi
+
+mkdir ../docs
+rsync -Ca --delete --exclude=.git output/ ../docs/
+rsync -Ca --exclude=.svn registry ../docs/
+rsync -Ca --exclude=.svn archives/ ../docs/
+
+cd ../docs || exit 1
+/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+mv manpages-3 manpages
+mv htmldocs/manpages-3 htmldocs/manpages
+
+exit
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index a689e69..3463f01 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -1,98 +1,222 @@
#!/bin/bash
-TOPDIR=`dirname $0`/..
+## option defaults
+OPT_BRANCH=
+OPT_DOCSDIR=
+OPT_TAG=
+OPT_KEYID=
-cd $TOPDIR
-
-echo -n Please enter branch to cut tarball from:
-read branch
-
-if [ x$branch = x ]; then
- echo You must enter a name! Exiting
- exit 1
-fi
-
-git-checkout $branch
-if [ $? -ne 0 ]; then
- echo Invalid branch name! Exiting
- exit 2
-fi
-
-VER_H=source/include/version.h
-(cd source ./script/mkversion.sh)
-
-if [ ! -f $VER_H ]; then
- echo Failed to find $VER_H! Exiting
- exit 1
-fi
-
-version=`grep SAMBA_VERSION_OFFICIAL_STRING $VER_H | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`
-if [ -n $vendor_version ]; then
-version=$version-$vendor_version
-fi
-version=`echo $version | sed 's/\//g'`
-
-echo Creating release tarball for Samba $version
-
-/bin/rm -rf ../samba-${version}
-git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. tar xf -)
-
-pushd ../samba-${version}
-
-echo Enter the absolute path to the generated Samba docs directory.
-echo -n Just hit return to exclude the docs from the generate tarball:
-read docsdir
-
-if [ x$docsdir != x ]; then
- if [ ! -d $docsdir ]; then
- echo $docsdir does not exist! Exiting
- exit 1
- fi
-
- /bin/rm -rf docs
- mkdir docs
- rsync -a --exclude=.svn
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3974-g0d9f3df
The branch, v3-devel has been updated via 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7 (commit) from c8154142d97ccf973feb36d77f932c893fda0af5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7 Author: Michael Adam [EMAIL PROTECTED] Date: Fri Sep 5 11:39:38 2008 +0200 configure: fix typo in GNU ld version-script test. Michael --- Summary of changes: source/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.in b/source/configure.in index 81f41c1..a729223 100644 --- a/source/configure.in +++ b/source/configure.in @@ -260,7 +260,7 @@ if test $ac_cv_prog_gnu_ld = yes; then if test $ac_cv_gnu_ld_vernr_major -lt 2 || test $ac_cv_gnu_ld_vernr_minor -lt 14; then ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes fi - if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_l= d_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then + if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_ld_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then ac_cv_gnu_ld_version_script=yes fi fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3941-ga943b15
The branch, v3-3-test has been updated via a943b154c6f86b22e77e56640d6dbe9a040f15e8 (commit) from c91e7e9f7f392d5ba850619395eddac34617f1e4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit a943b154c6f86b22e77e56640d6dbe9a040f15e8 Author: Michael Adam [EMAIL PROTECTED] Date: Fri Sep 5 11:39:38 2008 +0200 configure: fix typo in GNU ld version-script test. Michael (cherry picked from commit 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7) --- Summary of changes: source/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.in b/source/configure.in index bc5a827..240a44b 100644 --- a/source/configure.in +++ b/source/configure.in @@ -262,7 +262,7 @@ if test $ac_cv_prog_gnu_ld = yes; then if test $ac_cv_gnu_ld_vernr_major -lt 2 || test $ac_cv_gnu_ld_vernr_minor -lt 14; then ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes fi - if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_l= d_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then + if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_ld_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then ac_cv_gnu_ld_version_script=yes fi fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2981-g2381ec3
The branch, v3-2-test has been updated via 2381ec3b3f6a4798c15f4d3f3aee8caea8f48941 (commit) from babe47a0ca130888eb478e2f5ff8d5ec04810938 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 2381ec3b3f6a4798c15f4d3f3aee8caea8f48941 Author: Michael Adam [EMAIL PROTECTED] Date: Fri Sep 5 11:39:38 2008 +0200 configure: fix typo in GNU ld version-script test. Michael (cherry picked from commit 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7) --- Summary of changes: source/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.in b/source/configure.in index 3c699d5..a7d1f94 100644 --- a/source/configure.in +++ b/source/configure.in @@ -257,7 +257,7 @@ if test $ac_cv_prog_gnu_ld = yes; then if test $ac_cv_gnu_ld_vernr_major -lt 2 || test $ac_cv_gnu_ld_vernr_minor -lt 14; then ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes fi - if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_l= d_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then + if test $ac_cv_gnu_ld_vernr_major -gt 2 || test $ac_cv_gnu_ld_vernr_major=2 test $ac_cv_gnu_ld_vernr_minor -ge 12; then ac_cv_gnu_ld_version_script=yes fi fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2983-g1361cae
The branch, v3-2-test has been updated
via 1361caecb355047001f8a351ec2e6f10d7f0e741 (commit)
via 3ce3f7f58402b98ce386bab1c40988e5ccd40d15 (commit)
from 2381ec3b3f6a4798c15f4d3f3aee8caea8f48941 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1361caecb355047001f8a351ec2e6f10d7f0e741
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Sun Aug 24 13:53:19 2008 +1000
fixed an errno handling bug that could lead to an infinite loop
(cherry picked from commit 5ccdc58ce91ee40ca7171dd040191291aeb7fe02)
commit 3ce3f7f58402b98ce386bab1c40988e5ccd40d15
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Sat Aug 23 11:36:27 2008 +1000
fixed tsmsm_sendfile(). The logic was totally broken.
(cherry picked from commit 794e48b809036871287df8416a2c669b7e26f216)
---
Summary of changes:
source/modules/vfs_tsmsm.c | 15 +--
1 files changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_tsmsm.c b/source/modules/vfs_tsmsm.c
index 4a732bc..ee958b1 100644
--- a/source/modules/vfs_tsmsm.c
+++ b/source/modules/vfs_tsmsm.c
@@ -200,9 +200,9 @@ static bool tsmsm_is_offline(struct vfs_handle_struct
*handle,
goto done;
}
- lerrno = 0;
-
do {
+ lerrno = 0;
+
ret = dm_get_dmattr(*dmsession_id, dmhandle, dmhandle_len,
DM_NO_TOKEN, dmname, buflen, buf, rlen);
if (ret == -1 errno == EINVAL) {
@@ -279,10 +279,13 @@ static ssize_t tsmsm_aio_return(struct vfs_handle_struct
*handle, struct files_s
static ssize_t tsmsm_sendfile(vfs_handle_struct *handle, int tofd,
files_struct *fsp, const DATA_BLOB *hdr,
SMB_OFF_T offset, size_t n)
{
- bool file_online = tsmsm_aio_force(handle, fsp);
+ bool file_offline = tsmsm_aio_force(handle, fsp);
- if(!file_online)
- return ENOSYS;
+ if (file_offline) {
+ DEBUG(10,(tsmsm_sendfile on offline file - rejecting\n));
+ errno = ENOSYS;
+ return -1;
+ }
return SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, hdr, offset, n);
}
@@ -333,7 +336,7 @@ static int tsmsm_set_offline(struct vfs_handle_struct
*handle,
if (tsmd-hsmscript == NULL) {
/* no script enabled */
- DEBUG(1, (tsmsm_set_offline: No tsmsm:hsmscript
configured\n));
+ DEBUG(1, (tsmsm_set_offline: No 'tsmsm:hsm script'
configured\n));
return 0;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2984-gcd3f4ee
The branch, v3-2-test has been updated
via cd3f4ee593e606e48cd104df222f8bda8e370a58 (commit)
from 1361caecb355047001f8a351ec2e6f10d7f0e741 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit cd3f4ee593e606e48cd104df222f8bda8e370a58
Author: Michael Adam [EMAIL PROTECTED]
Date: Tue Aug 26 17:17:14 2008 +0200
re-run make idl after Jelmer's poperly cast array lengths pidl change.
(f321240fa91fa19c1131f119c42f64897d220682)
Michael
---
Summary of changes:
source/librpc/gen_ndr/ndr_dfs.c | 22 ++--
source/librpc/gen_ndr/ndr_echo.c |2 +-
source/librpc/gen_ndr/ndr_epmapper.c | 10 +++---
source/librpc/gen_ndr/ndr_eventlog.c |2 +-
source/librpc/gen_ndr/ndr_krb5pac.c |4 +-
source/librpc/gen_ndr/ndr_lsa.c | 40
source/librpc/gen_ndr/ndr_messaging.c |4 +-
source/librpc/gen_ndr/ndr_netlogon.c | 50 ++--
source/librpc/gen_ndr/ndr_notify.c|4 +-
source/librpc/gen_ndr/ndr_ntsvcs.c|2 +-
source/librpc/gen_ndr/ndr_samr.c | 24 +++---
source/librpc/gen_ndr/ndr_security.c |4 +-
source/librpc/gen_ndr/ndr_srvsvc.c| 56
source/librpc/gen_ndr/ndr_winreg.c|4 +-
source/librpc/gen_ndr/ndr_wkssvc.c| 18 +-
source/librpc/gen_ndr/ndr_xattr.c |2 +-
16 files changed, 124 insertions(+), 124 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index 1897550..db3f5e4 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -502,7 +502,7 @@ _PUBLIC_ void ndr_print_dfs_Info3(struct ndr_print *ndr,
const char *name, const
ndr_print_ptr(ndr, stores, r-stores);
ndr-depth++;
if (r-stores) {
- ndr-print(ndr, %s: ARRAY(%d), stores, r-num_stores);
+ ndr-print(ndr, %s: ARRAY(%d), stores, (int)r-num_stores);
ndr-depth++;
for
(cntr_stores_1=0;cntr_stores_1r-num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -665,7 +665,7 @@ _PUBLIC_ void ndr_print_dfs_Info4(struct ndr_print *ndr,
const char *name, const
ndr_print_ptr(ndr, stores, r-stores);
ndr-depth++;
if (r-stores) {
- ndr-print(ndr, %s: ARRAY(%d), stores, r-num_stores);
+ ndr-print(ndr, %s: ARRAY(%d), stores, (int)r-num_stores);
ndr-depth++;
for
(cntr_stores_1=0;cntr_stores_1r-num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -1073,7 +1073,7 @@ _PUBLIC_ void ndr_print_dfs_Info6(struct ndr_print *ndr,
const char *name, const
ndr_print_ptr(ndr, stores, r-stores);
ndr-depth++;
if (r-stores) {
- ndr-print(ndr, %s: ARRAY(%d), stores, r-num_stores);
+ ndr-print(ndr, %s: ARRAY(%d), stores, (int)r-num_stores);
ndr-depth++;
for
(cntr_stores_1=0;cntr_stores_1r-num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -2264,7 +2264,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray1(struct ndr_print
*ndr, const char *name,
ndr_print_ptr(ndr, s, r-s);
ndr-depth++;
if (r-s) {
- ndr-print(ndr, %s: ARRAY(%d), s, r-count);
+ ndr-print(ndr, %s: ARRAY(%d), s, (int)r-count);
ndr-depth++;
for (cntr_s_1=0;cntr_s_1r-count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2350,7 +2350,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray2(struct ndr_print
*ndr, const char *name,
ndr_print_ptr(ndr, s, r-s);
ndr-depth++;
if (r-s) {
- ndr-print(ndr, %s: ARRAY(%d), s, r-count);
+ ndr-print(ndr, %s: ARRAY(%d), s, (int)r-count);
ndr-depth++;
for (cntr_s_1=0;cntr_s_1r-count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2436,7 +2436,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray3(struct ndr_print
*ndr, const char *name,
ndr_print_ptr(ndr, s, r-s);
ndr-depth++;
if (r-s) {
- ndr-print(ndr, %s: ARRAY(%d), s, r-count);
+ ndr-print(ndr, %s: ARRAY(%d), s, (int)r-count);
ndr-depth++;
for (cntr_s_1=0;cntr_s_1r-count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2522,7 +2522,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray4(struct ndr_print
*ndr, const char *name,
ndr_print_ptr(ndr, s, r-s);
ndr-depth++;
if (r-s) {
- ndr-print(ndr, %s: ARRAY(%d), s, r-count);
+ ndr-print(ndr, %s: ARRAY(%d), s, (int)r-count);
ndr-depth++;
for
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2986-gcc54b4d
The branch, v3-2-test has been updated
via cc54b4d74171d27e7a0b09aff0376804ac7ab69b (commit)
via 843e9ebbf63f84270f8638a8e79538523b2148a8 (commit)
from cd3f4ee593e606e48cd104df222f8bda8e370a58 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit cc54b4d74171d27e7a0b09aff0376804ac7ab69b
Author: Michael Adam [EMAIL PROTECTED]
Date: Tue Aug 26 17:19:33 2008 +0200
run make idl after after idl change Handle arbitrary new PAC types
Michael
commit 843e9ebbf63f84270f8638a8e79538523b2148a8
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Sun Aug 24 14:00:58 2008 +1000
Handle arbitrary new PAC types
When MS introduces a new PAC type, we should just ignore it, not
generate a parse error. New PAC info structures are supposed to be
backwards compatible with old ones
(cherry picked from commit 2971b926c835412b02c93ad1e30f1471bc0a3612)
---
Summary of changes:
source/librpc/gen_ndr/krb5pac.h |2 +-
source/librpc/gen_ndr/ndr_krb5pac.c | 20 +---
source/librpc/idl/krb5pac.idl |2 +-
3 files changed, 7 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/krb5pac.h b/source/librpc/gen_ndr/krb5pac.h
index 2d799ea..b3b29e5 100644
--- a/source/librpc/gen_ndr/krb5pac.h
+++ b/source/librpc/gen_ndr/krb5pac.h
@@ -76,7 +76,7 @@ union PAC_INFO {
struct PAC_SIGNATURE_DATA srv_cksum;/* [case(PAC_TYPE_SRV_CHECKSUM)] */
struct PAC_SIGNATURE_DATA kdc_cksum;/* [case(PAC_TYPE_KDC_CHECKSUM)] */
struct PAC_LOGON_NAME logon_name;/* [case(PAC_TYPE_LOGON_NAME)] */
- struct DATA_BLOB_REM unknown;/*
[subcontext(0),case(PAC_TYPE_UNKNOWN_12)] */
+ struct DATA_BLOB_REM unknown;/* [subcontext(0),default] */
}/* [gensize,nodiscriminant,public] */;
struct PAC_BUFFER {
diff --git a/source/librpc/gen_ndr/ndr_krb5pac.c
b/source/librpc/gen_ndr/ndr_krb5pac.c
index 70d63ae..6e06f90 100644
--- a/source/librpc/gen_ndr/ndr_krb5pac.c
+++ b/source/librpc/gen_ndr/ndr_krb5pac.c
@@ -319,7 +319,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct
ndr_push *ndr, int ndr_flags
NDR_CHECK(ndr_push_PAC_LOGON_NAME(ndr,
NDR_SCALARS, r-logon_name));
break; }
- case PAC_TYPE_UNKNOWN_12: {
+ default: {
{
struct ndr_push *_ndr_unknown;
NDR_CHECK(ndr_push_subcontext_start(ndr, _ndr_unknown, 0, -1));
@@ -328,8 +328,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct
ndr_push *ndr, int ndr_flags
}
break; }
- default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
}
}
if (ndr_flags NDR_BUFFERS) {
@@ -348,11 +346,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct
ndr_push *ndr, int ndr_flags
case PAC_TYPE_LOGON_NAME:
break;
- case PAC_TYPE_UNKNOWN_12:
+ default:
break;
- default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
}
}
return NDR_ERR_SUCCESS;
@@ -380,7 +376,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct
ndr_pull *ndr, int ndr_flags
NDR_CHECK(ndr_pull_PAC_LOGON_NAME(ndr,
NDR_SCALARS, r-logon_name));
break; }
- case PAC_TYPE_UNKNOWN_12: {
+ default: {
{
struct ndr_pull *_ndr_unknown;
NDR_CHECK(ndr_pull_subcontext_start(ndr, _ndr_unknown, 0, -1));
@@ -389,8 +385,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct
ndr_pull *ndr, int ndr_flags
}
break; }
- default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
}
}
if (ndr_flags NDR_BUFFERS) {
@@ -408,11 +402,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct
ndr_pull *ndr, int ndr_flags
case PAC_TYPE_LOGON_NAME:
break;
- case PAC_TYPE_UNKNOWN_12:
+ default:
break;
- default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2987-g1558a5c
The branch, v3-2-test has been updated
via 1558a5c1977b1f87600ec487238fa8db009f41fd (commit)
from cc54b4d74171d27e7a0b09aff0376804ac7ab69b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1558a5c1977b1f87600ec487238fa8db009f41fd
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 5 11:48:36 2008 +0200
Do proper error handling if the socket is closed
This is a step in fixing bug 5707.
Thanks to Igor GaliÄ [EMAIL PROTECTED] for reporting!
Volker
---
Summary of changes:
source/libsmb/async_smb.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index 58bba2b..9346264 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -319,6 +319,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
{
struct cli_state *cli = (struct cli_state *)p;
struct cli_request *req;
+ NTSTATUS status;
DEBUG(11, (cli_state_handler called with flags %d\n, flags));
@@ -331,11 +332,13 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (res == -1) {
DEBUG(10, (ioctl(FIONREAD) failed: %s\n,
strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
if (available == 0) {
/* EOF */
+ status = NT_STATUS_END_OF_FILE;
goto sock_error;
}
@@ -344,6 +347,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (new_size old_size) {
/* wrap */
+ status = NT_STATUS_UNEXPECTED_IO_ERROR;
goto sock_error;
}
@@ -351,6 +355,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
new_size);
if (tmp == NULL) {
/* nomem */
+ status = NT_STATUS_NO_MEMORY;
goto sock_error;
}
cli-evt_inbuf = tmp;
@@ -358,6 +363,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
res = recv(cli-fd, cli-evt_inbuf + old_size, available, 0);
if (res == -1) {
DEBUG(10, (recv failed: %s\n, strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -402,6 +408,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
to_send - req-sent, 0);
if (sent 0) {
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -415,8 +422,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
sock_error:
for (req = cli-outstanding_requests; req; req = req-next) {
- req-async-state = ASYNC_REQ_ERROR;
- req-async-status = map_nt_error_from_unix(errno);
+ async_req_error(req-async, status);
}
TALLOC_FREE(cli-fd_event);
close(cli-fd);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3976-gd6cb5fd
The branch, v3-devel has been updated
via d6cb5fdafbddb08d32b788674eff509cae9525c6 (commit)
via e5a27773f97d7017cfa345799c6803fd82c8e797 (commit)
from 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit d6cb5fdafbddb08d32b788674eff509cae9525c6
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 5 11:47:48 2008 +0200
Protect against a closed socket
commit e5a27773f97d7017cfa345799c6803fd82c8e797
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 5 11:48:36 2008 +0200
Do proper error handling if the socket is closed
---
Summary of changes:
source/libsmb/async_smb.c | 15 +--
1 files changed, 13 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index 79a924b..435c8c1 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -382,6 +382,11 @@ bool cli_chain_cork(struct cli_state *cli, struct
event_context *ev,
SMB_ASSERT(cli-chain_accumulator == NULL);
+ if (cli-fd == -1) {
+ DEBUG(10, (cli-fd closed\n));
+ return false;
+ }
+
if (cli-fd_event == NULL) {
SMB_ASSERT(cli-outstanding_requests == NULL);
cli-fd_event = event_add_fd(ev, cli, cli-fd,
@@ -845,6 +850,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
{
struct cli_state *cli = (struct cli_state *)p;
struct cli_request *req;
+ NTSTATUS status;
DEBUG(11, (cli_state_handler called with flags %d\n, flags));
@@ -857,11 +863,13 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (res == -1) {
DEBUG(10, (ioctl(FIONREAD) failed: %s\n,
strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
if (available == 0) {
/* EOF */
+ status = NT_STATUS_END_OF_FILE;
goto sock_error;
}
@@ -870,6 +878,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (new_size old_size) {
/* wrap */
+ status = NT_STATUS_UNEXPECTED_IO_ERROR;
goto sock_error;
}
@@ -877,6 +886,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
new_size);
if (tmp == NULL) {
/* nomem */
+ status = NT_STATUS_NO_MEMORY;
goto sock_error;
}
cli-evt_inbuf = tmp;
@@ -884,6 +894,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
res = recv(cli-fd, cli-evt_inbuf + old_size, available, 0);
if (res == -1) {
DEBUG(10, (recv failed: %s\n, strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -930,6 +941,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
to_send - req-sent, 0);
if (sent 0) {
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -945,8 +957,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
for (req = cli-outstanding_requests; req; req = req-next) {
int i;
for (i=0; ireq-num_async; i++) {
- req-async[i]-state = ASYNC_REQ_ERROR;
- req-async[i]-status = map_nt_error_from_unix(errno);
+ async_req_error(req-async[i], status);
}
}
TALLOC_FREE(cli-fd_event);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3979-g0c23274
The branch, v3-devel has been updated
via 0c232742561a4001909ccce2c5160d57d09edb40 (commit)
via 95ac480e2030dc607283a8eb89b44015527efa4b (commit)
via 69e6532e9d3fad9d1c55e33cf5f120ca8b4b8d51 (commit)
from d6cb5fdafbddb08d32b788674eff509cae9525c6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 0c232742561a4001909ccce2c5160d57d09edb40
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:41:45 2008 +0200
net: use netapi for rpc_sh_share_add as well.
Guenther
commit 95ac480e2030dc607283a8eb89b44015527efa4b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:37:03 2008 +0200
net: use netapi to add shares.
Guenther
commit 69e6532e9d3fad9d1c55e33cf5f120ca8b4b8d51
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:23:39 2008 +0200
netapi: fix return code in NetShareAdd_r.
Guenther
---
Summary of changes:
source/lib/netapi/share.c |3 +
source/utils/net_rpc.c| 128
2 files changed, 61 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/share.c b/source/lib/netapi/share.c
index 3b99a8d..9983471 100644
--- a/source/lib/netapi/share.c
+++ b/source/lib/netapi/share.c
@@ -84,6 +84,9 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
switch (r-in.level) {
case 2:
break;
+ case 502:
+ case 503:
+ return WERR_NOT_SUPPORTED;
default:
return WERR_UNKNOWN_LEVEL;
}
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 6db5bc7..18abc80 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -2789,77 +2789,60 @@ static int rpc_share_usage(struct net_context *c, int
argc, const char **argv)
/**
* Add a share on a remote RPC server.
*
- * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passed through.
- *
- * @param domain_sid The domain sid acquired from the remote server.
- * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destroyed on completion of the function.
* @param argc Standard main() style argc.
* @param argv Standard main() style argv. Initial components are already
* stripped.
*
- * @return Normal NTSTATUS return.
+ * @return A shell status integer (0 for success).
**/
-static NTSTATUS rpc_share_add_internals(struct net_context *c,
- const DOM_SID *domain_sid,
- const char *domain_name,
- struct cli_state *cli,
- struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,int argc,
- const char **argv)
+
+static int rpc_share_add(struct net_context *c, int argc, const char **argv)
{
- WERROR result;
- NTSTATUS status;
+ NET_API_STATUS status;
char *sharename;
char *path;
uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
uint32 num_users=0, perms=0;
char *password=NULL; /* don't allow a share password */
- uint32 level = 2;
- union srvsvc_NetShareInfo info;
- struct srvsvc_NetShareInfo2 info2;
+ struct SHARE_INFO_2 i2;
uint32_t parm_error = 0;
- if ((sharename = talloc_strdup(mem_ctx, argv[0])) == NULL) {
- return NT_STATUS_NO_MEMORY;
+ if ((argc 1) || !strchr(argv[0], '=') || c-display_usage) {
+ return rpc_share_usage(c, argc, argv);
+ }
+
+ if ((sharename = talloc_strdup(c, argv[0])) == NULL) {
+ return -1;
}
path = strchr(sharename, '=');
- if (!path)
- return NT_STATUS_UNSUCCESSFUL;
- *path++ = '\0';
+ if (!path) {
+ return -1;
+ }
- info2.name = sharename;
- info2.type = type;
- info2.comment = c-opt_comment;
- info2.permissions = perms;
- info2.max_users = c-opt_maxusers;
- info2.current_users = num_users;
- info2.path = path;
- info2.password = password;
+ *path++ = '\0';
- info.info2 = info2;
+ i2.shi2_netname = sharename;
+ i2.shi2_type= type;
+ i2.shi2_remark = c-opt_comment;
+ i2.shi2_permissions = perms;
+ i2.shi2_max_uses= c-opt_maxusers;
+ i2.shi2_current_uses= num_users;
+ i2.shi2_path= path;
+ i2.shi2_passwd = password;
+
+
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3987-gb56ec0b
The branch, v3-devel has been updated
via b56ec0b9952dbad9f552c4be30eaae36faa9131c (commit)
via d7b07b636947cb52aa5474e86c4a3b6aa391a36f (commit)
via 47bed6f112dbcc509ce6ac593c9920d98b658f9a (commit)
via 0962128a54980b4b699ef8f80583ed2e7e12fbb0 (commit)
via 3ac8f83fcd9f92fe944de8c094d6aa6bda9074dc (commit)
via 5b6e4740ea8b8fdfcbd766099a7c5044abbfddde (commit)
via 3469b8c79782d2b6f55dff306e67b603ecdb790a (commit)
via f9c3ae1ab8c76b4cfec7677e448f192e47152eeb (commit)
from 0c232742561a4001909ccce2c5160d57d09edb40 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit b56ec0b9952dbad9f552c4be30eaae36faa9131c
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:46:21 2008 +0200
net: use netapi for rpc_sh_share_delete as well.
Guenther
commit d7b07b636947cb52aa5474e86c4a3b6aa391a36f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:44:50 2008 +0200
net: use netapi for deleting shares.
Guenther
commit 47bed6f112dbcc509ce6ac593c9920d98b658f9a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:49:35 2008 +0200
netapi: implement NetShareDel_r.
Guenther
commit 0962128a54980b4b699ef8f80583ed2e7e12fbb0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:38:01 2008 +0200
netapi: add NetShareDel example code.
Guenther
commit 3ac8f83fcd9f92fe944de8c094d6aa6bda9074dc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:35:48 2008 +0200
netapi: add NetShareDel to public header.
Guenther
commit 5b6e4740ea8b8fdfcbd766099a7c5044abbfddde
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:34:28 2008 +0200
netapi: add NetShareDel skeleton.
Guenther
commit 3469b8c79782d2b6f55dff306e67b603ecdb790a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:32:41 2008 +0200
re-run make idl.
Guenther
commit f9c3ae1ab8c76b4cfec7677e448f192e47152eeb
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:32:25 2008 +0200
netapi: add NetShareDel to IDL.
Guenther
---
Summary of changes:
source/lib/netapi/examples/Makefile.in |8 +++-
.../{group/group_del.c = share/share_del.c} | 19 ---
source/lib/netapi/libnetapi.c | 44 +
source/lib/netapi/libnetapi.h |7 +++
source/lib/netapi/netapi.h | 18 +++
source/lib/netapi/share.c | 50
source/librpc/gen_ndr/libnetapi.h | 14 ++
source/librpc/gen_ndr/ndr_libnetapi.c | 24 +
source/librpc/gen_ndr/ndr_libnetapi.h |7 ++-
source/librpc/idl/libnetapi.idl| 10
source/utils/net_rpc.c | 49 +--
11 files changed, 194 insertions(+), 56 deletions(-)
copy source/lib/netapi/examples/{group/group_del.c = share/share_del.c} (82%)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/Makefile.in
b/source/lib/netapi/examples/Makefile.in
index d48457a..74cbf32 100644
--- a/source/lib/netapi/examples/Makefile.in
+++ b/source/lib/netapi/examples/Makefile.in
@@ -50,7 +50,8 @@ PROGS = bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
- bin/[EMAIL PROTECTED]@
+ bin/[EMAIL PROTECTED]@ \
+ bin/[EMAIL PROTECTED]@
all: $(PROGS)
@@ -113,6 +114,7 @@ LOCALGROUPSETMEMBERS_OBJ =
localgroup/localgroup_setmembers.o $(CMDLINE_OBJ)
LOCALGROUPGETMEMBERS_OBJ = localgroup/localgroup_getmembers.o $(CMDLINE_OBJ)
REMOTETOD_OBJ = server/remote_tod.o $(CMDLINE_OBJ)
SHAREADD_OBJ = share/share_add.o $(CMDLINE_OBJ)
+SHAREDEL_OBJ = share/share_del.o $(CMDLINE_OBJ)
bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(GETDC_OBJ)
@echo Linking $@
@@ -250,6 +252,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SHAREADD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SHAREADD_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SHAREDEL_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SHAREDEL_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+
clean:
-rm -f $(PROGS)
-rm -f core */*~ *~ \
diff --git a/source/lib/netapi/examples/group/group_del.c
b/source/lib/netapi/examples/share/share_del.c
similarity index 82%
copy from source/lib/netapi/examples/group/group_del.c
copy to source/lib/netapi/examples/share/share_del.c
index 789e429..20e3ce5 100644
--- a/source/lib/netapi/examples/group/group_del.c
+++ b/source/lib/netapi/examples/share/share_del.c
@@ -1,6 +1,6 @@
/*
* Unix SMB/CIFS
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3942-g6a561d3
The branch, v3-3-test has been updated
via 6a561d311496569dd5db0c6d6461ce9c4896f142 (commit)
from a943b154c6f86b22e77e56640d6dbe9a040f15e8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 6a561d311496569dd5db0c6d6461ce9c4896f142
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 5 11:48:36 2008 +0200
Do proper error handling if the socket is closed
This is a step in fixing bug 5707.
Thanks to Igor GaliÄ [EMAIL PROTECTED] for reporting!
Volker
(cherry picked from commit 1558a5c1977b1f87600ec487238fa8db009f41fd)
---
Summary of changes:
source/libsmb/async_smb.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index 58bba2b..9346264 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -319,6 +319,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
{
struct cli_state *cli = (struct cli_state *)p;
struct cli_request *req;
+ NTSTATUS status;
DEBUG(11, (cli_state_handler called with flags %d\n, flags));
@@ -331,11 +332,13 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (res == -1) {
DEBUG(10, (ioctl(FIONREAD) failed: %s\n,
strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
if (available == 0) {
/* EOF */
+ status = NT_STATUS_END_OF_FILE;
goto sock_error;
}
@@ -344,6 +347,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
if (new_size old_size) {
/* wrap */
+ status = NT_STATUS_UNEXPECTED_IO_ERROR;
goto sock_error;
}
@@ -351,6 +355,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
new_size);
if (tmp == NULL) {
/* nomem */
+ status = NT_STATUS_NO_MEMORY;
goto sock_error;
}
cli-evt_inbuf = tmp;
@@ -358,6 +363,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
res = recv(cli-fd, cli-evt_inbuf + old_size, available, 0);
if (res == -1) {
DEBUG(10, (recv failed: %s\n, strerror(errno)));
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -402,6 +408,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
to_send - req-sent, 0);
if (sent 0) {
+ status = map_nt_error_from_unix(errno);
goto sock_error;
}
@@ -415,8 +422,7 @@ static void cli_state_handler(struct event_context
*event_ctx,
sock_error:
for (req = cli-outstanding_requests; req; req = req-next) {
- req-async-state = ASYNC_REQ_ERROR;
- req-async-status = map_nt_error_from_unix(errno);
+ async_req_error(req-async, status);
}
TALLOC_FREE(cli-fd_event);
close(cli-fd);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3995-g91830de
The branch, v3-devel has been updated
via 91830de4527db124889ada9845ab145762855bc2 (commit)
via c2e936743227f10c2ade61589fe15c1805c79773 (commit)
via 0cc604ebc13125daf7e219c63a6ca8f21eda48c6 (commit)
via 3da9584a7ad2a1a985186951a060a1500059b913 (commit)
via 25302d79bec5784a6dd27cf7b0f58a8ec287b2ad (commit)
via 30b99eb7e18ba274299ef37e3883154b35d6f2dc (commit)
via 4f3fa6af7fd2e7d178ae395ee8ce4955437ef25d (commit)
via 5f55e85cab6b3e98304dac5de96d6c6d43797e23 (commit)
from b56ec0b9952dbad9f552c4be30eaae36faa9131c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 91830de4527db124889ada9845ab145762855bc2
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 19:06:43 2008 +0200
netapi: add NetShareEnum example code.
Guenther
commit c2e936743227f10c2ade61589fe15c1805c79773
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 19:00:38 2008 +0200
netapi: add NetShareEnum to public headers.
Guenther
commit 0cc604ebc13125daf7e219c63a6ca8f21eda48c6
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:58:32 2008 +0200
netapi: add NetShareEnum skeleton.
Guenther
commit 3da9584a7ad2a1a985186951a060a1500059b913
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:56:46 2008 +0200
re-run make idl.
Guenther
commit 25302d79bec5784a6dd27cf7b0f58a8ec287b2ad
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Aug 29 18:56:11 2008 +0200
netapi: add NetShareEnum to IDL.
Guenther
commit 30b99eb7e18ba274299ef37e3883154b35d6f2dc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 16:46:36 2008 +0200
netapi: add new SHARE_INFO structs to public header.
Guenther
commit 4f3fa6af7fd2e7d178ae395ee8ce4955437ef25d
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 16:40:18 2008 +0200
re-run make idl.
Guenther
commit 5f55e85cab6b3e98304dac5de96d6c6d43797e23
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 16:38:57 2008 +0200
netapi: add more SHARE_INFO_X levels.
Guenther
---
Summary of changes:
source/lib/netapi/examples/Makefile.in |8 ++-
.../{group/group_enum.c = share/share_enum.c} | 65 ---
source/lib/netapi/libnetapi.c | 53
source/lib/netapi/libnetapi.h | 11 +++
source/lib/netapi/netapi.h | 56 +
source/lib/netapi/share.c | 17 +
source/librpc/gen_ndr/libnetapi.h | 48 ++
source/librpc/gen_ndr/ndr_libnetapi.c | 49 +++
source/librpc/gen_ndr/ndr_libnetapi.h |7 ++-
source/librpc/idl/libnetapi.idl| 43 +
10 files changed, 317 insertions(+), 40 deletions(-)
copy source/lib/netapi/examples/{group/group_enum.c = share/share_enum.c}
(63%)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/Makefile.in
b/source/lib/netapi/examples/Makefile.in
index 74cbf32..f4ac8af 100644
--- a/source/lib/netapi/examples/Makefile.in
+++ b/source/lib/netapi/examples/Makefile.in
@@ -51,7 +51,8 @@ PROGS = bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
- bin/[EMAIL PROTECTED]@
+ bin/[EMAIL PROTECTED]@ \
+ bin/[EMAIL PROTECTED]@
all: $(PROGS)
@@ -115,6 +116,7 @@ LOCALGROUPGETMEMBERS_OBJ =
localgroup/localgroup_getmembers.o $(CMDLINE_OBJ)
REMOTETOD_OBJ = server/remote_tod.o $(CMDLINE_OBJ)
SHAREADD_OBJ = share/share_add.o $(CMDLINE_OBJ)
SHAREDEL_OBJ = share/share_del.o $(CMDLINE_OBJ)
+SHAREENUM_OBJ = share/share_enum.o $(CMDLINE_OBJ)
bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(GETDC_OBJ)
@echo Linking $@
@@ -256,6 +258,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SHAREDEL_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SHAREDEL_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SHAREENUM_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SHAREENUM_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+
clean:
-rm -f $(PROGS)
-rm -f core */*~ *~ \
diff --git a/source/lib/netapi/examples/group/group_enum.c
b/source/lib/netapi/examples/share/share_enum.c
similarity index 63%
copy from source/lib/netapi/examples/group/group_enum.c
copy to source/lib/netapi/examples/share/share_enum.c
index fe2aee1..b1f4043 100644
--- a/source/lib/netapi/examples/group/group_enum.c
+++ b/source/lib/netapi/examples/share/share_enum.c
@@ -1,6 +1,6 @@
/*
* Unix SMB/CIFS implementation.
- * NetGroupEnum query
+ * NetShareEnum query
* Copyright (C)
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3996-g14c2688
The branch, v3-devel has been updated
via 14c2688f2d37105ad129d26d13930177fe5c585f (commit)
from 91830de4527db124889ada9845ab145762855bc2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 14c2688f2d37105ad129d26d13930177fe5c585f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 13:17:28 2008 +0200
netapi: fix NetGetJoinableOUs_r: do not tear down connection.
Guenther
---
Summary of changes:
source/lib/netapi/joindomain.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 17ea392..c83b0e0 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/lib/netapi/joindomain.c
@@ -445,9 +445,5 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
}
done:
- if (cli) {
- cli_shutdown(cli);
- }
-
return werr;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4002-gb7a2f27
The branch, v3-devel has been updated
via b7a2f27c1cae9abed2f821177fca42501632 (commit)
via 43aad72457f77ac209494cfca46048e0c4bfa6c7 (commit)
via b2d0df46038a88fa3f2ff82e155805c771916a42 (commit)
via cff66738936f9f5cc4d2cd284cde2e1ac2972d33 (commit)
via 2bb5bb9b964932f0be8eccf5739da5692a591245 (commit)
via 7a46743909bfbfccf522eecf2ba117d5651439ef (commit)
from 14c2688f2d37105ad129d26d13930177fe5c585f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit b7a2f27c1cae9abed2f821177fca42501632
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 18:54:53 2008 +0200
netapi: add support for local query of level 101 in NetServerGetInfo.
Guenther
commit 43aad72457f77ac209494cfca46048e0c4bfa6c7
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 18:37:54 2008 +0200
netapi: add support for more infolevels in NetServerGetInfo_r.
Guenther
commit b2d0df46038a88fa3f2ff82e155805c771916a42
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 17:45:42 2008 +0200
netapi: add NetServerGetInfo example code.
Guenther
commit cff66738936f9f5cc4d2cd284cde2e1ac2972d33
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 18:36:50 2008 +0200
netapi: add new SERVER_INFO structures to public header.
Guenther
commit 2bb5bb9b964932f0be8eccf5739da5692a591245
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 17:44:01 2008 +0200
re-run make idl.
Guenther
commit 7a46743909bfbfccf522eecf2ba117d5651439ef
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 17:43:49 2008 +0200
netapi: add SERVER_INFO_100-102 to IDL.
Guenther
---
Summary of changes:
source/lib/netapi/examples/Makefile.in |6 +
.../user_modalsget.c = server/server_getinfo.c} | 83 ++--
source/lib/netapi/netapi.h | 31
source/lib/netapi/serverinfo.c | 118 -
source/librpc/gen_ndr/libnetapi.h | 30
source/librpc/gen_ndr/ndr_libnetapi.c | 144
source/librpc/gen_ndr/ndr_libnetapi.h |9 ++
source/librpc/idl/libnetapi.idl| 30
8 files changed, 405 insertions(+), 46 deletions(-)
copy source/lib/netapi/examples/{user/user_modalsget.c =
server/server_getinfo.c} (51%)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/Makefile.in
b/source/lib/netapi/examples/Makefile.in
index f4ac8af..169736c 100644
--- a/source/lib/netapi/examples/Makefile.in
+++ b/source/lib/netapi/examples/Makefile.in
@@ -50,6 +50,7 @@ PROGS = bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
+ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@
@@ -114,6 +115,7 @@ LOCALGROUPDELMEMBERS_OBJ =
localgroup/localgroup_delmembers.o $(CMDLINE_OBJ)
LOCALGROUPSETMEMBERS_OBJ = localgroup/localgroup_setmembers.o $(CMDLINE_OBJ)
LOCALGROUPGETMEMBERS_OBJ = localgroup/localgroup_getmembers.o $(CMDLINE_OBJ)
REMOTETOD_OBJ = server/remote_tod.o $(CMDLINE_OBJ)
+SERVERGETINFO_OBJ = server/server_getinfo.o $(CMDLINE_OBJ)
SHAREADD_OBJ = share/share_add.o $(CMDLINE_OBJ)
SHAREDEL_OBJ = share/share_del.o $(CMDLINE_OBJ)
SHAREENUM_OBJ = share/share_enum.o $(CMDLINE_OBJ)
@@ -250,6 +252,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(REMOTETOD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(REMOTETOD_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SERVERGETINFO_OBJ)
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SERVERGETINFO_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
+
bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SHAREADD_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SHAREADD_OBJ) $(LDFLAGS) $(DYNEXP)
$(CMDLINE_LIBS)
diff --git a/source/lib/netapi/examples/user/user_modalsget.c
b/source/lib/netapi/examples/server/server_getinfo.c
similarity index 51%
copy from source/lib/netapi/examples/user/user_modalsget.c
copy to source/lib/netapi/examples/server/server_getinfo.c
index 4dcb41b..afd2edd 100644
--- a/source/lib/netapi/examples/user/user_modalsget.c
+++ b/source/lib/netapi/examples/server/server_getinfo.c
@@ -1,6 +1,6 @@
/*
* Unix SMB/CIFS implementation.
- * NetUserModalsGet query
+ * NetServerGetInfo query
* Copyright (C) Guenther Deschner 2008
*
* This program is free software; you can redistribute it and/or modify
@@ -33,13 +33,12 @@ int main(int argc, const char **argv)
struct libnetapi_ctx *ctx = NULL;
const char *hostname = NULL;
uint8_t *buffer = NULL;
- uint32_t
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4008-g8d541a3
The branch, v3-devel has been updated
via 8d541a3579637bb48c04ebb2b18844509c1f43e8 (commit)
via af25bd95d24de8e9fac8f86b18e03a09902b0b78 (commit)
via 74031b0b4ac1301cff6ca551c3264c4137a43294 (commit)
via c979b96eb4b0df94e9d736a9473d00c28a52ed07 (commit)
via 56d353b406ef77808b9cb968fcba387f301cf2de (commit)
via 1760c4ce79ae15f9a2ea92293d823afe3af9b3ee (commit)
from b7a2f27c1cae9abed2f821177fca42501632 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 8d541a3579637bb48c04ebb2b18844509c1f43e8
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 02:02:20 2008 +0200
netdomjoin-gui: fix some widget closing callbacks.
Guenther
commit af25bd95d24de8e9fac8f86b18e03a09902b0b78
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 01:06:25 2008 +0200
netdomjoin-gui: always center new windows.
Guenther
commit 74031b0b4ac1301cff6ca551c3264c4137a43294
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 00:49:33 2008 +0200
netdomjoin-gui: fix some small errors in callbacks.
Guenther
commit c979b96eb4b0df94e9d736a9473d00c28a52ed07
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 00:36:31 2008 +0200
netdomjoin-gui: add gtk set_transient flags.
Guenther
commit 56d353b406ef77808b9cb968fcba387f301cf2de
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 16:14:14 2008 +0200
netdomjoin-gui: test all NetServerGetInfo levels until we get comment.
commit 1760c4ce79ae15f9a2ea92293d823afe3af9b3ee
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Sep 1 18:59:59 2008 +0200
netdomjoin-gui: add support to remotely join/unjoin workstations.
Guenther
---
Summary of changes:
.../examples/netdomjoin-gui/netdomjoin-gui.c | 192 ++--
1 files changed, 136 insertions(+), 56 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 4e0488e..98994b6 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -80,6 +80,7 @@ typedef struct join_state {
gboolean settings_changed;
gboolean hostname_changed;
uint32_t stored_num_ous;
+ char *target_hostname;
} join_state;
static void debug(const char *format, ...)
@@ -103,14 +104,23 @@ static gboolean callback_delete_event(GtkWidget *widget,
return FALSE;
}
-static void callback_do_close(GtkWidget *widget,
- gpointer data)
+static void callback_do_close_data(GtkWidget *widget,
+ gpointer data)
{
- debug(callback_do_close called\n);
+ debug(callback_do_close_data called\n);
if (data) {
gtk_widget_destroy(GTK_WIDGET(data));
- data = NULL;
+ }
+}
+
+static void callback_do_close_widget(GtkWidget *widget,
+gpointer data)
+{
+ debug(callback_do_close_widget called\n);
+
+ if (widget) {
+ gtk_widget_destroy(widget);
}
}
@@ -180,7 +190,10 @@ static void callback_apply_description_change(GtkWidget
*widget,
info1005.sv1005_comment = state-comment_new;
- status = NetServerSetInfo(NULL, 1005, (uint8_t *)info1005, parm_err);
+ status = NetServerSetInfo(state-target_hostname,
+ 1005,
+ (uint8_t *)info1005,
+ parm_err);
if (status) {
debug(NetServerSetInfo failed with: %s\n,
libnetapi_errstr(status));
@@ -191,6 +204,7 @@ static void callback_apply_description_change(GtkWidget
*widget,
Failed to change computer
description: %s.,
libnetapi_get_error_string(state-ctx, status));
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(state-window_main));
g_signal_connect_swapped(dialog, response,
G_CALLBACK(gtk_widget_destroy),
@@ -262,6 +276,7 @@ static void callback_do_reboot(GtkWidget *widget,
GTK_BUTTONS_OK,
You must restart this computer for the
changes to take effect.);
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(state-window_do_change));
#if 0
g_signal_connect_swapped(dialog, response,
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4015-gafdd14c
The branch, v3-devel has been updated via afdd14c26c27c9fa245165985a5d8e644855c4b5 (commit) via e28c332f32c4f7b1ac493f69f17254185d9cee96 (commit) via 39a42380ca3fac92eb27bded90ab06f7760937b9 (commit) via b66cee247fa7ef5293074b191b9cc2cbf4eef5f3 (commit) via 03a7f7f33370d65493a81ccead2038ee3ab291d0 (commit) via 038ec4d73a04e53c1cc0a1fa6a830d1032dee489 (commit) via 8a5b0b639240c829cb5bde1bed1707b3ea4ac480 (commit) from 8d541a3579637bb48c04ebb2b18844509c1f43e8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit afdd14c26c27c9fa245165985a5d8e644855c4b5 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 13:24:51 2008 +0200 netapi: move join related examples to one directory. Guenther commit e28c332f32c4f7b1ac493f69f17254185d9cee96 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 13:18:32 2008 +0200 netapi: add NetRenameMachineInDomain example code. Guenther commit 39a42380ca3fac92eb27bded90ab06f7760937b9 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 13:17:57 2008 +0200 netapi: implement NetRenameMachineInDomain_r. Guenther commit b66cee247fa7ef5293074b191b9cc2cbf4eef5f3 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 11:06:22 2008 +0200 netapi: add NetRenameMachineInDomain to public header. Guenther commit 03a7f7f33370d65493a81ccead2038ee3ab291d0 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 11:02:43 2008 +0200 netapi: add skeleton for NetRenameMachineInDomain. Guenther commit 038ec4d73a04e53c1cc0a1fa6a830d1032dee489 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 10:59:44 2008 +0200 re-run make idl. Guenther commit 8a5b0b639240c829cb5bde1bed1707b3ea4ac480 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Sep 2 10:58:54 2008 +0200 netapi: add NetRenameMachineInDomain to IDL. Guenther --- Summary of changes: source/lib/netapi/examples/Makefile.in | 10 ++- .../examples/getjoinableous/getjoinableous.c | 95 -- source/lib/netapi/examples/join/getjoinableous.c | 95 ++ source/lib/netapi/examples/join/netdomjoin.c | 104 source/lib/netapi/examples/join/rename_machine.c | 86 source/lib/netapi/examples/netdomjoin/netdomjoin.c | 104 source/lib/netapi/joindomain.c | 52 ++ source/lib/netapi/libnetapi.c | 48 + source/lib/netapi/libnetapi.h |9 ++ source/lib/netapi/netapi.h | 23 + source/librpc/gen_ndr/libnetapi.h | 16 +++ source/librpc/gen_ndr/ndr_libnetapi.c | 26 + source/librpc/gen_ndr/ndr_libnetapi.h | 79 --- source/librpc/idl/libnetapi.idl| 12 +++ 14 files changed, 521 insertions(+), 238 deletions(-) delete mode 100644 source/lib/netapi/examples/getjoinableous/getjoinableous.c create mode 100644 source/lib/netapi/examples/join/getjoinableous.c create mode 100644 source/lib/netapi/examples/join/netdomjoin.c create mode 100644 source/lib/netapi/examples/join/rename_machine.c delete mode 100644 source/lib/netapi/examples/netdomjoin/netdomjoin.c Changeset truncated at 500 lines: diff --git a/source/lib/netapi/examples/Makefile.in b/source/lib/netapi/examples/Makefile.in index 169736c..ee72a95 100644 --- a/source/lib/netapi/examples/Makefile.in +++ b/source/lib/netapi/examples/Makefile.in @@ -22,6 +22,7 @@ PROGS = bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ + bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ \ @@ -84,9 +85,10 @@ bin/.dummy: CMDLINE_OBJ = common.o GETDC_OBJ = getdc/getdc.o $(CMDLINE_OBJ) DSGETDC_OBJ = dsgetdc/dsgetdc.o $(CMDLINE_OBJ) -NETDOMJOIN_OBJ = netdomjoin/netdomjoin.o $(CMDLINE_OBJ) +NETDOMJOIN_OBJ = join/netdomjoin.o $(CMDLINE_OBJ) NETDOMJOIN_GUI_OBJ = netdomjoin-gui/netdomjoin-gui.o -GETJOINABLEOUS_OBJ = getjoinableous/getjoinableous.o $(CMDLINE_OBJ) +GETJOINABLEOUS_OBJ = join/getjoinableous.o $(CMDLINE_OBJ) +RENAMEMACHINE_OBJ = join/rename_machine.o $(CMDLINE_OBJ) USERADD_OBJ = user/user_add.o $(CMDLINE_OBJ) USERDEL_OBJ = user/user_del.o $(CMDLINE_OBJ) USERENUM_OBJ = user/user_enum.o $(CMDLINE_OBJ) @@ -132,6 +134,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(GETJOINABLEOUS_OBJ) @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(GETJOINABLEOUS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(RENAMEMACHINE_OBJ) + @echo
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4021-g5851b4e
The branch, v3-devel has been updated
via 5851b4e40e5cc2b7ba973b274f9203aa6e6fb1d8 (commit)
via 86de3242a478c9f669958414ee9e7720cddad9aa (commit)
via f87caa7bff3b8a0b8d7cdc5cda7d21dd7e9eb0ec (commit)
via c5ab5bf8417412835d879c8a58a7c64e1359646f (commit)
via 383d268f8c4f6282757d350e6b059446e52e6c53 (commit)
via 9afc888356f801fd231234673bb4a1f6cbf62792 (commit)
from afdd14c26c27c9fa245165985a5d8e644855c4b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 5851b4e40e5cc2b7ba973b274f9203aa6e6fb1d8
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:35:58 2008 +0200
netapi: remove NetSetup* flags from netdomjoin-gui.
Guenther
commit 86de3242a478c9f669958414ee9e7720cddad9aa
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:34:58 2008 +0200
netapi: add NETSETUP_JOIN_STATUS to public header.
Guenther
commit f87caa7bff3b8a0b8d7cdc5cda7d21dd7e9eb0ec
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:33:21 2008 +0200
re-run make idl.
Guenther
commit c5ab5bf8417412835d879c8a58a7c64e1359646f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:32:59 2008 +0200
netapi: add NETSETUP_JOIN_STATUS to IDL.
Guenther
commit 383d268f8c4f6282757d350e6b059446e52e6c53
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:32:41 2008 +0200
re-run make idl.
Guenther
commit 9afc888356f801fd231234673bb4a1f6cbf62792
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Sep 2 14:32:16 2008 +0200
wkssvc: rename wkssvc_NetJoinStatus flags.
Guenther
---
Summary of changes:
.../examples/netdomjoin-gui/netdomjoin-gui.c |3 ---
source/lib/netapi/netapi.h |7 +++
source/librpc/gen_ndr/libnetapi.h | 17 +
source/librpc/gen_ndr/ndr_wkssvc.c |8
source/librpc/gen_ndr/wkssvc.h | 16
source/librpc/idl/libnetapi.idl|7 +++
source/librpc/idl/wkssvc.idl |8
7 files changed, 47 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 98994b6..40a6e41 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -38,9 +38,6 @@
#define SAMBA_IMAGE_PATH /usr/share/pixmaps/samba/logo.png
#define SAMBA_IMAGE_PATH_SMALL /usr/share/pixmaps/samba/logo-small.png
-#define NetSetupWorkgroupName ( 2 )
-#define NetSetupDomainName ( 3 )
-
#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
static gboolean verbose = FALSE;
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index ba509f8..8f1ec84 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -97,6 +97,13 @@ struct DOMAIN_CONTROLLER_INFO {
#define TIMEQ_FOREVER ( (uint32_t)-1L )
+enum NETSETUP_JOIN_STATUS {
+ NetSetupUnknownStatus=0,
+ NetSetupUnjoined=1,
+ NetSetupWorkgroupName=2,
+ NetSetupDomainName=3
+};
+
struct SERVER_INFO_100 {
uint32_t sv100_platform_id;
const char * sv100_name;
diff --git a/source/librpc/gen_ndr/libnetapi.h
b/source/librpc/gen_ndr/libnetapi.h
index b51cd3f..2d659b9 100644
--- a/source/librpc/gen_ndr/libnetapi.h
+++ b/source/librpc/gen_ndr/libnetapi.h
@@ -58,6 +58,23 @@ struct domsid {
#define NETSETUP_INSTALL_INVOCATION ( 0x0004 )
#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS ( 0x1000 )
+enum NETSETUP_JOIN_STATUS
+#ifndef USE_UINT_ENUMS
+ {
+ NetSetupUnknownStatus=0,
+ NetSetupUnjoined=1,
+ NetSetupWorkgroupName=2,
+ NetSetupDomainName=3
+}
+#else
+ { __donnot_use_enum_NETSETUP_JOIN_STATUS=0x7FFF}
+#define NetSetupUnknownStatus ( 0 )
+#define NetSetupUnjoined ( 1 )
+#define NetSetupWorkgroupName ( 2 )
+#define NetSetupDomainName ( 3 )
+#endif
+;
+
struct SERVER_INFO_100 {
uint32_t sv100_platform_id;
const char * sv100_name;
diff --git a/source/librpc/gen_ndr/ndr_wkssvc.c
b/source/librpc/gen_ndr/ndr_wkssvc.c
index 10e5e55..e494f08 100644
--- a/source/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source/librpc/gen_ndr/ndr_wkssvc.c
@@ -5474,10 +5474,10 @@ _PUBLIC_ void ndr_print_wkssvc_NetJoinStatus(struct
ndr_print *ndr, const char *
const char *val = NULL;
switch (r) {
- case NetSetupUnknownStatus: val = NetSetupUnknownStatus;
break;
- case NetSetupUnjoined: val = NetSetupUnjoined; break;
- case NetSetupWorkgroupName: val = NetSetupWorkgroupName;
break;
-
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4037-g2e15036
The branch, v3-devel has been updated
via 2e15036bacf717d27d1806bcbdba1e68f2f76aae (commit)
via f3044d76530f63b16f26fedf8e00eaf4d3badb06 (commit)
via ebcd45ed3ff79ce3b90872aa87a737ba6ee3401f (commit)
via f21a934e1e100cb1496a6c854684ff110ba6d1cc (commit)
via a7050c999ff0a13724af2628cb47daec5b35 (commit)
via 2066ebc5e3e782b9443aee3e5beb1a99d69096ec (commit)
via 4d7947e54959c6a445e8b0f7a8313fe232c1fb8f (commit)
via 7d863c4b00d70110819b847890ccb9b2a4aa71c9 (commit)
via 22f37206338e54bbaf619a7b16e145f129bfe986 (commit)
via 3fbfbaea004f792a577f21275e6e4218f581d698 (commit)
via 029cf4a2a9d95b9c7de6eb75118a92474c0ae9c1 (commit)
via 0166c8f04be1168fe83d7bf3730d3011ffd8c6f6 (commit)
via 5c63b181ec698a6134ce31326dab9e6bd232acf0 (commit)
via 237c6e0bca44e19ca89532e565b1345f9f329111 (commit)
via dab613e930a9193153cc744e4ad4ea0fa6476b40 (commit)
via 5d669075295a3adb30c013d1a3b617bf4ced8e73 (commit)
from 5851b4e40e5cc2b7ba973b274f9203aa6e6fb1d8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 2e15036bacf717d27d1806bcbdba1e68f2f76aae
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 5 12:15:05 2008 +0200
re-run make idl.
Guenther
commit f3044d76530f63b16f26fedf8e00eaf4d3badb06
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 5 12:14:51 2008 +0200
netapi: add SHARE_INFO_1005_FLAGS.
Guenther
commit ebcd45ed3ff79ce3b90872aa87a737ba6ee3401f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:24:23 2008 +0200
netapi: implement NetShareSetInfo_r.
Guenther
commit f21a934e1e100cb1496a6c854684ff110ba6d1cc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:24:02 2008 +0200
netapi: add support for level 1004 in
map_SHARE_INFO_buffer_to_srvsvc_share_info.
Guenther
commit a7050c999ff0a13724af2628cb47daec5b35
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:12:56 2008 +0200
netapi: add NetShareSetInfo example code.
Guenther
commit 2066ebc5e3e782b9443aee3e5beb1a99d69096ec
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:04:35 2008 +0200
netapi: add NetShareSetInfo to public header.
Guenther
commit 4d7947e54959c6a445e8b0f7a8313fe232c1fb8f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:03:14 2008 +0200
netapi: add skeleton for NetShareSetInfo.
Guenther
commit 7d863c4b00d70110819b847890ccb9b2a4aa71c9
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:01:46 2008 +0200
re-run make idl.
Guenther
commit 22f37206338e54bbaf619a7b16e145f129bfe986
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 20:00:50 2008 +0200
netapi: add NetShareSetInfo to IDL.
Guenther
commit 3fbfbaea004f792a577f21275e6e4218f581d698
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 19:29:47 2008 +0200
netapi: implement NetShareEnum_r.
Guenther
commit 029cf4a2a9d95b9c7de6eb75118a92474c0ae9c1
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 16:31:18 2008 +0200
netapi: implement NetShareGetInfo_r.
Guenther
commit 0166c8f04be1168fe83d7bf3730d3011ffd8c6f6
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 16:18:32 2008 +0200
netapi: add NetShareGetInfo example code.
Guenther
commit 5c63b181ec698a6134ce31326dab9e6bd232acf0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:59:58 2008 +0200
netapi: add NetShareGetInfo to public header.
Guenther
commit 237c6e0bca44e19ca89532e565b1345f9f329111
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:53:54 2008 +0200
netapi: add skeleton for NetShareGetInfo.
Guenther
commit dab613e930a9193153cc744e4ad4ea0fa6476b40
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:52:19 2008 +0200
re-run make idl.
Guenther
commit 5d669075295a3adb30c013d1a3b617bf4ced8e73
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Sep 4 15:50:49 2008 +0200
netapi: add IDL for NetShareGetInfo.
Guenther
---
Summary of changes:
source/lib/netapi/examples/Makefile.in | 14 +-
.../group_getinfo.c = share/share_getinfo.c} | 95 --
.../share/{share_del.c = share_setinfo.c} | 36 ++-
source/lib/netapi/libnetapi.c | 94 ++
source/lib/netapi/libnetapi.h | 17 +
source/lib/netapi/netapi.h | 42 +++
source/lib/netapi/share.c | 351 +++-
source/librpc/gen_ndr/libnetapi.h | 44 +++
source/librpc/gen_ndr/ndr_libnetapi.c | 96 ++
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4038-gbe6f122
The branch, v3-devel has been updated
via be6f12273f171a3eb1967d2299064e57d737f6a4 (commit)
from 2e15036bacf717d27d1806bcbdba1e68f2f76aae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit be6f12273f171a3eb1967d2299064e57d737f6a4
Author: Qiao Yang [EMAIL PROTECTED]
Date: Fri Sep 5 14:08:09 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or
when there is some error happens in processing. This patch will free the
buffer right after processing a request before sending back a response.
---
Summary of changes:
source/winbindd/winbindd.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index f75af64..44b5415 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -549,7 +549,6 @@ static void response_extra_sent(void *private_data, bool
success)
return;
}
- SAFE_FREE(state-request.extra_data.data);
SAFE_FREE(state-response.extra_data.data);
setup_async_read(state-fd_event, state-request, sizeof(uint32),
@@ -581,6 +580,8 @@ static void response_main_sent(void *private_data, bool
success)
static void request_finished(struct winbindd_cli_state *state)
{
+ /* Make sure request.extra_data is freed when finish processing a
request */
+ SAFE_FREE(state-request.extra_data.data);
setup_async_write(state-fd_event, state-response,
sizeof(state-response), response_main_sent, state);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3943-gc1fcc41
The branch, v3-3-test has been updated
via c1fcc41bd96652b175b41421a5f6a9396c75e67f (commit)
from 6a561d311496569dd5db0c6d6461ce9c4896f142 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c1fcc41bd96652b175b41421a5f6a9396c75e67f
Author: Qiao Yang [EMAIL PROTECTED]
Date: Fri Sep 5 14:08:09 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or
when there is some error happens in processing. This patch will free the
buffer right after processing a request before sending back a response.
(cherry picked from commit be6f12273f171a3eb1967d2299064e57d737f6a4)
---
Summary of changes:
source/winbindd/winbindd.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index f75af64..44b5415 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -549,7 +549,6 @@ static void response_extra_sent(void *private_data, bool
success)
return;
}
- SAFE_FREE(state-request.extra_data.data);
SAFE_FREE(state-response.extra_data.data);
setup_async_read(state-fd_event, state-request, sizeof(uint32),
@@ -581,6 +580,8 @@ static void response_main_sent(void *private_data, bool
success)
static void request_finished(struct winbindd_cli_state *state)
{
+ /* Make sure request.extra_data is freed when finish processing a
request */
+ SAFE_FREE(state-request.extra_data.data);
setup_async_write(state-fd_event, state-response,
sizeof(state-response), response_main_sent, state);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2988-g72865f5
The branch, v3-2-test has been updated
via 72865f5e4ff30861d58b928baaf7be3373301f37 (commit)
from 1558a5c1977b1f87600ec487238fa8db009f41fd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 72865f5e4ff30861d58b928baaf7be3373301f37
Author: Qiao Yang [EMAIL PROTECTED]
Date: Fri Sep 5 14:08:09 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or
when there is some error happens in processing. This patch will free the
buffer right after processing a request before sending back a response.
(cherry picked from commit be6f12273f171a3eb1967d2299064e57d737f6a4)
---
Summary of changes:
source/winbindd/winbindd.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 98d70cc..876b2e8 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -553,7 +553,6 @@ static void response_extra_sent(void *private_data, bool
success)
return;
}
- SAFE_FREE(state-request.extra_data.data);
SAFE_FREE(state-response.extra_data.data);
setup_async_read(state-fd_event, state-request, sizeof(uint32),
@@ -588,6 +587,8 @@ static void response_main_sent(void *private_data, bool
success)
static void request_finished(struct winbindd_cli_state *state)
{
+ /* Make sure request.extra_data is freed when finish processing a
request */
+ SAFE_FREE(state-request.extra_data.data);
setup_async_write(state-fd_event, state-response,
sizeof(state-response), response_main_sent, state);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-13-g05a8013
The branch, v3-0-test has been updated
via 05a80132ea95f40fdc8d4cfa6f90d8ba472a0272 (commit)
from f3d604ab72173c9d51661f3b696b0f25da602226 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 05a80132ea95f40fdc8d4cfa6f90d8ba472a0272
Author: Qiao Yang [EMAIL PROTECTED]
Date: Fri Sep 5 14:17:04 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or
when
there is some error happens in processing. This patch will free the buffer
right after processing a request before sending back a response.
---
Summary of changes:
source/nsswitch/winbindd.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 9cf4bea..54081ab 100644
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -477,7 +477,6 @@ static void response_extra_sent(void *private_data, BOOL
success)
return;
}
- SAFE_FREE(state-request.extra_data.data);
SAFE_FREE(state-response.extra_data.data);
setup_async_read(state-fd_event, state-request, sizeof(uint32),
@@ -512,6 +511,8 @@ static void response_main_sent(void *private_data, BOOL
success)
static void request_finished(struct winbindd_cli_state *state)
{
+ /* Make sure request.extra_data is freed when finish processing a
request */
+ SAFE_FREE(state-request.extra_data.data);
setup_async_write(state-fd_event, state-response,
sizeof(state-response), response_main_sent, state);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-442-g3aa7523
The branch, v4-0-test has been updated
via 3aa7523d7750fe30d1e6bb5a75ac42b681b9e493 (commit)
from c273d63f94c430a4f553085efb0d6e31a99e5853 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 3aa7523d7750fe30d1e6bb5a75ac42b681b9e493
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 14:24:36 2008 -0700
Added tests that show that write time update is immediate
when changing file size using SMBwrite of size zero,
SET_END_OF_FILE, or SET_ALLOCATION_SIZE - no 2 second
delay in these cases.
Jeremy.
---
Summary of changes:
source/torture/basic/delaywrite.c | 348 -
1 files changed, 347 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/torture/basic/delaywrite.c
b/source/torture/basic/delaywrite.c
index c03e89d..6dfe410 100644
--- a/source/torture/basic/delaywrite.c
+++ b/source/torture/basic/delaywrite.c
@@ -128,7 +128,350 @@ static bool test_delayed_write_update(struct
torture_context *tctx, struct smbcl
return ret;
}
-/*
+/* Updating with a SMBwrite of zero length
+ * changes the write time immediately - even on expand. */
+
+static bool test_delayed_write_update1a(struct torture_context *tctx, struct
smbcli_state *cli)
+{
+ union smb_fileinfo finfo1, finfo2;
+ const char *fname = BASEDIR \\torture_file1a.txt;
+ NTSTATUS status;
+ int fnum1 = -1;
+ bool ret = true;
+ ssize_t written;
+ struct timeval start;
+ struct timeval end;
+ int used_delay = torture_setting_int(tctx, writetimeupdatedelay,
200);
+ int normal_delay = 200;
+ double sec = ((double)used_delay) / ((double)normal_delay);
+ int msec = 1000 * sec;
+ char buf[2048];
+
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
+ fnum1 = smbcli_open(cli-tree, fname, O_RDWR|O_CREAT, DENY_NONE);
+ if (fnum1 == -1) {
+ torture_comment(tctx, Failed to open %s\n, fname);
+ return false;
+ }
+
+ memset(buf, 'x', 2048);
+ written = smbcli_write(cli-tree, fnum1, 0, buf, 0, 2048);
+
+ /* 3 second delay to ensure we get past any 2 second time
+ granularity (older systems may have that) */
+ msleep(3 * msec);
+
+ finfo1.all_info.level = RAW_FILEINFO_ALL_INFO;
+ finfo1.all_info.in.file.fnum = fnum1;
+ finfo2 = finfo1;
+
+ status = smb_raw_fileinfo(cli-tree, tctx, finfo1);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, (fileinfo failed: %s\n, nt_errstr(status)));
+ return false;
+ }
+
+ torture_comment(tctx, Initial write time %s\n,
+ nt_time_string(tctx, finfo1.all_info.out.write_time));
+
+ /* Do a zero length SMBwrite call to truncate. */
+ written = smbcli_smbwrite(cli-tree, fnum1, x, 10240, 0);
+
+ if (written != 0) {
+ torture_comment(tctx, write failed - wrote %d bytes (%s)\n,
+ (int)written, __location__);
+ return false;
+ }
+
+ start = timeval_current();
+ end = timeval_add(start, (120*sec), 0);
+ while (!timeval_expired(end)) {
+ status = smb_raw_fileinfo(cli-tree, tctx, finfo2);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, (fileinfo failed: %s\n, nt_errstr(status)));
+ ret = false;
+ break;
+ }
+
+ if (finfo2.all_info.out.size != 10240) {
+ DEBUG(0, (file not truncated\n));
+ ret = false;
+ break;
+ }
+
+ torture_comment(tctx, write time %s\n,
+ nt_time_string(tctx, finfo2.all_info.out.write_time));
+ if (finfo1.all_info.out.write_time !=
finfo2.all_info.out.write_time) {
+ double diff = timeval_elapsed(start);
+ if (diff (0.25 * sec * 0.75)) { /* 0.75 to cope with
vmware timing */
+ torture_comment(tctx, After SMBwrite truncate
+ server updated write_time after %.2f
seconds
+ (1 sec == %.2f)(wrong!)\n,
+ diff, sec);
+ ret = false;
+ break;
+ }
+
+ torture_comment(tctx, After SMBwrite truncate
+ server updated write_time after %.2f
seconds
+ (1 sec == %.2f)(correct)\n,
+ diff, sec);
+ break;
+ }
+
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4039-gb2a3f13
The branch, v3-devel has been updated
via b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6 (commit)
from be6f12273f171a3eb1967d2299064e57d737f6a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 5 23:22:10 2008 +0200
Revert winbindd: the ad trusted_domains call should return talloced
strings.
This reverts commit b57cbf62e8180c8fdb8f541c43358d36d8dbbdfa.
---
Summary of changes:
source/winbindd/winbindd_ads.c |7 ++-
1 files changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c
index c7f730e..894e786 100644
--- a/source/winbindd/winbindd_ads.c
+++ b/source/winbindd/winbindd_ads.c
@@ -1241,11 +1241,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain
*domain,
continue;
}
- (*names)[ret_count] = talloc_strdup(mem_ctx,
trusts.array[i].netbios_name);
- (*alt_names)[ret_count] = talloc_strdup(mem_ctx,
trusts.array[i].dns_name);
- if ((*names)[ret_count] == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
+ (*names)[ret_count] = CONST_DISCARD(char *,
trusts.array[i].netbios_name);
+ (*alt_names)[ret_count] = CONST_DISCARD(char *,
trusts.array[i].dns_name);
if (trusts.array[i].sid) {
sid_copy((*dom_sids)[ret_count],
trusts.array[i].sid);
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4040-g2d95ea3
The branch, v3-devel has been updated via 2d95ea38a2f1ead37121fcc036c21a7f20ff41f9 (commit) from b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 2d95ea38a2f1ead37121fcc036c21a7f20ff41f9 Author: Jeremy Allison [EMAIL PROTECTED] Date: Fri Sep 5 15:20:59 2008 -0700 Fix warning: pointer of type 'void *' used in arithmetic. Jeremy. --- Summary of changes: source/rpc_parse/parse_prs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c index b3deb80..5eb6c31 100644 --- a/source/rpc_parse/parse_prs.c +++ b/source/rpc_parse/parse_prs.c @@ -406,7 +406,7 @@ bool prs_append_some_data(prs_struct *dst, void *src_base, uint32_t start, return false; } - memcpy(dst-data_p[dst-data_offset], src_base + start, (size_t)len); + memcpy(dst-data_p[dst-data_offset], ((char *)src_base) + start, (size_t)len); dst-data_offset += len; return true; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4041-g0bae1ef
The branch, v3-devel has been updated
via 0bae1ef3de8fda5e1e2d641b14a408e627396912 (commit)
from 2d95ea38a2f1ead37121fcc036c21a7f20ff41f9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 0bae1ef3de8fda5e1e2d641b14a408e627396912
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 15:32:22 2008 -0700
Remove unecessary msync.
Jeremy.
---
Summary of changes:
source/lib/tdb/common/io.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/io.c b/source/lib/tdb/common/io.c
index 4ec18de..661f761 100644
--- a/source/lib/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
@@ -191,10 +191,6 @@ int tdb_munmap(struct tdb_context *tdb)
if (tdb-map_ptr) {
int ret;
- ret = msync(tdb-map_ptr, tdb-map_size, MS_SYNC);
- if (ret != 0)
- return ret;
-
ret = munmap(tdb-map_ptr, tdb-map_size);
if (ret != 0)
return ret;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3944-g24ea36f
The branch, v3-3-test has been updated
via 24ea36f2c772468d4906145520b48f4857d4eeb7 (commit)
from c1fcc41bd96652b175b41421a5f6a9396c75e67f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 24ea36f2c772468d4906145520b48f4857d4eeb7
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 15:33:40 2008 -0700
Remove unecessary msync.
Jeremy.
---
Summary of changes:
source/lib/tdb/common/io.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/io.c b/source/lib/tdb/common/io.c
index 4ec18de..661f761 100644
--- a/source/lib/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
@@ -191,10 +191,6 @@ int tdb_munmap(struct tdb_context *tdb)
if (tdb-map_ptr) {
int ret;
- ret = msync(tdb-map_ptr, tdb-map_size, MS_SYNC);
- if (ret != 0)
- return ret;
-
ret = munmap(tdb-map_ptr, tdb-map_size);
if (ret != 0)
return ret;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2989-gd7eab4b
The branch, v3-2-test has been updated
via d7eab4b20af47401d281dd672e012d4eb96e5f4a (commit)
from 72865f5e4ff30861d58b928baaf7be3373301f37 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit d7eab4b20af47401d281dd672e012d4eb96e5f4a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 15:35:04 2008 -0700
Remove unecessary msync.
Jeremy.
---
Summary of changes:
source/lib/tdb/common/io.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/io.c b/source/lib/tdb/common/io.c
index 4ec18de..661f761 100644
--- a/source/lib/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
@@ -191,10 +191,6 @@ int tdb_munmap(struct tdb_context *tdb)
if (tdb-map_ptr) {
int ret;
- ret = msync(tdb-map_ptr, tdb-map_size, MS_SYNC);
- if (ret != 0)
- return ret;
-
ret = munmap(tdb-map_ptr, tdb-map_size);
if (ret != 0)
return ret;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-14-g2f509fd
The branch, v3-0-test has been updated
via 2f509fdbed5b0ab3d9ff06bc8101d9851989be19 (commit)
from 05a80132ea95f40fdc8d4cfa6f90d8ba472a0272 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 2f509fdbed5b0ab3d9ff06bc8101d9851989be19
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 15:36:59 2008 -0700
Remove unecessary msync.
Jeremy.
---
Summary of changes:
source/tdb/common/io.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/tdb/common/io.c b/source/tdb/common/io.c
index df66816..4e95755 100644
--- a/source/tdb/common/io.c
+++ b/source/tdb/common/io.c
@@ -192,10 +192,6 @@ int tdb_munmap(struct tdb_context *tdb)
if (tdb-map_ptr) {
int ret;
- ret = msync(tdb-map_ptr, tdb-map_size, MS_SYNC);
- if (ret != 0)
- return ret;
-
ret = munmap(tdb-map_ptr, tdb-map_size);
if (ret != 0)
return ret;
--
Samba Shared Repository
Build status as of Sat Sep 6 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-09-05 00:00:29.0 + +++ /home/build/master/cache/broken_results.txt 2008-09-06 00:00:10.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Sep 5 00:00:02 2008 +Build status as of Sat Sep 6 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -11,12 +11,12 @@ lorikeet-heimdal 29 21 0 pidl 20 10 0 ppp 13 0 0 -rsync33 11 0 +rsync31 11 0 samba-docs 0 0 0 samba-gtk6 6 0 -samba_3_X_devel 28 14 0 -samba_3_X_test 29 16 0 -samba_4_0_test 31 24 1 +samba_3_X_devel 28 19 0 +samba_3_X_test 29 21 0 +samba_4_0_test 31 27 1 smb-build31 6 0 talloc 33 5 0 tdb 31 10 0
Re: [SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4041-g0bae1ef
Can you add a comment about the discussions we had, so that next time
someone look at this code and at the manpage we do not have to discuss
this again ?
Simo.
On Fri, 2008-09-05 at 17:33 -0500, Jeremy Allison wrote:
The branch, v3-devel has been updated
via 0bae1ef3de8fda5e1e2d641b14a408e627396912 (commit)
from 2d95ea38a2f1ead37121fcc036c21a7f20ff41f9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 0bae1ef3de8fda5e1e2d641b14a408e627396912
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 15:32:22 2008 -0700
Remove unecessary msync.
Jeremy.
---
Summary of changes:
source/lib/tdb/common/io.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/io.c b/source/lib/tdb/common/io.c
index 4ec18de..661f761 100644
--- a/source/lib/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
@@ -191,10 +191,6 @@ int tdb_munmap(struct tdb_context *tdb)
if (tdb-map_ptr) {
int ret;
- ret = msync(tdb-map_ptr, tdb-map_size, MS_SYNC);
- if (ret != 0)
- return ret;
-
ret = munmap(tdb-map_ptr, tdb-map_size);
if (ret != 0)
return ret;
--
Simo Sorce
Samba Team GPL Compliance Officer [EMAIL PROTECTED]
Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED]
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2990-gf2fb632
The branch, v3-2-test has been updated
via f2fb6321ba30ca7fa11bc8d395f1a1865bb2 (commit)
from d7eab4b20af47401d281dd672e012d4eb96e5f4a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit f2fb6321ba30ca7fa11bc8d395f1a1865bb2
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 19:01:09 2008 -0700
Write times code update.
Ok, here's the fix for the write times breakage
with the new tests in S4 smbtorture.
The key is keeping in the share mode struct
the old_file_time as the real write time,
set by all the write and allocation calls,
and the changed_write_time as the sticky
write time - set by the SET_FILE_TIME calls.
We can set them independently (although I
kept the optimization of not setting the
old_file_time is a changed_write_time
was already set, as we'll never see it.
This allows us to update the write time
immediately on the SMBwrite truncate case,
SET_END_OF_FILE and SET_ALLOCATION_SIZE calls,
whilst still have the 2 second delay on the
normal SMBwrite, SMBwriteX calls.
I think in a subsequent patch I'd like to
change the name of these from old_file_time
to write_time and changed_write_time to
sticky_write_time to make this clearer.
I think I also fixed a bug in Metze's original
code in that once a write timestamp had been
set from a normal SMBwriteX call the fsp-update_write_time_triggered
variable was set and then never reset - thus
meaning the write timestamp would never get
updated again on subsequent SMBwriteX's.
The new code checks the update_write_time_event
event instead, and doesn't update is there's
an event already scheduled.
Metze especially, please check this over for
your understanding.
Jeremy.
---
Summary of changes:
source/include/smb.h |1 -
source/locking/locking.c | 33
source/smbd/dosmode.c| 52 -
source/smbd/fileio.c | 47 ++---
source/smbd/reply.c |6 +++-
source/smbd/trans2.c | 12 ++
6 files changed, 110 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index 3c7058f..5194c73 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -487,7 +487,6 @@ typedef struct files_struct {
uint32 access_mask; /* NTCreateX access bits
(FILE_READ_DATA etc.) */
uint32 share_access;/* NTCreateX share constants
(FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
- bool update_write_time_triggered;
struct timed_event *update_write_time_event;
bool update_write_time_on_close;
struct timespec close_write_time;
diff --git a/source/locking/locking.c b/source/locking/locking.c
index 4ee0a19..04fb97a 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -1409,22 +1409,21 @@ bool set_allow_initial_delete_on_close(struct
share_mode_lock *lck, files_struct
return True;
}
-bool set_write_time(struct file_id fileid, struct timespec write_time,
- bool overwrite)
+bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
{
struct share_mode_lock *lck;
- DEBUG(5,(set_write_time: %s overwrite=%d id=%s\n,
+ DEBUG(5,(set_sticky_write_time: %s id=%s\n,
timestring(debug_ctx(),
convert_timespec_to_time_t(write_time)),
-overwrite, file_id_string_tos(fileid)));
+file_id_string_tos(fileid)));
lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
if (lck == NULL) {
return False;
}
- if (overwrite || null_timespec(lck-changed_write_time)) {
+ if (timespec_compare(lck-changed_write_time, write_time) != 0) {
lck-modified = True;
lck-changed_write_time = write_time;
}
@@ -1433,6 +1432,30 @@ bool set_write_time(struct file_id fileid, struct
timespec write_time,
return True;
}
+bool set_write_time(struct file_id fileid, struct timespec write_time)
+{
+ struct share_mode_lock *lck;
+
+ DEBUG(5,(set_sticky_write_time: %s id=%s\n,
+timestring(debug_ctx(),
+ convert_timespec_to_time_t(write_time)),
+file_id_string_tos(fileid)));
+
+ lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
+ if (lck == NULL) {
+ return False;
+ }
+
+ if (timespec_compare(lck-old_write_time, write_time) != 0) {
+ lck-modified = True;
+ lck-old_write_time =
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4042-g6f20585
The branch, v3-devel has been updated via 6f20585419046c4aca1f7d6c863cf79eb6ae53b0 (commit) from 0bae1ef3de8fda5e1e2d641b14a408e627396912 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 6f20585419046c4aca1f7d6c863cf79eb6ae53b0 Author: Jeremy Allison [EMAIL PROTECTED] Date: Fri Sep 5 19:00:48 2008 -0700 Write times code update. Ok, here's the fix for the write times breakage with the new tests in S4 smbtorture. The key is keeping in the share mode struct the old_file_time as the real write time, set by all the write and allocation calls, and the changed_write_time as the sticky write time - set by the SET_FILE_TIME calls. We can set them independently (although I kept the optimization of not setting the old_file_time is a changed_write_time was already set, as we'll never see it. This allows us to update the write time immediately on the SMBwrite truncate case, SET_END_OF_FILE and SET_ALLOCATION_SIZE calls, whilst still have the 2 second delay on the normal SMBwrite, SMBwriteX calls. I think in a subsequent patch I'd like to change the name of these from old_file_time to write_time and changed_write_time to sticky_write_time to make this clearer. I think I also fixed a bug in Metze's original code in that once a write timestamp had been set from a normal SMBwriteX call the fsp-update_write_time_triggered variable was set and then never reset - thus meaning the write timestamp would never get updated again on subsequent SMBwriteX's. The new code checks the update_write_time_event event instead, and doesn't update is there's an event already scheduled. Metze especially, please check this over for your understanding. Jeremy. --- Summary of changes: source/include/proto.h | 14 ++-- source/include/smb.h |1 - source/locking/locking.c | 33 source/smbd/dosmode.c| 52 - source/smbd/fileio.c | 47 ++--- source/smbd/reply.c |6 +++- source/smbd/trans2.c | 12 ++ 7 files changed, 117 insertions(+), 48 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/proto.h b/source/include/proto.h index 291afac..e94a217 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -5306,8 +5306,8 @@ void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok); bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok); bool set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, bool delete_on_close); -bool set_write_time(struct file_id fileid, struct timespec write_time, - bool overwrite); +bool set_sticky_write_time(struct file_id fileid, struct timespec write_time); +bool set_write_time(struct file_id fileid, struct timespec write_time); int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *, const char *, void *), void *private_data); @@ -9616,11 +9616,10 @@ int file_set_dosmode(connection_struct *conn, const char *fname, const char *parent_dir, bool newfile); int file_ntimes(connection_struct *conn, const char *fname, const struct timespec ts[2]); -bool set_write_time_path(connection_struct *conn, const char *fname, -struct file_id fileid, const struct timespec mtime, -bool overwrite); -bool set_write_time_fsp(struct files_struct *fsp, const struct timespec mtime, - bool overwrite); +bool set_sticky_write_time_path(connection_struct *conn, const char *fname, +struct file_id fileid, const struct timespec mtime); +bool set_sticky_write_time_fsp(struct files_struct *fsp, const struct timespec mtime); +bool update_write_time(struct files_struct *fsp); /* The following definitions come from smbd/error.c */ @@ -9665,6 +9664,7 @@ bool directory_has_default_acl(connection_struct *conn, const char *fname); ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n); void trigger_write_time_update(struct files_struct *fsp); +void trigger_write_time_update_immediate(struct files_struct *fsp); ssize_t write_file(struct smb_request *req, files_struct *fsp, const char *data, diff --git a/source/include/smb.h b/source/include/smb.h index c8c4f8c..d450eb5 100644 --- a/source/include/smb.h +++
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3945-gaff490e
The branch, v3-3-test has been updated via aff490ef3b32b3bb2c11cf35ed3fa0272178da3f (commit) from 24ea36f2c772468d4906145520b48f4857d4eeb7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit aff490ef3b32b3bb2c11cf35ed3fa0272178da3f Author: Jeremy Allison [EMAIL PROTECTED] Date: Fri Sep 5 19:01:32 2008 -0700 Write times code update. Ok, here's the fix for the write times breakage with the new tests in S4 smbtorture. The key is keeping in the share mode struct the old_file_time as the real write time, set by all the write and allocation calls, and the changed_write_time as the sticky write time - set by the SET_FILE_TIME calls. We can set them independently (although I kept the optimization of not setting the old_file_time is a changed_write_time was already set, as we'll never see it. This allows us to update the write time immediately on the SMBwrite truncate case, SET_END_OF_FILE and SET_ALLOCATION_SIZE calls, whilst still have the 2 second delay on the normal SMBwrite, SMBwriteX calls. I think in a subsequent patch I'd like to change the name of these from old_file_time to write_time and changed_write_time to sticky_write_time to make this clearer. I think I also fixed a bug in Metze's original code in that once a write timestamp had been set from a normal SMBwriteX call the fsp-update_write_time_triggered variable was set and then never reset - thus meaning the write timestamp would never get updated again on subsequent SMBwriteX's. The new code checks the update_write_time_event event instead, and doesn't update is there's an event already scheduled. Metze especially, please check this over for your understanding. Jeremy. --- Summary of changes: source/Makefile.in |5 source/include/proto.h | 14 ++-- source/include/smb.h |1 - source/locking/locking.c | 33 source/smbd/dosmode.c| 52 - source/smbd/fileio.c | 47 ++--- source/smbd/process.c|2 +- source/smbd/reply.c |6 +++- source/smbd/trans2.c | 12 ++ 9 files changed, 123 insertions(+), 49 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 5793b5e..03f04cc 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -623,6 +623,7 @@ VFS_TSMSM_OBJ = modules/vfs_tsmsm.o VFS_FILEID_OBJ = modules/vfs_fileid.o VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o VFS_SYNCOPS_OBJ = modules/vfs_syncops.o +VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o @@ -2381,6 +2382,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFS_AIO_FORK_OBJ) @echo Building plugin $@ @$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFS_ACL_XATTR_OBJ) + @echo Building plugin $@ + @$(SHLD_MODULE) $(VFS_ACL_XATTR_OBJ) + bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) libgpo/gpext/registry.o @echo Building plugin $@ @$(SHLD_MODULE) libgpo/gpext/registry.o diff --git a/source/include/proto.h b/source/include/proto.h index d5e942a..eeb62e1 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -5308,8 +5308,8 @@ void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok); bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok); bool set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, bool delete_on_close); -bool set_write_time(struct file_id fileid, struct timespec write_time, - bool overwrite); +bool set_sticky_write_time(struct file_id fileid, struct timespec write_time); +bool set_write_time(struct file_id fileid, struct timespec write_time); int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *, const char *, void *), void *private_data); @@ -9616,11 +9616,10 @@ int file_set_dosmode(connection_struct *conn, const char *fname, const char *parent_dir, bool newfile); int file_ntimes(connection_struct *conn, const char *fname, const struct timespec ts[2]); -bool set_write_time_path(connection_struct *conn, const char *fname, -struct file_id fileid, const struct timespec mtime, -bool overwrite); -bool set_write_time_fsp(struct files_struct *fsp, const struct timespec mtime, -
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4043-g079c75e
The branch, v3-devel has been updated
via 079c75ef3c169c7a5d81bcaa0b70b6e0df2c464d (commit)
from 6f20585419046c4aca1f7d6c863cf79eb6ae53b0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 079c75ef3c169c7a5d81bcaa0b70b6e0df2c464d
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 20:37:00 2008 -0700
Fix debug message to show correct function name.
Jeremy.
---
Summary of changes:
source/locking/locking.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/locking/locking.c b/source/locking/locking.c
index f1f9278..368ab16 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -1432,7 +1432,7 @@ bool set_write_time(struct file_id fileid, struct
timespec write_time)
{
struct share_mode_lock *lck;
- DEBUG(5,(set_sticky_write_time: %s id=%s\n,
+ DEBUG(5,(set_write_time: %s id=%s\n,
timestring(debug_ctx(),
convert_timespec_to_time_t(write_time)),
file_id_string_tos(fileid)));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2991-gb2fcb8b
The branch, v3-2-test has been updated
via b2fcb8b6b17302e5ec29914f4e3dde853ffe5283 (commit)
from f2fb6321ba30ca7fa11bc8d395f1a1865bb2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit b2fcb8b6b17302e5ec29914f4e3dde853ffe5283
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 20:40:02 2008 -0700
Fix debug message to show correct function name.
Jeremy.
---
Summary of changes:
source/locking/locking.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/locking/locking.c b/source/locking/locking.c
index 04fb97a..85bacd1 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -1436,7 +1436,7 @@ bool set_write_time(struct file_id fileid, struct
timespec write_time)
{
struct share_mode_lock *lck;
- DEBUG(5,(set_sticky_write_time: %s id=%s\n,
+ DEBUG(5,(set_write_time: %s id=%s\n,
timestring(debug_ctx(),
convert_timespec_to_time_t(write_time)),
file_id_string_tos(fileid)));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-443-g840369b
The branch, v4-0-test has been updated
via 840369b5534eee21818b9d3677404b0fc60a0219 (commit)
from 3aa7523d7750fe30d1e6bb5a75ac42b681b9e493 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 840369b5534eee21818b9d3677404b0fc60a0219
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 5 21:47:06 2008 -0700
Don't compare identity, it'll never be different.
Jeremy.
---
Summary of changes:
source/torture/basic/delaywrite.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/torture/basic/delaywrite.c
b/source/torture/basic/delaywrite.c
index 6dfe410..52505fa 100644
--- a/source/torture/basic/delaywrite.c
+++ b/source/torture/basic/delaywrite.c
@@ -1469,7 +1469,7 @@ static bool test_delayed_write_update5(struct
torture_context *tctx,
GET_INFO_BOTH(finfo3,pinfo3);
COMPARE_WRITE_TIME_EQUAL(finfo3, finfo2);
- if (finfo3.basic_info.out.write_time ==
finfo3.basic_info.out.write_time) {
+ if (finfo3.basic_info.out.write_time ==
finfo2.basic_info.out.write_time) {
torture_comment(tctx, Server did not update write_time
(correct)\n);
}
@@ -1638,7 +1638,7 @@ again:
GET_INFO_BOTH(finfo3,pinfo3);
COMPARE_WRITE_TIME_EQUAL(finfo3, finfo2);
- if (finfo3.basic_info.out.write_time ==
finfo3.basic_info.out.write_time) {
+ if (finfo3.basic_info.out.write_time ==
finfo2.basic_info.out.write_time) {
torture_comment(tctx, Server did not update write_time
(correct)\n);
}
--
Samba Shared Repository
