Re: [Samba] SAMBA + KERBEROS + AD
Hi, I have the same problem as Hélio : getent passwd only returns local users when wbinfo -u returns domain users. However, I have installed samba using Debian packages with aptitude. All I have is : # find / -name libnss_winb* /lib/libnss_winbind.so.2 # ls -l /lib/libnss_winbind.so* -rw-r--r-- 1 root root 15700 2007-12-10 12:47 /lib/libnss_winbind.so.2 I have tried changing permissions on libnss_winbind.so.2 to 775 and adding a /lib/libnss_winbind.so symlink to /lib/libnss_winbind.so.2, all to no avail. The .deb archive in the current stable Debian does not contain libnss_winbind.so, only libnss_winbind.so.2. I have tried compiling Samba from sources and copying the resulting libnss_winbind.so to /lib but I still only get local accounts when I run getent passwd and getent group. Is the solution to install the version compiled from sources? Is there no way to get the version packaged for the distribution to work? Cheers, P.S. I hope my intrusion in Hélio's thread will help both of us to progress Dans sa grande sagesse, ciro samba a écrit, le 07.03.2008 03:51 : Helio, have you tested nsswitch with `getent passwd` should return root:x:0:0::/root:/bin/bash bin:x:1:1:bin:/bin:/bin/false daemon:x:2:2:daemon:/sbin:/bin/false adm:x:3:4:adm:/var/log:/bin/false lp:x:4:7:lp:/var/spool/lpd:/bin/false sync:x:5:0:sync:/sbin:/bin/sync ... etc gdm:x:42:42:GDM:/var/state/gdm:/bin/bash apache:x:80:80:User for Apache:/srv/httpd:/bin/false messagebus:x:81:81:User for D-BUS:/var/run/dbus:/bin/false haldaemon:x:82:82:User for HAL:/var/run/hald:/bin/false pop:x:90:90:POP:/:/bin/false nobody:x:99:99:nobody:/:/bin/false EDITORA\administrator:*:1:1:Administrator:/home/EDITORA/administrator:/bin/false EDITORA\guest:*:10001:10001:Guest:/home/EDITORA/guest:/bin/false etc..; your domain users must be mapped to linux users, with winbind uid, which you have in your smb.conf if getent does not return domain users at all but wbinfo -u does, the problems is with libnss_winbind.so i download source code into /lib/usr/apps/whatsappname so my samba is in /usr/local/apps/samba-3.0.28/ and the correct libnss_winbind.so is /usr/local/apps/samba-3.0.28/source/nsswitch/libnss_winbind.so. copy this file over /lib/libnss_winbind.so and $ cd /lib $ ln -s libnss_winbind.so libnss_winbind.so.2 and then getent passwd again, this sould do the trick tks Ciro On Wed, Mar 5, 2008 at 4:05 PM, Helio Calaça Filho [EMAIL PROTECTED] wrote: But i have to try with the +symbol, just like this exemple? SAMBA+Administrator or i have to try like this way SAMBAAdminitrator ??? -- Atte, Hélio Calaça Filho -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Oliver Henriot, UMS MI2S, http://mi2s.imag.fr/ Moyens Informatiques et Multimédia Domaine universitaire BP53 / 38041 Grenoble cedex 9 / France tel.: +33 4 76 51 43 48 fax: +33 4 76 51 47 15 Trust in CNRS's certificates http://igc.services.cnrs.fr/Doc/General/trust.html smime.p7s Description: S/MIME Cryptographic Signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] How to convert local profile to server profile
Hello List, i have set up a Samba PDC and it is running smoothly. Now i would like to convert my Windows Vista Profile (which i have been using locale for months now) to a server profile. How i tried to solve this or convert the profile: 1) In the system properties of Vista you can change the type of the user profile. Unfortinatelly the server based profile is greyed out at my user. Even if i log into vista with the administrator user. 2) I added my username to the pdc, logged in and off again (to make sure the permissions of the profile folder is okay). Now a server based naked profile exists. Then i have deleted its content and copied ALL files from my local VIsta profile into my pdc users profile folder. When i now log in my Vits box still does not use the server profile. How can i convert a local profile to a server baed one? How does this work for XP and Vista? Thanks, Mario -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] No usersidlist
Dear Samba friends, The response to the following command on my Samba server: net usersidlist is: [2008/03/07 09:26:23, 0] utils/net_rpc.c:net_usersidlist(4724) Could not get the user/sid list and somewhat unexpected. How can I obtain the usersidlist? What are the tools to resolve SID to objectnames and vice versa? -- Met vriendelijke groeten, With kind regards, Mit freundlichen Gruessen, De jrus wah, Willy * W.K. Offermans Home: +31 45 544 49 44 Mobile: +31 653 27 16 23 e-mail: [EMAIL PROTECTED] Powered by (__) \\\'',) \/ \ ^ .\._/_) www.FreeBSD.org -- 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 convert local profile to server profile
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Poke around the internets for Microsoft's profile migration tool. I suspect this is in the documentation, but I couldn't prove it. :) [EMAIL PROTECTED] wrote: Hello List, i have set up a Samba PDC and it is running smoothly. Now i would like to convert my Windows Vista Profile (which i have been using locale for months now) to a server profile. How i tried to solve this or convert the profile: 1) In the system properties of Vista you can change the type of the user profile. Unfortinatelly the server based profile is greyed out at my user. Even if i log into vista with the administrator user. 2) I added my username to the pdc, logged in and off again (to make sure the permissions of the profile folder is okay). Now a server based naked profile exists. Then i have deleted its content and copied ALL files from my local VIsta profile into my pdc users profile folder. When i now log in my Vits box still does not use the server profile. How can i convert a local profile to a server baed one? How does this work for XP and Vista? Thanks, Mario - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH0P2Emb+gadEcsb4RAp4oAJ4hHjypYz7zpjJUmKG3gCqwO8TFAQCfcRgB niNfoPqxgVIdIoVif+HGgU8= =a6Rb -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] SAMBA + KERBEROS + AD
I forgot to mention, after creating the symlink from libnss_winbind.so.2 to libnss_winbind.so, copying libnss_winbind.so.2 as libnss_winbind.so in /lib, or compiling Samba and copying the compiled libnss_winbind.so into /lib, when I run ldconfig -v, I only get : # ldconfig -v|grep libnss_winb ldconfig: libnss_winbind.so.2 - libnss_winbind.so.2 No mention whatsoever of libnss_winbind.so, that seems strange doesn't it? What am I doing wrong? Cheers, Oliver Henriot a écrit, le 07.03.2008 09:17 : Hi, I have the same problem as Hélio : getent passwd only returns local users when wbinfo -u returns domain users. However, I have installed samba using Debian packages with aptitude. All I have is : # find / -name libnss_winb* /lib/libnss_winbind.so.2 # ls -l /lib/libnss_winbind.so* -rw-r--r-- 1 root root 15700 2007-12-10 12:47 /lib/libnss_winbind.so.2 I have tried changing permissions on libnss_winbind.so.2 to 775 and adding a /lib/libnss_winbind.so symlink to /lib/libnss_winbind.so.2, all to no avail. The .deb archive in the current stable Debian does not contain libnss_winbind.so, only libnss_winbind.so.2. I have tried compiling Samba from sources and copying the resulting libnss_winbind.so to /lib but I still only get local accounts when I run getent passwd and getent group. Is the solution to install the version compiled from sources? Is there no way to get the version packaged for the distribution to work? Cheers, P.S. I hope my intrusion in Hélio's thread will help both of us to progress Dans sa grande sagesse, ciro samba a écrit, le 07.03.2008 03:51 : Helio, have you tested nsswitch with `getent passwd` should return root:x:0:0::/root:/bin/bash bin:x:1:1:bin:/bin:/bin/false daemon:x:2:2:daemon:/sbin:/bin/false adm:x:3:4:adm:/var/log:/bin/false lp:x:4:7:lp:/var/spool/lpd:/bin/false sync:x:5:0:sync:/sbin:/bin/sync ... etc gdm:x:42:42:GDM:/var/state/gdm:/bin/bash apache:x:80:80:User for Apache:/srv/httpd:/bin/false messagebus:x:81:81:User for D-BUS:/var/run/dbus:/bin/false haldaemon:x:82:82:User for HAL:/var/run/hald:/bin/false pop:x:90:90:POP:/:/bin/false nobody:x:99:99:nobody:/:/bin/false EDITORA\administrator:*:1:1:Administrator:/home/EDITORA/administrator:/bin/false EDITORA\guest:*:10001:10001:Guest:/home/EDITORA/guest:/bin/false etc..; your domain users must be mapped to linux users, with winbind uid, which you have in your smb.conf if getent does not return domain users at all but wbinfo -u does, the problems is with libnss_winbind.so i download source code into /lib/usr/apps/whatsappname so my samba is in /usr/local/apps/samba-3.0.28/ and the correct libnss_winbind.so is /usr/local/apps/samba-3.0.28/source/nsswitch/libnss_winbind.so. copy this file over /lib/libnss_winbind.so and $ cd /lib $ ln -s libnss_winbind.so libnss_winbind.so.2 and then getent passwd again, this sould do the trick tks Ciro On Wed, Mar 5, 2008 at 4:05 PM, Helio Calaça Filho [EMAIL PROTECTED] wrote: But i have to try with the +symbol, just like this exemple? SAMBA+Administrator or i have to try like this way SAMBAAdminitrator ??? -- Atte, Hélio Calaça Filho -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Oliver Henriot, UMS MI2S, http://mi2s.imag.fr/ Moyens Informatiques et Multimédia Domaine universitaire BP53 / 38041 Grenoble cedex 9 / France tel.: +33 4 76 51 43 48 fax: +33 4 76 51 47 15 Trust in CNRS's certificates http://igc.services.cnrs.fr/Doc/General/trust.html smime.p7s Description: S/MIME Cryptographic Signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba as standalone server problems with saving documents
Hi, I had the same issue. In may case the `force group` option had the problem. If I removed it, there was no `read-only` problems. I saw that your other shares have the same option, so it is a bit strange... You can also try to upgrade to version 3.2, as this `force group` problem is solved in that version. Regards, Tamas Csabina On Wed, 2008-03-05 at 18:22 +0100, Mister Olli wrote: Hi... I wanna use samba 3.0.28 (on FreeBSD 7.0) machine just to serve some shares with different content. We have several users, and access to a share should be managed by the unix group a user is in. so if the user is a member of the group 'business' he has access to a share called business. Every users has his primary group set to 'users'. I implemented that for several groups: - software - internal - business - acquise everything works fine, except for the 'business' share. when a user opens a word/powerpoint file, the file is opened as 'read-only' and you can't save it under another name. This issue is only seen under WindowsXP, and I wasn't able to reproduce it within VMware, so it have to rely on the client maschine users that actually have the problem. My config (testparm -v) is attached to this mail... any suggestions how to fix that? my clients are currently pissed ;-)) regards, olli -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba 3.2.0 and internal shared libraries
Hi Folks, it is great that so many people have already started testing 3.2.0pre2 and giving feedback! Thanks a lot! Here is one major pitfall that you have to be aware of: Samba 3.2.0 uses shared libraries internally by default (if shared libraries are supported by the system). This means that certain subsystems are built and linked in as shared libs, currently libtalloc.so, libtdbs.so, libnetapi.so and libwbclient.so. You can disable using shared libs by specifying --disable-shared-libs as a parameter to configure. But beware that libwbclient will still be linked in dynamically (unless you configure with --enable-developer). If you decide to use the shared libs and in (almost) any case for libwbclient.so, your dynamic loader must know how to find these libs. You can do several things to accomplish this: 0) install in such a way that the libs get placed in a directory that is already searched for libs (e.g. /usr/lib/) 1) Set the environment variable LD_LIBRARY_PATH to /your/samba/library/path before starting the samba applications. (This is the variable name for linux, solaris, netbsd, irix, ...) the variable is called SHLIB_PATH on HP-UX, LIB_PATH on AIX and DYLD_LIBRARY_PATH on darwin.) 2) Add a line with the folder containing your samba libs to /etc/ld.so.conf (or a dedicated file /etc/ld.so.conf.d/samba_foo.conf which has to be included in /etc/ld.so.conf) 3) build your binaries with an rpath: LDFLAGS=-Wl,-R,/your/samba/library/path ./configure ... (This is for Linux, Solaris, AIX and some others. You might have to work it out for your platform.) Hope this helps! Keep on testing! Cheers - Michael -- Michael Adam [EMAIL PROTECTED] [EMAIL PROTECTED] SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.SerNet.DE, mailto: Info @ SerNet.DE pgpYHMSOpB0uX.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] I changed smb.conf, but nothing seems to happen!
Hello, * After some good advice from the list, I now have my workgroup visible. Next problem. I click on it from my win98 station (yes, it is old; I even have a w95 workstation somewhere :-) ) and I get can't find share name. Now I look in the samba logs, and I see that it is looking for /usr/local/samba/netlogon, which doesn't exist. Oops, error! The netlogon happens to be in /etc/samba/netlogon, so I change the path in smb.conf and restart Samba. I try again, but now my Win98 station keeps trying to access /usr/local/samba/netlogon. How come? I suppose that the easiest way out is to put a link to the right location in /usr/local, but somehow that doesn't feel right. -- J.J. Gerritse Mühlenstraße 11 D-47546 Kalkar-Wissel Duitsland +49-2824-971487 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Importing Accounts from Windows?
Is there some automated system to import windows accounts into a samba or a samba ldap situation? I've got a few hundred users on an NT domain, and I'd like to migrate them sometime before the last piece of hardware supported by NT4 rusts. Right now several linux based samba servers are doing all of the heavy lifting (shared files printers etc), but they are all looking at the domain controller for authentication. Considering the multiple vulns for NT, I know I could just run a password cracker against it, then create new accounts for everyone with their old passwords, but I'm reluctant to do that. Is there a way to transfer the account info from the PDC to samba then just shut the old thing off? Thanks, Kyle -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: I changed smb.conf, but nothing seems to happen!
I found it already-- there was a second ocurrence of /usr/loca/... under [netlogon]. Now why are there two occurrences? -- J.J. Gerritse Mühlenstraße 11 D-47546 Kalkar-Wissel Duitsland +49-2824-971487 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: Fwd: [Samba] roaming profiles stored on BDCs? how?
yeah it was putting it on the netlogon share of the PDC though, even though on the BDC I had it set to put it on the BDC. when I added sambaprofilepath and sambahomepath to the user's LDAP that fixed it though. John Drescher wrote: On Thu, Mar 6, 2008 at 4:15 PM, Adam Williams [EMAIL PROTECTED] wrote: I have a PDC named GOMER w/ IP of 10.8.3.37 and a BDC named BLDG2 w/ ip of 10.8.7.2. when someone on the 10.8.7.x network using the WINS server of 10.8.7.2 logs in and out, their roaming profile is stored on the PDC. is there any way to have the roaming profile stored on the BDC?, because I will have other 10.8.x.x networks and some of these remote sites will be using DSL and I don't want the profiles transfering over DSL. any suggestions? You can put the roaming profile on any cifs/sanba server in your network. I have mine on a standalone server. see logon path John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: Fwd: [Samba] roaming profiles stored on BDCs? how?
On Fri, Mar 7, 2008 at 10:26 AM, Adam Williams [EMAIL PROTECTED] wrote: yeah it was putting it on the netlogon share of the PDC though, even though on the BDC I had it set to put it on the BDC. when I added sambaprofilepath and sambahomepath to the user's LDAP that fixed it though. I was going to mention that since I use LDAP but I did not want to confuse things any more. Well at least on the first pass... John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Importing Accounts from Windows?
I used a slick migration toolkit: http://sourceforge.net/projects/w2lmt/ Mit freundlichen Grüßen / With kind regards Hans-Wilhelm Heisinger Kyle Schmitt wrote: Is there some automated system to import windows accounts into a samba or a samba ldap situation? I've got a few hundred users on an NT domain, and I'd like to migrate them sometime before the last piece of hardware supported by NT4 rusts. Right now several linux based samba servers are doing all of the heavy lifting (shared files printers etc), but they are all looking at the domain controller for authentication. Considering the multiple vulns for NT, I know I could just run a password cracker against it, then create new accounts for everyone with their old passwords, but I'm reluctant to do that. Is there a way to transfer the account info from the PDC to samba then just shut the old thing off? Thanks, Kyle -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Urgent Help :How set NT password for an for an user
Hi All, I have installed SAMBA 3.0.24 in my UNIX server. When I try to login through an WINDOWS XP client, I found NO NT password stored for user in the log, meant for my cleint name. The log entry:- [2008/03/07 15:51:32, 3] libsmb/ntlm_check.c:ntlm_password_check(189) ntlm_password_check: NO NT password stored for user grpuser. [2008/03/07 15:51:32, 3] libsmb/ntlm_check.c:ntlm_password_check(356) ntlm_password_check: NEITHER LanMan nor NT password supplied for user grpuser [2008/03/07 15:51:32, 3] smbd/sec_ctx.c:push_sec_ctx(208) Then I checked in ./pdbedit -L -v It showing an entry w.r.t grpuser. Can anybody help me out of this problem? It is an urgent thing I need to tackle. Jay -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] SAMBA + KERBEROS + AD
Oliver, Helio, i believe this will solve both of you problem. ldconfig is in fact undoing our manual linking. it links libnss_winbind.so against the original lib again. the solution is edit /etc/ld.so.conf and add the following line to the end of the file /path/to/your/samba/source/nsswitch i.e in my case as of my last post: /usr/local/apps/samba-3.0.28/source/nsswitch erase all /lib/libnss_winb* and # ldconfig -v |grep libnss_winb libnss_winbind.so.2 - libnss_winbind.so.2 and then getent passwd if you have any more problems let me know Ciro On Fri, Mar 7, 2008 at 6:06 AM, Oliver Henriot [EMAIL PROTECTED] wrote: I forgot to mention, after creating the symlink from libnss_winbind.so.2 to libnss_winbind.so, copying libnss_winbind.so.2 as libnss_winbind.so in /lib, or compiling Samba and copying the compiled libnss_winbind.so into /lib, when I run ldconfig -v, I only get : # ldconfig -v|grep libnss_winb ldconfig: libnss_winbind.so.2 - libnss_winbind.so.2 No mention whatsoever of libnss_winbind.so, that seems strange doesn't it? What am I doing wrong? Cheers, Oliver Henriot a écrit, le 07.03.2008 09:17 : Hi, I have the same problem as Hélio : getent passwd only returns local users when wbinfo -u returns domain users. However, I have installed samba using Debian packages with aptitude. All I have is : # find / -name libnss_winb* /lib/libnss_winbind.so.2 # ls -l /lib/libnss_winbind.so* -rw-r--r-- 1 root root 15700 2007-12-10 12:47 /lib/libnss_winbind.so.2 I have tried changing permissions on libnss_winbind.so.2 to 775 and adding a /lib/libnss_winbind.so symlink to /lib/libnss_winbind.so.2, all to no avail. The .deb archive in the current stable Debian does not contain libnss_winbind.so, only libnss_winbind.so.2. I have tried compiling Samba from sources and copying the resulting libnss_winbind.so to /lib but I still only get local accounts when I run getent passwd and getent group. Is the solution to install the version compiled from sources? Is there no way to get the version packaged for the distribution to work? Cheers, P.S. I hope my intrusion in Hélio's thread will help both of us to progress Dans sa grande sagesse, ciro samba a écrit, le 07.03.2008 03:51 : Helio, have you tested nsswitch with `getent passwd` should return root:x:0:0::/root:/bin/bash bin:x:1:1:bin:/bin:/bin/false daemon:x:2:2:daemon:/sbin:/bin/false adm:x:3:4:adm:/var/log:/bin/false lp:x:4:7:lp:/var/spool/lpd:/bin/false sync:x:5:0:sync:/sbin:/bin/sync ... etc gdm:x:42:42:GDM:/var/state/gdm:/bin/bash apache:x:80:80:User for Apache:/srv/httpd:/bin/false messagebus:x:81:81:User for D-BUS:/var/run/dbus:/bin/false haldaemon:x:82:82:User for HAL:/var/run/hald:/bin/false pop:x:90:90:POP:/:/bin/false nobody:x:99:99:nobody:/:/bin/false EDITORA\administrator:*:1:1:Administrator:/home/EDITORA/administrator:/bin/false EDITORA\guest:*:10001:10001:Guest:/home/EDITORA/guest:/bin/false etc..; your domain users must be mapped to linux users, with winbind uid, which you have in your smb.conf if getent does not return domain users at all but wbinfo -u does, the problems is with libnss_winbind.so i download source code into /lib/usr/apps/whatsappname so my samba is in /usr/local/apps/samba-3.0.28/ and the correct libnss_winbind.so is /usr/local/apps/samba-3.0.28/source/nsswitch/libnss_winbind.so. copy this file over /lib/libnss_winbind.so and $ cd /lib $ ln -s libnss_winbind.so libnss_winbind.so.2 and then getent passwd again, this sould do the trick tks Ciro On Wed, Mar 5, 2008 at 4:05 PM, Helio Calaça Filho [EMAIL PROTECTED] wrote: But i have to try with the +symbol, just like this exemple? SAMBA+Administrator or i have to try like this way SAMBAAdminitrator ??? -- Atte, Hélio Calaça Filho -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Oliver Henriot, UMS MI2S, http://mi2s.imag.fr/ Moyens Informatiques et Multimédia Domaine universitaire BP53 / 38041 Grenoble cedex 9 / France tel.: +33 4 76 51 43 48 fax: +33 4 76 51 47 15 Trust in CNRS's certificates http://igc.services.cnrs.fr/Doc/General/trust.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] CTDB and LDAP: anyone?
Andrew, Apologies for not thanking you earlier; I missed your reply amongst the other stuff. So Cheers! Since 3.2.0 will be out soon I'll probably wait for that before even considering deployment. I will test with the preview releases. Thanks for the help. Alex On Thu, 2008-02-21 at 07:51 +1100, Andrew Bartlett wrote: On Tue, 2008-02-12 at 11:01 +, Alex Crow wrote: Hi there, I am looking into using CTDB between a PDC and a BDC. I assume this is possible! However I have a few questions: 1: Do I have to use tdb2 as an Idmap backend? Can I not stay with ldap? (from the CTDB docs: A clustered Samba install must set some specific configuration parameters clustering = yes idmap backend = tdb2 private dir = /a/directory/on/your/cluster/filesystem It is vital that the private directory is on shared storage.) LDAP should be fine... 2. I have got the git tree as mentioned on the CTDB pages; however it seems like 3.2.0pre1 will also support this; which should I go with? 3. Do I have to use IP takeover? All I am trying to do in this case is to consistently provide the home directories and profiles on both the PDC and BDC (I'm using GFS over iSCSI). It doesn't matter if the IP address of either box vanishes - since they are both domain controllers the still-living box should be used anyway (background - I am using passdb expand explicit = yes and in LDAP I have home and profile paths specified prefixed by \\%L, so the user's profile and home dir are mapped to whatever the logon server is for that session). I can see how for sharing domain member services around a cluster that IP takeover is required, but the PDC/BDC relationship means (IMHO) it's not required in this instance. This looks like a perfectly good reason not to require IP takeover. Andrew Bartlett -- This message is intended only for the addressee and may contain confidential information. Unless you are that person, you may not disclose its contents or use it in any way and are requested to delete the message along with any attachments and notify us immediately. Transact is operated by Integrated Financial Arrangements plc Domain House, 5-7 Singer Street, London EC2A 4BQ Tel: (020) 7608 4900 Fax: (020) 7608 1200 (Registered office: as above; Registered in England and Wales under number: 3727592) Authorised and regulated by the Financial Services Authority (entered on the FSA Register; number: 190856) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Get logged on username
Hello, I'm writting an application that will be running on a Samba PDC. It has to get login (%username%) currently logged on some windows NT domain clients. I began to use 'net status sessions' but sometimes it returns more than one user currently logged on the same windows client. What's happening ? Is there a solution to avoid this ? Are there other methods to get login ? Thanks, K. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] WinXP/x64 - MFC CFile objects leak parent directory handles
On Fri, Mar 07, 2008 at 05:02:00PM +0100, Dragan Krnic wrote: Volker, can you please look at it and see if you can suggest a fix? Looking at it. Volker pgpumoKJkKkzl.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba file access speed test
Does anyone know of any file access speed testing tools for use in testing samba shares? Have someone in my office who is looking to gather metrics and test performance. Thanks, Wayne -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] WinXP/x64 - MFC CFile objects leak parent directory handles
On Fri, Mar 07, 2008 at 05:02:00PM +0100, Dragan Krnic wrote: Volker, can you please look at it and see if you can suggest a fix? Can you try the attached patch? This fixes it for me. Volker diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 0d9dac3..59d29e7 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -2330,6 +2330,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n, (unsigned int)st.st_dev, (unsi SIVAL(pdata,0,FILE_CASE_PRESERVED_NAMES|FILE_CASE_SENSITIVE_SEARCH| (lp_nt_acl_support(SNUM(conn)) ? FILE_PERSISTENT_ACLS : 0)| + FILE_UNICODE_ON_DISK| quota_flag); /* FS ATTRIBUTES */ SIVAL(pdata,4,255); /* Max filename component length */ pgptyvz75RA03.pgp Description: 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] root preexec problem
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I'm reposting this as no one has responded. Is there something in here in particular that would have caused a problem? I guess I use multiple commands, but there is no use of % variables inside my one script that formats the date. Jeremy Allison wrote: On Mon, Feb 11, 2008 at 11:04:25AM -0800, Robert wrote: Is this perhaps related to the folowing bug: https://bugzilla.samba.org/show_bug.cgi?id=4812 Yes, this is certainly it. We're not going to fix this though - the security change was painful enough that I don't feel safe in allowing arbitrary characters in smb.conf scripts - remember the % substitution can allow client input here. The best solution is to rewite prexecs to use a single script. I'm not sure if I got nailed by this one, but I'm doing this: root preexec=/bin/sh -c 'echo C: \%u,\%m,%I::`/etc/opt/samba/scripts/getdate`' /var/opt/samba/accounting root postexec=/bin/sh -c 'echo X: \%u,\%m,\%I::`/etc/opt/samba/scripts/getdate`' /var/opt/samba/accounting ...and it seems to have stopped working when I upgraded from 3.0.11 to 3.0.22-ish. I suspect that nesting that script like that might be the problem. It's not clear to me what actually changed -- anyone have a link about this? I haven't been able to find it in the release notes. - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH0bcumb+gadEcsb4RAsF/AKChsZpi4+XD62rdsoye/d/G3big0QCgqoS0 sA9/eOGp1pbHMx388l8NcEw= =pNro -END PGP SIGNATURE- -- 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] root preexec problem
On Fri, Mar 07, 2008 at 04:44:15PM -0500, Ryan Novosielski wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I'm reposting this as no one has responded. Is there something in here in particular that would have caused a problem? I guess I use multiple commands, but there is no use of % variables inside my one script that formats the date. Jeremy Allison wrote: On Mon, Feb 11, 2008 at 11:04:25AM -0800, Robert wrote: Is this perhaps related to the folowing bug: https://bugzilla.samba.org/show_bug.cgi?id=4812 Yes, this is certainly it. We're not going to fix this though - the security change was painful enough that I don't feel safe in allowing arbitrary characters in smb.conf scripts - remember the % substitution can allow client input here. The best solution is to rewite prexecs to use a single script. I'm not sure if I got nailed by this one, but I'm doing this: root preexec=/bin/sh -c 'echo C: \%u,\%m,%I::`/etc/opt/samba/scripts/getdate`' /var/opt/samba/accounting The multiple commands are no longer supported. Rewrite this to call a single script command with parameters. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] root preexec problem
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jeremy Allison wrote: On Fri, Mar 07, 2008 at 04:44:15PM -0500, Ryan Novosielski wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I'm reposting this as no one has responded. Is there something in here in particular that would have caused a problem? I guess I use multiple commands, but there is no use of % variables inside my one script that formats the date. Jeremy Allison wrote: On Mon, Feb 11, 2008 at 11:04:25AM -0800, Robert wrote: Is this perhaps related to the folowing bug: https://bugzilla.samba.org/show_bug.cgi?id=4812 Yes, this is certainly it. We're not going to fix this though - the security change was painful enough that I don't feel safe in allowing arbitrary characters in smb.conf scripts - remember the % substitution can allow client input here. The best solution is to rewite prexecs to use a single script. I'm not sure if I got nailed by this one, but I'm doing this: root preexec=/bin/sh -c 'echo C: \%u,\%m,%I::`/etc/opt/samba/scripts/getdate`' /var/opt/samba/accounting The multiple commands are no longer supported. Rewrite this to call a single script command with parameters. Something akin to accounting start %u %m %I I'm assuming. It would be nice if this complained at all or warned you in testparm -- I didn't notice the problem until suddenly the file it was creating was no longer up to date. - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH0boLmb+gadEcsb4RAgCcAJ9PBYLoe0914N7KbpsqSv30FGSd/gCg1uaW UHTeyZXAK+l2Fz97CEIcNuM= =4Bh1 -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] root preexec problem
On Friday 07 March 2008, Ryan Novosielski wrote: It would be nice if this complained at all or warned you in testparm I've often wished that the appropriately named testparm was better at testing the values, and not just the parameters. -- Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba to Kerberos via OpenLDAP
First, I'll just say this is a question principally about the arcane
mysteries of Samba to OpenLDAP authentication.
I've had Samba to OpenLDAP authentication running for a while now using
the samba.schema and the ldapsam module. Now I'd like to understand a
bit more about how that works in order to take it a step further and get
openLDAP to bind against a Kerberos database via SASL.
An aside; Yes, I'd heard that Samba can be configured to authenticate
against Kerberos directly, but for my own reasons, I'd prefer that Samba
talk only to OpenLDAP, and OpenLDAP can do the authentication. I'll
fall back on the Samba to Kerberos direct route if I can't find a way to
do what I want.
I've noted that the Samba schema and smbldap-tools add to the user
record two Samba specific password fields, sambaNTPassword and
sambaLMPassword.
If I have the ldapsam module specified as the passdb backend in
smb.conf, is OpenLDAP merely storing the samba passwords while Samba
does the password comparisons? Or does OpenLDAP do the authentication
and return a yes or no?
Is it possible to have Samba defer authentication to OpenLDAP? If so, I
can have OpenLDAP use the {SASL} method to do authentication via kerberos.
Wes
--
Wes Modes
Server Administrator Programmer Analyst
McHenry Library
Computing Network Services
Information and Technology Services
459-5208
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba to Kerberos via OpenLDAP
First, I'll just say this is a question principally about the arcane
mysteries of Samba to OpenLDAP authentication.
I've had Samba to OpenLDAP authentication running for a while now using
the samba.schema and the ldapsam module. Now I'd like to understand a
bit more about how that works in order to take it a step further and get
openLDAP to bind against a Kerberos database via SASL.
An aside; Yes, I'd heard that Samba can be configured to authenticate
against Kerberos directly, but for my own reasons, I'd prefer that Samba
talk only to OpenLDAP, and OpenLDAP can do the authentication. I'll
fall back on the Samba to Kerberos direct route if I can't find a way to
do what I want.
I've noted that the Samba schema and smbldap-tools add to the user
record two Samba specific password fields, sambaNTPassword and
sambaLMPassword.
If I have the ldapsam module specified as the passdb backend in
smb.conf, is OpenLDAP merely storing the samba passwords while Samba
does the password comparisons? Or does OpenLDAP do the authentication
and return a yes or no?
Is it possible to have Samba defer authentication to OpenLDAP? If so, I
can have OpenLDAP use the {SASL} method to do authentication via kerberos.
Wes
--
Wes Modes
Server Administrator Programmer Analyst
McHenry Library
Computing Network Services
Information and Technology Services
459-5208
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba to Kerberos via OpenLDAP
On Fri, 2008-03-07 at 15:27 -0800, Wes Modes wrote: Is it possible to have Samba defer authentication to OpenLDAP? No. -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Failed to Set UID Error and Can't become connected user Error
I am certainly not an expert on Samba, so I apologize in advance for this question if I should know the answer. A week ago our main file server crashed and had to be replaced. Our new server is running Fedora Core 8 and Samba 3.0.26a-6 but has been very unstable. We are running a small network of Windows XP Pro and Home clients accessing the server (10 clients). ERROR ONE: I am getting two errors in the logs, one fairly serious and one not creating many problems as far as usability. I don't know if these errors are related but I suspect they are. First the more serious error. This is occurring only occasionally on different clients at different times, and the client that is causing this error will loose connection for a minute and has to restart some of the programs they are in. Here is the log of this more serious error: [2008/03/07 10:32:10, 0] lib/util_sec.c:set_effective_uid(205) setresuid failed with EAGAIN. uid(502) might be over its NPROC limit [2008/03/07 10:32:10, 0] lib/util_sec.c:assert_uid(101) Failed to set uid privileges to (-1,502) now set to (0,0) [2008/03/07 10:32:10, 0] lib/util.c:smb_panic(1654) PANIC (pid 32012): failed to set uid [2008/03/07 10:32:10, 0] lib/util.c:log_stack_trace(1758) BACKTRACE: 22 stack frames: #0 /usr/sbin/smbd(log_stack_trace+0x2d) [0xb7d7d79d] #1 /usr/sbin/smbd(smb_panic+0x5d) [0xb7d7d8cd] #2 /usr/sbin/smbd [0xb7d83d9e] #3 /usr/sbin/smbd [0xb7beed2c] #4 /usr/sbin/smbd(pop_sec_ctx+0xa2) [0xb7beeec2] #5 /usr/sbin/smbd(unbecome_root+0x17) [0xb7be2587] #6 /usr/sbin/smbd(gid_to_sid+0x15c) [0xb7d339bc] #7 /usr/sbin/smbd [0xb7bf58fc] #8 /usr/sbin/smbd(get_nt_acl+0x4ac) [0xb7bfc0cc] #9 /usr/sbin/smbd [0xb7c123bb] #10 /usr/sbin/smbd(is_visible_file+0x2a0) [0xb7b9a030] #11 /usr/sbin/smbd [0xb7b9a75d] #12 /usr/sbin/smbd(dptr_ReadDirName+0x51) [0xb7b9a7c1] #13 /usr/sbin/smbd [0xb7bd3a71] #14 /usr/sbin/smbd [0xb7bd7e45] #15 /usr/sbin/smbd(handle_trans2+0x237) [0xb7bdba57] #16 /usr/sbin/smbd(reply_trans2+0x6bb) [0xb7be220b] #17 /usr/sbin/smbd [0xb7bfef20] #18 /usr/sbin/smbd(smbd_process+0x836) [0xb7bfffb6] #19 /usr/sbin/smbd(main+0xbdd) [0xb7e5a90d] #20 /lib/libc.so.6(__libc_start_main+0xe0) [0x389390] #21 /usr/sbin/smbd [0xb7b83261] [2008/03/07 10:32:10, 0] lib/fault.c:dump_core(181) dumping core in /var/log/samba/cores/smbd [2008/03/07 10:32:10, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 10:32:12, 1] smbd/service.c:make_connection_snum(1033) drn (10.200.0.8) connect to service osnopen initially as user smbuser (uid=508, gid=508) (pid 834) [2008/03/07 10:32:27, 1] smbd/service.c:make_connection_snum(1033) drn (10.200.0.8) connect to service OSN initially as user drn (uid=502, gid=508) (pid 834) [2008/03/07 10:32:27, 0] lib/util_sec.c:set_effective_uid(205) setresuid failed with EAGAIN. uid(502) might be over its NPROC limit [2008/03/07 10:32:27, 0] lib/util_sec.c:assert_uid(101) Failed to set uid privileges to (-1,502) now set to (0,0) [2008/03/07 10:32:27, 0] lib/util.c:smb_panic(1654) PANIC (pid 834): failed to set uid [2008/03/07 10:32:27, 0] lib/util.c:log_stack_trace(1758) BACKTRACE: 22 stack frames: #0 /usr/sbin/smbd(log_stack_trace+0x2d) [0xb7d7d79d] #1 /usr/sbin/smbd(smb_panic+0x5d) [0xb7d7d8cd] #2 /usr/sbin/smbd [0xb7d83d9e] #3 /usr/sbin/smbd [0xb7beed2c] #4 /usr/sbin/smbd(pop_sec_ctx+0xa2) [0xb7beeec2] #5 /usr/sbin/smbd(unbecome_root+0x17) [0xb7be2587] #6 /usr/sbin/smbd(gid_to_sid+0x15c) [0xb7d339bc] #7 /usr/sbin/smbd [0xb7bf58fc] #8 /usr/sbin/smbd(get_nt_acl+0x4ac) [0xb7bfc0cc] #9 /usr/sbin/smbd [0xb7c123bb] #10 /usr/sbin/smbd(is_visible_file+0x2a0) [0xb7b9a030] #11 /usr/sbin/smbd [0xb7b9a75d] #12 /usr/sbin/smbd(dptr_ReadDirName+0x51) [0xb7b9a7c1] #13 /usr/sbin/smbd [0xb7bd3a71] #14 /usr/sbin/smbd [0xb7bd7e45] #15 /usr/sbin/smbd(handle_trans2+0x237) [0xb7bdba57] #16 /usr/sbin/smbd(reply_trans2+0x6bb) [0xb7be220b] #17 /usr/sbin/smbd [0xb7bfef20] #18 /usr/sbin/smbd(smbd_process+0x836) [0xb7bfffb6] #19 /usr/sbin/smbd(main+0xbdd) [0xb7e5a90d] #20 /lib/libc.so.6(__libc_start_main+0xe0) [0x389390] #21 /usr/sbin/smbd [0xb7b83261] [2008/03/07 10:32:27, 0] lib/fault.c:dump_core(181) dumping core in /var/log/samba/cores/smbd ERROR TWO: The second error repeats almost constantly but doesn't seem to create any actual problems on the client side. This is the error: [2008/03/07 09:54:17, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 09:54:27, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 09:54:27, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 09:55:33, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 09:55:33, 0] smbd/service.c:make_connection_snum(928) Can't become connected user! [2008/03/07 10:00:20, 0] smbd/service.c:make_connection_snum(928)
Re: [Samba] Samba file access speed test
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Wayne Rasmussen wrote: Does anyone know of any file access speed testing tools for use in testing samba shares? Have someone in my office who is looking to gather metrics and test performance. Well, there are some torture tests in the source packages. They might be of interest. - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH0irimb+gadEcsb4RAoliAKC95wAFz/OTQybbrTKZ6bVYoNtJvwCZAWgU VMx7S2r7lH+Ks4lt/crcVfA= =2yy8 -END PGP SIGNATURE- -- 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 v4-0-test updated - release-4-0-0alpha2-1230-gd331bc4
The branch, v4-0-test has been updated via d331bc400fb138bc43be88d0ca8ab3bcd590d2cd (commit) from 0923de12282b0e063dd73bc3e056dd5c3663c190 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit d331bc400fb138bc43be88d0ca8ab3bcd590d2cd Author: Andrew Bartlett [EMAIL PROTECTED] Date: Fri Mar 7 19:20:39 2008 +1100 Try to fix up part of the upgrade test. There are still problems with the upgrade test, but these are not related to the provision system. Andrew Bartlett --- Summary of changes: source/scripting/python/samba/provision.py | 13 - source/scripting/python/samba/upgrade.py | 20 +--- source/setup/upgrade.py| 12 ++-- 3 files changed, 23 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py index 25c1a99..ebca1f8 100644 --- a/source/scripting/python/samba/provision.py +++ b/source/scripting/python/samba/provision.py @@ -68,6 +68,12 @@ class ProvisionPaths: self.winsdb = None self.private_dir = None +class ProvisionResult: +def __init__(self): +self.paths = None +self.domaindn = None +self.lp = None +self.samdb = None def check_install(lp, session_info, credentials): Check whether the current install seems ok. @@ -991,7 +997,12 @@ def provision(setup_dir, message, session_info, message(Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php % paths.phpldapadminconfig) -return domaindn +result = ProvisionResult() +result.domaindn = domaindn +result.paths = paths +result.lp = lp +result.samdb = samdb +return result def provision_become_dc(setup_dir=None, smbconf=None, targetdir=None, realm=None, diff --git a/source/scripting/python/samba/upgrade.py b/source/scripting/python/samba/upgrade.py index c508684..f40f2cf 100644 --- a/source/scripting/python/samba/upgrade.py +++ b/source/scripting/python/samba/upgrade.py @@ -207,7 +207,7 @@ def import_wins(samba4_winsdb, samba3_winsdb): objectClass: winsMaxVersion, maxVersion: str(version_id)}) -def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, paths): +def upgrade_provision(samba3, setup_dir, message, credentials, session_info, smbconf, targetdir): oldconf = samba3.get_conf() if oldconf.get(domain logons) == True: @@ -244,15 +244,13 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, else: machinepass = None -domaindn = provision(setup_dir=setup_dir, message=message, - samdb_fill=FILL_DRS, paths=paths, session_info=session_info, - credentials=credentials, realm=realm, - domain=domainname, domainsid=domainsid, domainguid=domainguid, - machinepass=machinepass, serverrole=serverrole) +result = provision(setup_dir=setup_dir, message=message, + samdb_fill=FILL_DRS, smbconf=smbconf, session_info=session_info, + credentials=credentials, realm=realm, + domain=domainname, domainsid=domainsid, domainguid=domainguid, + machinepass=machinepass, serverrole=serverrole, targetdir=targetdir) -samdb = SamDB(paths.samdb, credentials=credentials, lp=lp, session_info=session_info) - -import_wins(Ldb(paths.winsdb), samba3.get_wins_db()) +import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db()) # FIXME: import_registry(registry.Registry(), samba3.get_registry()) @@ -268,12 +266,12 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, passdb = samba3.get_sam_db() for name in passdb: user = passdb[name] -#FIXME: import_sam_account(samdb, user, domaindn, domainsid) +#FIXME: import_sam_account(result.samdb, user, domaindn, domainsid) if hasattr(passdb, 'ldap_url'): message(Enabling Samba3 LDAP mappings for SAM database) -enable_samba3sam(samdb, passdb.ldap_url) +enable_samba3sam(result.samdb, passdb.ldap_url) def enable_samba3sam(samdb, ldapurl): diff --git a/source/setup/upgrade.py b/source/setup/upgrade.py index 960cd1b..569b179 100755 --- a/source/setup/upgrade.py +++ b/source/setup/upgrade.py @@ -50,7 +50,6 @@ else: samba3 = Samba3(libdir, smbconf) from samba.upgrade import upgrade_provision -from samba.provision import provision_paths_from_lp message(Provisioning\n) @@ -59,13 +58,6 @@ if setup_dir is None: setup_dir = setup creds =
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-32-g1acab45
The branch, v3-2-stable has been updated via 1acab453875c2189b685d766e404159b741ebca8 (commit) via fdfd080622a62487936550927b085379951d24f2 (commit) via a5adb0ee7d73fe7b6c8f0171d96bbf324549a862 (commit) via b50f23b37e1e85bdf56c86e1c2657ca6be90656f (commit) via 353824ae95cf3c0ef243ba91e03c45f44375351b (commit) via a2d2531e1d088ee2510e7faed308286b4ff67938 (commit) via afdece916bb221f5a8327e8c61fa75d63e76e228 (commit) via 2441cc6f7ed090964109d36409030e4b9014fc28 (commit) via 8ba288c06f7503c3c9e6320c2e51e41e800cb593 (commit) via c60e0eccfe65a138fb556a9b3a7aacc900d81776 (commit) via 584d904c4b149baf6857892c53d84e28a7a685ea (commit) via c24fb2e196f294602617a370f359ab8e492a2ba2 (commit) via 714f022c157bc4cb7b2a58c4fd775b3c65d5cbc1 (commit) via 3f287a1d9bdb0c71e1e55abe92649b54a8ec49eb (commit) via 7969360129a28b6ccc6bf9553679fc39736cc6a7 (commit) via 2bc47b688af4f9d36e0fa0f86ea3ff497c063325 (commit) via baeaa9c0eec8d2c8207c26cfb86cc896eae62aca (commit) via e14e440a74625b03585f5e80391175211fac62c9 (commit) from 25a63d044e82ae3cbd9b8e350fcf4cf548236caa (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 1acab453875c2189b685d766e404159b741ebca8 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 16:43:05 2008 +0100 Re-run make idl. Guenther (cherry picked from commit c0bc09854f0cea03bc0cc6845244ff12ca7229b6) commit fdfd080622a62487936550927b085379951d24f2 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 16:41:24 2008 +0100 Ignore Kerberos PAC type 12. Until we worked out the PAC_TYPE_UNKNOWN_12 format (or received documentation) ignore it so that the PAC parsing can proceed. Guenther (cherry picked from commit 3630ec26c99fdea46c47117d026f9bffb2c4590a) commit a5adb0ee7d73fe7b6c8f0171d96bbf324549a862 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 14:47:21 2008 +0100 Re-run make idl. Guenther (cherry picked from commit 9ccda75b376b559f81ed11e729bc11a1c83f6861) commit b50f23b37e1e85bdf56c86e1c2657ca6be90656f Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 14:15:07 2008 +0100 Slowly making progress on PAC_UNKNOWN_12. unknown1 and unknown2 are offset headers for the strings. Guenther (cherry picked from commit 7af70e75b9abf92921f33ec4207ad486ee2493d6) commit 353824ae95cf3c0ef243ba91e03c45f44375351b Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 19:47:28 2008 +0100 Fix the build of cifs.spnego. Guenther (cherry picked from commit 9eaaf17d30388ef9446fb18e69197baa699b7eac) commit a2d2531e1d088ee2510e7faed308286b4ff67938 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Mar 6 20:44:28 2008 +0100 Fix _dssetup_DsRoleGetPrimaryDomainInformation(). Guenther (cherry picked from commit 5eb7b7a9db4bda40660df5ab67bfea99e75716f9) commit afdece916bb221f5a8327e8c61fa75d63e76e228 Author: Derrell Lipman [EMAIL PROTECTED] Date: Thu Mar 6 09:00:37 2008 -0500 Check for NULL pointers before dereferencing them. (cherry picked from commit 6f65390cec218a6aac4370ee381f30439617dcec) commit 2441cc6f7ed090964109d36409030e4b9014fc28 Author: Volker Lendecke [EMAIL PROTECTED] Date: Sat Mar 1 12:11:22 2008 +0100 Change default bufsize to 512k I did not do any scientific tests, but the dummy test on my laptop against a w2k3 vmware shows that in this specific situation going beyond 512k seems not to gain anything anymore. smb: \ iosize 64512 iosize is now 64512 smb: \ lcd /dev smb: \ get random null getting file \random of size 104857600 as null (33453,1 kb/s) (average 19718,5 kb/s) smb: \ get random null getting file \random of size 104857600 as null (34236,0 kb/s) (average 20509,1 kb/s) smb: \ iosize 524288 iosize is now 524288 smb: \ get random null getting file \random of size 104857600 as null (49042,1 kb/s) (average 22521,9 kb/s) smb: \ get random null getting file \random of size 104857600 as null (49420,8 kb/s) (average 23432,9 kb/s) smb: \ iosize 1048576 iosize is now 1048576 smb: \ get random null getting file \random of size 104857600 as null (49420,8 kb/s) (average 24284,2 kb/s) smb: \ get random null getting file \random of size 104857600 as null (49136,3 kb/s) (average 25076,9 kb/s) (cherry picked from commit 1bcfef6a9093aa873550a263dc142c8a3f5edffd) commit 8ba288c06f7503c3c9e6320c2e51e41e800cb593 Author: Volker Lendecke [EMAIL PROTECTED] Date: Sat Mar 1 12:05:09 2008 +0100 Use io_bufsize as window size in smbclient get command (cherry picked from commit e602f06cbba852a7eacd15b2511ef2571a95cc80) commit c60e0eccfe65a138fb556a9b3a7aacc900d81776 Author:
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1231-gd66b6c3
The branch, v4-0-test has been updated
via d66b6c3823f003875e3b7cdf63617a894cceadf9 (commit)
from d331bc400fb138bc43be88d0ca8ab3bcd590d2cd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit d66b6c3823f003875e3b7cdf63617a894cceadf9
Author: Amin Azez [EMAIL PROTECTED]
Date: Fri Mar 7 10:55:49 2008 +
Use 32 bit storage for nttrans counts
Erroneous 16bit storage for nttrans counts meant that nttrans behaved
strangely for sizes of over 64K
As 32 bit is used in the SMB message and specified in
http://us4.samba.org/samba/ftp/specs/draft-leach-cifs-v1-spec-02.txt
section 3.13.2
this fix changes storage to match.
Signed-off-by: Amin Azez [EMAIL PROTECTED]
---
Summary of changes:
source/smb_server/smb/nttrans.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smb_server/smb/nttrans.c b/source/smb_server/smb/nttrans.c
index f6edc40..a20c41b 100644
--- a/source/smb_server/smb/nttrans.c
+++ b/source/smb_server/smb/nttrans.c
@@ -460,7 +460,7 @@ static NTSTATUS nttrans_backend(struct smbsrv_request *req,
static void reply_nttrans_send(struct ntvfs_request *ntvfs)
{
struct smbsrv_request *req;
- uint16_t params_left, data_left;
+ uint32_t params_left, data_left;
uint8_t *params, *data;
struct smb_nttrans *trans;
struct nttrans_op *op;
@@ -502,7 +502,7 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
/* we need to divide up the reply into chunks that fit into
the negotiated buffer size */
do {
- uint16_t this_data, this_param, max_bytes;
+ uint32_t this_data, this_param, max_bytes;
uint_t align1 = 1, align2 = (params_left ? 2 : 0);
struct smbsrv_request *this_req;
@@ -573,9 +573,9 @@ void smbsrv_reply_nttrans(struct smbsrv_request *req)
{
struct nttrans_op *op;
struct smb_nttrans *trans;
- uint16_t param_ofs, data_ofs;
- uint16_t param_count, data_count;
- uint16_t param_total, data_total;
+ uint32_t param_ofs, data_ofs;
+ uint32_t param_count, data_count;
+ uint32_t param_total, data_total;
/* parse request */
if (req-in.wct 19) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-137-gcb3577e
The branch, v3-2-test has been updated
via cb3577e695f80d76e4c20f6396d57e3a2047c3c4 (commit)
via b0cb768287de861f1d1630c9a4c70d9af2a74147 (commit)
via e5ae43051e3bcdbad359737b19ec7f5e4b0ccd28 (commit)
via 5895b973a4e7067535aff6e0c9a7273e332dee1a (commit)
from 5440c752ff270cc674d46f2dfa2ceb47dac030f6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit cb3577e695f80d76e4c20f6396d57e3a2047c3c4
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 02:59:58 2008 +0100
Add some more init_srvsvc_NetShareInfoX functions.
Guenther
commit b0cb768287de861f1d1630c9a4c70d9af2a74147
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 02:59:01 2008 +0100
Re-run make idl.
Guenther
commit e5ae43051e3bcdbad359737b19ec7f5e4b0ccd28
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 02:57:29 2008 +0100
Fix IDL for srvsvc_NetShareEnum and srvsvc_NetShareEnumAll.
Guenther
commit 5895b973a4e7067535aff6e0c9a7273e332dee1a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Mar 6 23:23:08 2008 +0100
Fix debug statement (missing \n).
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_srvsvc.c | 18 +--
source/librpc/gen_ndr/cli_srvsvc.h |6 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 200 ++-
source/librpc/gen_ndr/ndr_srvsvc.h |1 +
source/librpc/gen_ndr/srv_srvsvc.c |6 +-
source/librpc/gen_ndr/srvsvc.h | 17 ++--
source/librpc/idl/srvsvc.idl | 11 ++-
source/rpc_client/init_srvsvc.c| 134
source/rpc_server/srv_svcctl_nt.c |2 +-
9 files changed, 242 insertions(+), 153 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_srvsvc.c
b/source/librpc/gen_ndr/cli_srvsvc.c
index 3624fb0..a9d3399 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.c
+++ b/source/librpc/gen_ndr/cli_srvsvc.c
@@ -812,8 +812,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client
*cli,
NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
- uint32_t *level,
- union srvsvc_NetShareCtr *ctr,
+ struct srvsvc_NetShareInfoCtr *info_ctr,
uint32_t max_buffer,
uint32_t *totalentries,
uint32_t *resume_handle,
@@ -824,8 +823,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct
rpc_pipe_client *cli,
/* In parameters */
r.in.server_unc = server_unc;
- r.in.level = level;
- r.in.ctr = ctr;
+ r.in.info_ctr = info_ctr;
r.in.max_buffer = max_buffer;
r.in.resume_handle = resume_handle;
@@ -853,8 +851,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct
rpc_pipe_client *cli,
}
/* Return variables */
- *level = *r.out.level;
- *ctr = *r.out.ctr;
+ *info_ctr = *r.out.info_ctr;
*totalentries = *r.out.totalentries;
if (resume_handle r.out.resume_handle) {
*resume_handle = *r.out.resume_handle;
@@ -1885,8 +1882,7 @@ NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
- uint32_t *level,
- union srvsvc_NetShareCtr *ctr,
+ struct srvsvc_NetShareInfoCtr *info_ctr,
uint32_t max_buffer,
uint32_t *totalentries,
uint32_t *resume_handle,
@@ -1897,8 +1893,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnum(struct
rpc_pipe_client *cli,
/* In parameters */
r.in.server_unc = server_unc;
- r.in.level = level;
- r.in.ctr = ctr;
+ r.in.info_ctr = info_ctr;
r.in.max_buffer = max_buffer;
r.in.resume_handle = resume_handle;
@@ -1926,8 +1921,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnum(struct
rpc_pipe_client *cli,
}
/* Return variables */
- *level = *r.out.level;
- *ctr = *r.out.ctr;
+ *info_ctr = *r.out.info_ctr;
*totalentries = *r.out.totalentries;
if (resume_handle r.out.resume_handle) {
*resume_handle = *r.out.resume_handle;
diff --git a/source/librpc/gen_ndr/cli_srvsvc.h
b/source/librpc/gen_ndr/cli_srvsvc.h
index 4f52600..b8bdac2 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.h
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1236-gd28f2cb
The branch, v4-0-test has been updated via d28f2cb678b334086f601505c88e56b9c1ee559d (commit) via 6a98e5a7aa0cdbb61358901df50162b5b914ee5c (commit) via 2b6b4e5a1611744eea5dd9ec17c416916d7edab4 (commit) via 7ce5575a3a40cca4a45ec179a153f7e909065a87 (commit) via be47cc7fdfa3cae0508e564f38b793aa27b6eb92 (commit) from d66b6c3823f003875e3b7cdf63617a894cceadf9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit d28f2cb678b334086f601505c88e56b9c1ee559d Author: Andrew Kroeger [EMAIL PROTECTED] Date: Fri Mar 7 05:56:04 2008 -0600 Treat maxPwdAge == 0 as passwords never expire. commit 6a98e5a7aa0cdbb61358901df50162b5b914ee5c Author: Andrew Kroeger [EMAIL PROTECTED] Date: Thu Mar 6 06:08:32 2008 -0600 Enhance mappings of NTSTATUS to KRB5KDC errors. The enhanced mappings allow the Windows client to determine whether a user's password needs to be changed (and allows them to change it), or if they cannot logon at all. Changes still need to be made to allow additional data to be returned. Windows uses that additional data to display more detailed dialogs to the user. The additional information is returned in an e-data struct of type PA-PW-SALT that contains the more-detailed NTSTATUS error code. commit 2b6b4e5a1611744eea5dd9ec17c416916d7edab4 Author: Andrew Kroeger [EMAIL PROTECTED] Date: Thu Mar 6 06:07:28 2008 -0600 Update account expiration to use new samdb_result_account_expires() function. commit 7ce5575a3a40cca4a45ec179a153f7e909065a87 Author: Andrew Kroeger [EMAIL PROTECTED] Date: Thu Mar 6 06:02:46 2008 -0600 Add samdb_result_account_expires() function. Windows uses 2 different values to indicate an account doesn't expire: 0 and 9223372036854775807 (0x7FFFULL). This function looks up the value of the accountExpires attribute and if the value is either value indicating the account doesn't expire, 0x7FFFULL is returned. This simplifies the tests for account expiration. There is no need to check elsewhere in the code for both values, therefore a simple greater-than expression can be used. commit be47cc7fdfa3cae0508e564f38b793aa27b6eb92 Author: Andrew Kroeger [EMAIL PROTECTED] Date: Thu Mar 6 05:56:49 2008 -0600 accountExpires: Windows default is 9223372036854775807, not -1. --- Summary of changes: source/auth/sam.c |4 +- source/dsdb/common/util.c | 26 +++- source/kdc/hdb-ldb.c |5 +-- source/kdc/pac-glue.c | 21 +++- .../ldb/tests/schema-tests/schema-add-test.ldif|2 +- source/setup/provision_templates.ldif |4 +- source/setup/provision_users.ldif |2 +- 7 files changed, 53 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/source/auth/sam.c b/source/auth/sam.c index 9a8045f..8821963 100644 --- a/source/auth/sam.c +++ b/source/auth/sam.c @@ -157,7 +157,7 @@ _PUBLIC_ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx, acct_flags = samdb_result_acct_flags(sam_ctx, mem_ctx, msg, domain_dn); - acct_expiry = samdb_result_nttime(msg, accountExpires, 0); + acct_expiry = samdb_result_account_expires(msg, 0); /* Check for when we must change this password, taking the * userAccountControl flags into account */ @@ -351,7 +351,7 @@ _PUBLIC_ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_conte server_info-last_logon = samdb_result_nttime(msg, lastLogon, 0); server_info-last_logoff = samdb_result_nttime(msg, lastLogoff, 0); - server_info-acct_expiry = samdb_result_nttime(msg, accountExpires, 0); + server_info-acct_expiry = samdb_result_account_expires(msg, 0); server_info-last_password_change = samdb_result_nttime(msg, pwdLastSet, 0); ncname = samdb_result_dn(sam_ctx, mem_ctx, msg_domain_ref, nCName, NULL); diff --git a/source/dsdb/common/util.c b/source/dsdb/common/util.c index ace5e0e..88c8afd 100644 --- a/source/dsdb/common/util.c +++ b/source/dsdb/common/util.c @@ -434,6 +434,30 @@ NTTIME samdb_result_nttime(struct ldb_message *msg, const char *attr, NTTIME def } /* + * Windows uses both 0 and 9223372036854775807 (0x7FFFULL) to + * indicate an account doesn't expire. + * + * When Windows initially creates an account, it sets + * accountExpires = 9223372036854775807 (0x7FFF). However, + * when changing from an account having a specific expiration date to + * that account never expiring, it sets accountExpires = 0. + * + * Consolidate that logic here to allow clearer logic for account
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-138-g4e584c6
The branch, v3-2-test has been updated via 4e584c6e3699d8c05b163cc5674af04d106692ba (commit) from cb3577e695f80d76e4c20f6396d57e3a2047c3c4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 4e584c6e3699d8c05b163cc5674af04d106692ba Author: Michael Adam [EMAIL PROTECTED] Date: Fri Mar 7 14:24:53 2008 +0100 Time to confess... Michael --- Summary of changes: source/Makefile.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 8ae62fa..ac33a11 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -7,6 +7,7 @@ # Copyright (C) 2002-2003 Jelmer Vernooij [EMAIL PROTECTED] # Copyright (C) 2006 Lars Mueller [EMAIL PROTECTED] # Copyright (C) 2007 James Peach [EMAIL PROTECTED] +# Copyright (C) 2008 Michael Adam [EMAIL PROTECTED] ### [EMAIL PROTECTED]@ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1238-gd92597d
The branch, v4-0-test has been updated via d92597d29caf76e1c8d0858f066d7a30143392e9 (commit) via 3a9514def21c448d344648d4a28f658fbcfc07eb (commit) from d28f2cb678b334086f601505c88e56b9c1ee559d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit d92597d29caf76e1c8d0858f066d7a30143392e9 Author: Michael Adam [EMAIL PROTECTED] Date: Fri Mar 7 15:00:37 2008 +0100 torture: fix escape sequence in test_chkpath(). Michael commit 3a9514def21c448d344648d4a28f658fbcfc07eb Author: Michael Adam [EMAIL PROTECTED] Date: Fri Mar 7 14:59:19 2008 +0100 configure: Add major version 4 to AC_INIT call. Michael --- Summary of changes: source/configure.ac |2 +- source/torture/raw/chkpath.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.ac b/source/configure.ac index 5ba4413..41f1bcf 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example dnl AC_PREREQ(2.53) -AC_INIT([samba],[],[EMAIL PROTECTED]) +AC_INIT([samba],[4],[EMAIL PROTECTED]) AC_CONFIG_SRCDIR([include/includes.h]) AC_CONFIG_HEADER(include/config_tmp.h) diff --git a/source/torture/raw/chkpath.c b/source/torture/raw/chkpath.c index fa69c92..7fd74e3 100644 --- a/source/torture/raw/chkpath.c +++ b/source/torture/raw/chkpath.c @@ -150,7 +150,7 @@ static bool test_chkpath(struct smbcli_state *cli, struct torture_context *tctx) ret = test_path_ex(cli, tctx, ((char *)BASEDIR) + 1, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); ret = test_path_ex(cli, tctx, ((char *)BASEDIR\\foo\\..) + 1, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); ret = test_path_ex(cli, tctx, ((char *)BASEDIR\\f\\o\\o\\..\\..\\..) + 1, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); - ret = test_path_ex(cli, tctx, ((char *)BASEDIR\\foo\..) + 1, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); + ret = test_path_ex(cli, tctx, ((char *)BASEDIR\\foo..) + 1, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); ret = test_path_ex(cli, tctx, BASEDIR\\, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); ret = test_path_ex(cli, tctx, BASEDIR..\\BASEDIR, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); ret = test_path_ex(cli, tctx, BASEDIR\\, BASEDIR, NT_STATUS_OK, NT_STATUS_OK); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-139-gc20c5f0
The branch, v3-2-test has been updated
via c20c5f082162ff6c0c2931f456897334aa002e83 (commit)
from 4e584c6e3699d8c05b163cc5674af04d106692ba (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c20c5f082162ff6c0c2931f456897334aa002e83
Author: Simo Sorce [EMAIL PROTECTED]
Date: Fri Mar 7 11:33:26 2008 -0500
Enable use of Relocations Read-Only, if supported, for enhanced security.
---
Summary of changes:
source/Makefile.in |4 ++--
source/configure.in | 27 +++
2 files changed, 29 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index ac33a11..376d24c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -43,8 +43,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @LDFLAGS@
[EMAIL PROTECTED]@ @LDFLAGS@
[EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@
[EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@
[EMAIL PROTECTED]@ @LDFLAGS@
[EMAIL PROTECTED]@
diff --git a/source/configure.in b/source/configure.in
index 056c0f8..f884d93 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -73,6 +73,7 @@ AC_SUBST(HOST_OS)
AC_SUBST(PICFLAG)
AC_SUBST(PIE_CFLAGS)
AC_SUBST(PIE_LDFLAGS)
+AC_SUBST(RELRO_LDFLAGS)
AC_SUBST(SHLIBEXT)
AC_SUBST(INSTALLLIBCMD_SH)
AC_SUBST(INSTALLLIBCMD_A)
@@ -1513,6 +1514,32 @@ EOF
fi
fi
+# Set defaults
+RELRO_LDFLAGS=
+AC_ARG_ENABLE(relro, [AS_HELP_STRING([--enable-relro], [Turn on Relocations
Read-Only (relro) support if available (default=yes)])])
+
+if test x$enable_relro != xno
+then
+ AC_CACHE_CHECK([for -Wl,-z,relro], samba_cv_relro,
+ [
+ cat conftest.c EOF
+int foo;
+main () { return 0;}
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-Wl,-z,relro -o conftest conftest.c 1AS_MESSAGE_LOG_FD])
+ then
+ samba_cv_relro=yes
+ else
+ samba_cv_relro=no
+ fi
+ rm -f conftest*
+ ])
+ if test x${samba_cv_relro} = xyes
+ then
+ RELRO_LDFLAGS=-Wl,-z,relro
+ fi
+fi
+
# Assume non-shared by default and override below
BLDSHARED=false
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-140-g966d724
The branch, v3-2-test has been updated
via 966d7244d7765d285a7026b97e6093fd1f8d83ce (commit)
from c20c5f082162ff6c0c2931f456897334aa002e83 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 966d7244d7765d285a7026b97e6093fd1f8d83ce
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 18:18:35 2008 +0100
Enable libnetjoin debugging for now but avoid printing passwords.
The gen_ndr needs proper fixing still.
Guenther
---
Summary of changes:
source/lib/netapi/joindomain.c |1 +
source/librpc/gen_ndr/ndr_libnet_join.c | 10 ++
source/utils/net_ads.c |4 ++--
3 files changed, 13 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 405f96a..9c0e8aa 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/lib/netapi/joindomain.c
@@ -81,6 +81,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx
*mem_ctx,
r-in.join_flags = join_flags;
r-in.modify_config = true;
+ r-in.debug = true;
werr = libnet_Join(mem_ctx, r);
if (!W_ERROR_IS_OK(werr) r-out.error_string) {
diff --git a/source/librpc/gen_ndr/ndr_libnet_join.c
b/source/librpc/gen_ndr/ndr_libnet_join.c
index ac8f7ee..753859f 100644
--- a/source/librpc/gen_ndr/ndr_libnet_join.c
+++ b/source/librpc/gen_ndr/ndr_libnet_join.c
@@ -23,8 +23,13 @@ _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print
*ndr, const char *name,
ndr-depth--;
ndr_print_string(ndr, account_ou, r-in.account_ou);
ndr_print_string(ndr, admin_account, r-in.admin_account);
+#ifdef DEBUG_PASSWORD
ndr_print_string(ndr, admin_password, r-in.admin_password);
ndr_print_string(ndr, machine_password,
r-in.machine_password);
+#else
+ ndr_print_ptr(ndr, admin_password, r-in.admin_password);
+ ndr_print_ptr(ndr, machine_password, r-in.machine_password);
+#endif
ndr_print_wkssvc_joinflags(ndr, join_flags, r-in.join_flags);
ndr_print_string(ndr, os_version, r-in.os_version);
ndr_print_string(ndr, os_name, r-in.os_name);
@@ -74,8 +79,13 @@ _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print
*ndr, const char *name
ndr_print_string(ndr, domain_name, r-in.domain_name);
ndr_print_string(ndr, account_ou, r-in.account_ou);
ndr_print_string(ndr, admin_account, r-in.admin_account);
+#ifdef DEBUG_PASSWORD
ndr_print_string(ndr, admin_password, r-in.admin_password);
ndr_print_string(ndr, machine_password,
r-in.machine_password);
+#else
+ ndr_print_ptr(ndr, admin_password, r-in.admin_password);
+ ndr_print_ptr(ndr, machine_password, r-in.machine_password);
+#endif
ndr_print_wkssvc_joinflags(ndr, unjoin_flags,
r-in.unjoin_flags);
ndr_print_uint8(ndr, modify_config, r-in.modify_config);
ndr_print_ptr(ndr, domain_sid, r-in.domain_sid);
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 46e0a25..e9750db 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -829,7 +829,7 @@ static int net_ads_leave(int argc, const char **argv)
return -1;
}
- r-in.debug = opt_verbose;
+ r-in.debug = true;
r-in.dc_name = opt_host;
r-in.domain_name = lp_realm();
r-in.admin_account = opt_user_name;
@@ -1178,7 +1178,7 @@ int net_ads_join(int argc, const char **argv)
r-in.dc_name = opt_host;
r-in.admin_account = opt_user_name;
r-in.admin_password= net_prompt_pass(opt_user_name);
- r-in.debug = opt_verbose;
+ r-in.debug = true;
r-in.join_flags= WKSSVC_JOIN_FLAGS_JOIN_TYPE |
WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE |
WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1239-ge384aac
The branch, v4-0-test has been updated
via e384aac5c8156c7f056c70b1caab0778f8fc52b6 (commit)
from d92597d29caf76e1c8d0858f066d7a30143392e9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit e384aac5c8156c7f056c70b1caab0778f8fc52b6
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Fri Mar 7 18:20:12 2008 +0100
Rerun SWIG.
---
Summary of changes:
source/lib/ldb/ldb_wrap.c | 31 ---
1 files changed, 16 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index 7886778..cf05048 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -2538,6 +2538,7 @@ typedef struct ldb_dn ldb_dn;
typedef struct ldb_ldif ldb_ldif;
typedef struct ldb_message_element ldb_msg_element;
typedef int ldb_error;
+typedef int ldb_int_error;
@@ -4409,7 +4410,7 @@ SWIGINTERN PyObject *_wrap_Ldb_connect(PyObject
*SWIGUNUSEDPARM(self), PyObject
ldb context must be non-NULL);
result = ldb_connect(arg1,(char const *)arg2,arg3,(char const *(*))arg4);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -4531,7 +4532,7 @@ SWIGINTERN PyObject *_wrap_Ldb_search_ex(PyObject
*SWIGUNUSEDPARM(self), PyObjec
ldb context must be non-NULL);
result = ldb_search_ex(arg1,arg2,arg3,arg4,(char const *)arg5,(char const
*const *)arg6,arg7,arg8);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -4580,7 +4581,7 @@ SWIGINTERN PyObject *_wrap_Ldb_delete(PyObject
*SWIGUNUSEDPARM(self), PyObject *
ldb context must be non-NULL);
result = ldb_delete(arg1,arg2);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -4624,7 +4625,7 @@ SWIGINTERN PyObject *_wrap_Ldb_rename(PyObject
*SWIGUNUSEDPARM(self), PyObject *
ldb context must be non-NULL);
result = ldb_rename(arg1,arg2,arg3);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -4750,7 +4751,7 @@ SWIGINTERN PyObject *_wrap_Ldb_add(PyObject
*SWIGUNUSEDPARM(self), PyObject *arg
Message can not be None);
result = ldb_add(arg1,arg2);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -4794,7 +4795,7 @@ SWIGINTERN PyObject *_wrap_Ldb_modify(PyObject
*SWIGUNUSEDPARM(self), PyObject *
Message can not be None);
result = ldb_modify(arg1,arg2);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -5082,7 +5083,7 @@ SWIGINTERN PyObject *_wrap_Ldb_set_debug(PyObject
*SWIGUNUSEDPARM(self), PyObjec
ldb context must be non-NULL);
result = ldb_set_debug(arg1,arg2,arg3);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -5131,7 +5132,7 @@ SWIGINTERN PyObject *_wrap_Ldb_set_opaque(PyObject
*SWIGUNUSEDPARM(self), PyObje
ldb context must be non-NULL);
result = ldb_set_opaque(arg1,(char const *)arg2,arg3);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
+PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_errstring(arg1)));
SWIG_fail;
}
resultobj = Py_None;
@@ -5203,7 +5204,7 @@ SWIGINTERN PyObject *_wrap_Ldb_transaction_start(PyObject
*SWIGUNUSEDPARM(self),
ldb context must be non-NULL);
result = ldb_transaction_start(arg1);
if (result != 0) {
-PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)(i,s), result,
ldb_strerror(result)));
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1244-g5fdca98
The branch, v4-0-test has been updated
via 5fdca988c687f58fe2fddd3c8eff5f461207065b (commit)
via db0853ae4fead34ef382bbfcfe2f46453ab8b73b (commit)
via b09a1461ac595be1b6530221b7df5211084884cc (commit)
via c993b07f7d5caf290ccb9ca81961aa35a3ed1f02 (commit)
via a63910e8e5c075aff45b8eb0d246d2823f09bb9c (commit)
from e384aac5c8156c7f056c70b1caab0778f8fc52b6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 5fdca988c687f58fe2fddd3c8eff5f461207065b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 7 18:28:48 2008 +0100
pvfs_open: fix the odb_open_file() callers
metze
commit db0853ae4fead34ef382bbfcfe2f46453ab8b73b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 7 18:23:34 2008 +0100
opendb: force odb_can_open() before odb_open_file()
Now there's only odb_can_open() which handles the
share_access rules.
And odb_open_file() only adds the new opendb_entry into the
database and calculates the granted oplock level.
metze
commit b09a1461ac595be1b6530221b7df5211084884cc
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 7 17:50:17 2008 +0100
pvfs_open: always call odb_can_open() before odb_open_file()
odb_open_file() will later change to not redo the logic of
odb_can_open().
metze
commit c993b07f7d5caf290ccb9ca81961aa35a3ed1f02
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 7 10:33:57 2008 +0100
opendb_tdb: pass down struct messaging_context directly to
odb_oplock_break_send()
metze
commit a63910e8e5c075aff45b8eb0d246d2823f09bb9c
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 7 19:12:14 2008 +0100
vfs_cifs: disable level2 oplocks if the frontend client doesn't support them
metze
---
Summary of changes:
source/cluster/ctdb/opendb_ctdb.c | 100 ++--
source/ntvfs/cifs/vfs_cifs.c |6 ++-
source/ntvfs/common/opendb.c | 14 ++--
source/ntvfs/common/opendb.h |3 -
source/ntvfs/common/opendb_tdb.c | 133
source/ntvfs/posix/pvfs_open.c| 67 ++-
6 files changed, 141 insertions(+), 182 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/cluster/ctdb/opendb_ctdb.c
b/source/cluster/ctdb/opendb_ctdb.c
index fe48f98..a7b8ddf 100644
--- a/source/cluster/ctdb/opendb_ctdb.c
+++ b/source/cluster/ctdb/opendb_ctdb.c
@@ -261,6 +261,7 @@ static NTSTATUS odb_push_record(struct odb_lock *lck,
struct opendb_file *file)
return NT_STATUS_OK;
}
+#if 0
/*
send an oplock break to a client
*/
@@ -271,6 +272,7 @@ static NTSTATUS odb_oplock_break_send(struct odb_context
*odb, struct opendb_ent
return messaging_send_ptr(odb-ntvfs_ctx-msg_ctx, e-server,
MSG_NTVFS_OPLOCK_BREAK, e-file_handle);
}
+#endif
/*
register an open file in the open files database. This implements the
share_access
@@ -281,104 +283,16 @@ static NTSTATUS odb_oplock_break_send(struct odb_context
*odb, struct opendb_ent
*/
static NTSTATUS odb_ctdb_open_file(struct odb_lock *lck,
void *file_handle, const char *path,
- uint32_t stream_id, uint32_t share_access,
- uint32_t access_mask, bool delete_on_close,
- uint32_t open_disposition, bool
break_to_none,
bool allow_level_II_oplock,
uint32_t oplock_level, uint32_t
*oplock_granted)
{
- struct odb_context *odb = lck-odb;
- struct opendb_entry e;
- int i;
- struct opendb_file file;
- NTSTATUS status;
-
- if (odb-oplocks == false) {
- oplock_level = OPLOCK_NONE;
- }
-
- status = odb_pull_record(lck, file);
- if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
- /* initialise a blank structure */
- ZERO_STRUCT(file);
- file.path = path;
- } else {
- NT_STATUS_NOT_OK_RETURN(status);
- }
-
- /* see if it conflicts */
- e.server = odb-ntvfs_ctx-server_id;
- e.file_handle = file_handle;
- e.stream_id = stream_id;
- e.share_access= share_access;
- e.access_mask = access_mask;
- e.delete_on_close = delete_on_close;
- e.oplock_level= OPLOCK_NONE;
-
- /* see if anyone has an oplock, which we need to break */
- for (i=0;ifile.num_entries;i++) {
- if (file.entries[i].oplock_level == OPLOCK_BATCH) {
- /* a batch oplock caches close calls, which
- means the
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-141-g128637b
The branch, v3-2-test has been updated
via 128637bdd7c37ca166a7d478b33b00c39f0ede62 (commit)
from 966d7244d7765d285a7026b97e6093fd1f8d83ce (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 128637bdd7c37ca166a7d478b33b00c39f0ede62
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 16:19:43 2008 +0100
Use pidl for _srvsvc_NetShareGetInfo, _srvsvc_NetShareEnum and
srvsvc_NetShareEnumAll.
Fixing resume handling while we are there.
Guenther
---
Summary of changes:
source/rpc_server/srv_srvsvc.c| 69 +
source/rpc_server/srv_srvsvc_nt.c | 599
2 files changed, 269 insertions(+), 399 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c
index 41fc39b..39548c5 100644
--- a/source/rpc_server/srv_srvsvc.c
+++ b/source/rpc_server/srv_srvsvc.c
@@ -180,28 +180,7 @@ static bool api_srv_net_sess_del(pipes_struct *p)
static bool api_srv_net_share_enum_all(pipes_struct *p)
{
- SRV_Q_NET_SHARE_ENUM q_u;
- SRV_R_NET_SHARE_ENUM r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server get enum. */
- if(!srv_io_q_net_share_enum(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_enum_all: Failed to unmarshall
SRV_Q_NET_SHARE_ENUM.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_enum_all(p, q_u, r_u);
-
- if (!srv_io_r_net_share_enum(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_enum_all: Failed to marshall
SRV_R_NET_SHARE_ENUM.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREENUMALL);
}
/***
@@ -210,28 +189,7 @@ static bool api_srv_net_share_enum_all(pipes_struct *p)
static bool api_srv_net_share_enum(pipes_struct *p)
{
- SRV_Q_NET_SHARE_ENUM q_u;
- SRV_R_NET_SHARE_ENUM r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server get enum. */
- if(!srv_io_q_net_share_enum(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_enum: Failed to unmarshall
SRV_Q_NET_SHARE_ENUM.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_enum(p, q_u, r_u);
-
- if (!srv_io_r_net_share_enum(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_enum: Failed to marshall
SRV_R_NET_SHARE_ENUM.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREENUM);
}
/***
@@ -240,28 +198,7 @@ static bool api_srv_net_share_enum(pipes_struct *p)
static bool api_srv_net_share_get_info(pipes_struct *p)
{
- SRV_Q_NET_SHARE_GET_INFO q_u;
- SRV_R_NET_SHARE_GET_INFO r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server get info. */
- if(!srv_io_q_net_share_get_info(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_get_info: Failed to unmarshall
SRV_Q_NET_SHARE_GET_INFO.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_get_info(p, q_u, r_u);
-
- if(!srv_io_r_net_share_get_info(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_get_info: Failed to marshall
SRV_R_NET_SHARE_GET_INFO.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREGETINFO);
}
/***
diff --git a/source/rpc_server/srv_srvsvc_nt.c
b/source/rpc_server/srv_srvsvc_nt.c
index 4efea33..3c5d1e4 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -242,19 +242,18 @@ static uint32 get_share_type(int snum)
Fill in a share info level 0 structure.
/
-static void init_srv_share_info_0(pipes_struct *p, SRV_SHARE_INFO_0 *sh0, int
snum)
+static void init_srv_share_info_0(pipes_struct *p, struct srvsvc_NetShareInfo0
*r, int snum)
{
const char *net_name = lp_servicename(snum);
- init_srv_share_info0(sh0-info_0, net_name);
- init_srv_share_info0_str(sh0-info_0_str, net_name);
+ init_srvsvc_NetShareInfo0(r, net_name);
}
/***
Fill in
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-142-gc940c62
The branch, v3-2-test has been updated
via c940c62029fbce5f2b943f0fb06037fc89bfd297 (commit)
from 128637bdd7c37ca166a7d478b33b00c39f0ede62 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c940c62029fbce5f2b943f0fb06037fc89bfd297
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 22:55:33 2008 +0100
Use pidl generated NetShareGet/SetInfo and Enum calls in rpcclient.
Guenther
---
Summary of changes:
source/rpcclient/cmd_srvsvc.c | 270 +
1 files changed, 191 insertions(+), 79 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 2e84f04..e480b71 100644
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -217,96 +217,161 @@ static WERROR cmd_srvsvc_srv_query_info(struct
rpc_pipe_client *cli,
return result;
}
-static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
+static void display_share_info_1(struct srvsvc_NetShareInfo1 *r)
{
- fstring netname = , remark = ;
-
- rpcstr_pull_unistr2_fstring(netname, info1-info_1_str.uni_netname);
- rpcstr_pull_unistr2_fstring(remark, info1-info_1_str.uni_remark);
-
- printf(netname: %s\n, netname);
- printf(\tremark:\t%s\n, remark);
+ printf(netname: %s\n, r-name);
+ printf(\tremark:\t%s\n, r-comment);
}
-static void display_share_info_2(SRV_SHARE_INFO_2 *info2)
+static void display_share_info_2(struct srvsvc_NetShareInfo2 *r)
{
- fstring netname = , remark = , path = , passwd = ;
-
- rpcstr_pull_unistr2_fstring(netname, info2-info_2_str.uni_netname);
- rpcstr_pull_unistr2_fstring(remark, info2-info_2_str.uni_remark);
- rpcstr_pull_unistr2_fstring(path, info2-info_2_str.uni_path);
- rpcstr_pull_unistr2_fstring(passwd, info2-info_2_str.uni_passwd);
-
- printf(netname: %s\n, netname);
- printf(\tremark:\t%s\n, remark);
- printf(\tpath:\t%s\n, path);
- printf(\tpassword:\t%s\n, passwd);
+ printf(netname: %s\n, r-name);
+ printf(\tremark:\t%s\n, r-comment);
+ printf(\tpath:\t%s\n, r-path);
+ printf(\tpassword:\t%s\n, r-password);
}
-static void display_share_info_502(SRV_SHARE_INFO_502 *info502)
+static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
{
- fstring netname = , remark = , path = , passwd = ;
-
- rpcstr_pull_unistr2_fstring(netname,
info502-info_502_str.uni_netname);
- rpcstr_pull_unistr2_fstring(remark, info502-info_502_str.uni_remark);
- rpcstr_pull_unistr2_fstring(path, info502-info_502_str.uni_path);
- rpcstr_pull_unistr2_fstring(passwd, info502-info_502_str.uni_passwd);
-
- printf(netname: %s\n, netname);
- printf(\tremark:\t%s\n, remark);
- printf(\tpath:\t%s\n, path);
- printf(\tpassword:\t%s\n, passwd);
-
- printf(\ttype:\t0x%x\n, info502-info_502.type);
- printf(\tperms:\t%d\n, info502-info_502.perms);
- printf(\tmax_uses:\t%d\n, info502-info_502.max_uses);
- printf(\tnum_uses:\t%d\n, info502-info_502.num_uses);
-
- if (info502-info_502_str.sd)
- display_sec_desc(info502-info_502_str.sd);
+ printf(netname: %s\n, r-name);
+ printf(\tremark:\t%s\n, r-comment);
+ printf(\tpath:\t%s\n, r-path);
+ printf(\tpassword:\t%s\n, r-password);
+
+ printf(\ttype:\t0x%x\n, r-type);
+ printf(\tperms:\t%d\n, r-permissions);
+ printf(\tmax_uses:\t%d\n, r-max_users);
+ printf(\tnum_uses:\t%d\n, r-current_users);
+
+ if (r-sd)
+ display_sec_desc(r-sd);
}
-static WERROR cmd_srvsvc_net_share_enum(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- int argc, const char **argv)
+static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, const char **argv,
+ uint32_t opcode)
{
uint32 info_level = 2;
- SRV_SHARE_INFO_CTR ctr;
+ struct srvsvc_NetShareInfoCtr info_ctr;
+ struct srvsvc_NetShareCtr0 ctr0;
+ struct srvsvc_NetShareCtr1 ctr1;
+ struct srvsvc_NetShareCtr2 ctr2;
+ struct srvsvc_NetShareCtr501 ctr501;
+ struct srvsvc_NetShareCtr502 ctr502;
+ struct srvsvc_NetShareCtr1004 ctr1004;
+ struct srvsvc_NetShareCtr1005 ctr1005;
+ struct srvsvc_NetShareCtr1006 ctr1006;
+ struct srvsvc_NetShareCtr1007 ctr1007;
+ struct srvsvc_NetShareCtr1501 ctr1501;
WERROR result;
- ENUM_HND hnd;
+ NTSTATUS status;
+ uint32_t totalentries = 0;
+ uint32_t
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-143-g73b6587
The branch, v3-2-test has been updated
via 73b6587493d9a987a691ece495db9f42ce562efe (commit)
from c940c62029fbce5f2b943f0fb06037fc89bfd297 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 73b6587493d9a987a691ece495db9f42ce562efe
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:26:00 2008 +0100
Use pidl for _srvsvc_NetShareDel and _srvsvc_NetShareDelSticky.
Guenther
---
Summary of changes:
source/rpc_server/srv_srvsvc.c| 46 +---
source/rpc_server/srv_srvsvc_nt.c | 46 ++--
2 files changed, 25 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c
index 39548c5..875cda5 100644
--- a/source/rpc_server/srv_srvsvc.c
+++ b/source/rpc_server/srv_srvsvc.c
@@ -246,28 +246,7 @@ static bool api_srv_net_share_add(pipes_struct *p)
static bool api_srv_net_share_del(pipes_struct *p)
{
- SRV_Q_NET_SHARE_DEL q_u;
- SRV_R_NET_SHARE_DEL r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server del info. */
- if(!srv_io_q_net_share_del(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_del: Failed to unmarshall
SRV_Q_NET_SHARE_DEL.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_del(p, q_u, r_u);
-
- if(!srv_io_r_net_share_del(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_del: Failed to marshall
SRV_R_NET_SHARE_DEL.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREDEL);
}
/***
@@ -276,28 +255,7 @@ static bool api_srv_net_share_del(pipes_struct *p)
static bool api_srv_net_share_del_sticky(pipes_struct *p)
{
- SRV_Q_NET_SHARE_DEL q_u;
- SRV_R_NET_SHARE_DEL r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server del info. */
- if(!srv_io_q_net_share_del(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_del_sticky: Failed to unmarshall
SRV_Q_NET_SHARE_DEL.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_del_sticky(p, q_u, r_u);
-
- if(!srv_io_r_net_share_del(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_del_sticky: Failed to marshall
SRV_R_NET_SHARE_DEL.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREDELSTICKY);
}
/***
diff --git a/source/rpc_server/srv_srvsvc_nt.c
b/source/rpc_server/srv_srvsvc_nt.c
index 3c5d1e4..a6cf06c 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -1905,11 +1905,13 @@ WERROR _srv_net_share_add(pipes_struct *p,
SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
}
/***
- Net share delete. Call delete share command with the share name as
+ _srvsvc_NetShareDel
+ Call delete share command with the share name as
a parameter.
/
-WERROR _srv_net_share_del(pipes_struct *p, SRV_Q_NET_SHARE_DEL *q_u,
SRV_R_NET_SHARE_DEL *r_u)
+WERROR _srvsvc_NetShareDel(pipes_struct *p,
+ struct srvsvc_NetShareDel *r)
{
struct current_user user;
char *command = NULL;
@@ -1921,10 +1923,9 @@ WERROR _srv_net_share_del(pipes_struct *p,
SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_S
struct share_params *params;
TALLOC_CTX *ctx = p-mem_ctx;
- DEBUG(5,(_srv_net_share_del: %d\n, __LINE__));
-
- share_name = unistr2_to_ascii_talloc(ctx, q_u-uni_share_name);
+ DEBUG(5,(_srvsvc_NetShareDel: %d\n, __LINE__));
+ share_name = talloc_strdup(p-mem_ctx, r-in.share_name);
if (!share_name) {
return WERR_NET_NAME_NOT_FOUND;
}
@@ -1953,7 +1954,7 @@ WERROR _srv_net_share_del(pipes_struct *p,
SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_S
return WERR_ACCESS_DENIED;
if (!lp_delete_share_cmd() || !*lp_delete_share_cmd()) {
- DEBUG(10,(_srv_net_share_del: No delete share command\n));
+ DEBUG(10,(_srvsvc_NetShareDel: No delete share command\n));
return WERR_ACCESS_DENIED;
}
@@ -1966,7 +1967,7 @@ WERROR _srv_net_share_del(pipes_struct *p,
SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_S
return WERR_NOMEM;
}
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-144-g96f85a4
The branch, v3-2-test has been updated via 96f85a48beb7da9c373fc030474020d05c55a18d (commit) from 73b6587493d9a987a691ece495db9f42ce562efe (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 96f85a48beb7da9c373fc030474020d05c55a18d Author: Michael Adam [EMAIL PROTECTED] Date: Fri Mar 7 23:41:05 2008 +0100 configure: fix quotation in SMB_LIBRARY for help output. Michael --- Summary of changes: source/m4/aclocal.m4 |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index 888c49d..ef0abad 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -78,8 +78,8 @@ AC_SUBST(LIBUC[_LIBS]) AC_MSG_CHECKING([whether to build the LIBNAME shared library]) AC_ARG_WITH(LIBNAME, -[AS_HELP_STRING([--with-LIBNAME], - [Build the LIBNAME shared library (default=yes if shared libs supported)])], +AS_HELP_STRING([--with-]LIBNAME, + [Build the LIBNAME shared library (default=yes if shared libs supported)]), [ case $withval in *) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-149-g6ffd6c8
The branch, v3-2-test has been updated
via 6ffd6c814fafe4112fe72a96a0893d5be06f4380 (commit)
via 2afae94936d4fbd3b1e804111bff1960c2b852bd (commit)
via 10d457152e8547646353f0f37f51ac92561505ef (commit)
via 2e1df306785296979ea064006402254e318e946b (commit)
via 140885d3d87ea2de14b3393a7384dff74a4dd44c (commit)
from 96f85a48beb7da9c373fc030474020d05c55a18d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 6ffd6c814fafe4112fe72a96a0893d5be06f4380
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:50:00 2008 +0100
Remove unused marshalling for SRV_NET_NAME_VALIDATE.
Guenther
commit 2afae94936d4fbd3b1e804111bff1960c2b852bd
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:47:40 2008 +0100
Remove unused marshalling for SRV_NET_SHARE_DEL.
Guenther
commit 10d457152e8547646353f0f37f51ac92561505ef
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:45:39 2008 +0100
Use rpccli_srvsvc_NetShareDel in net.
Guenther
commit 2e1df306785296979ea064006402254e318e946b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:40:00 2008 +0100
Use pidl for _srvsvc_NetNameValidate.
Guenther
commit 140885d3d87ea2de14b3393a7384dff74a4dd44c
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:39:34 2008 +0100
Add netnamevalidate command to rpcclient.
Guenther
---
Summary of changes:
source/include/rpc_srvsvc.h | 31 -
source/rpc_client/cli_srvsvc.c| 32 --
source/rpc_parse/parse_srv.c | 122 -
source/rpc_server/srv_srvsvc.c| 25 +---
source/rpc_server/srv_srvsvc_nt.c | 23 +++
source/rpcclient/cmd_srvsvc.c | 34 ++
source/utils/net_rpc.c| 17 -
7 files changed, 58 insertions(+), 226 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_srvsvc.h b/source/include/rpc_srvsvc.h
index d0b25e4..3ea55bd 100644
--- a/source/include/rpc_srvsvc.h
+++ b/source/include/rpc_srvsvc.h
@@ -75,20 +75,6 @@ typedef struct net_srv_disk_enum {
/***/
-typedef struct {
- UNISTR2 *servername;
- UNISTR2 sharename;
- uint32 type;
- uint32 flags;
- WERROR status;
-} SRV_Q_NET_NAME_VALIDATE;
-
-typedef struct {
- WERROR status;
-} SRV_R_NET_NAME_VALIDATE;
-
-/***/
-
/* oops - this is going to take up a *massive* amount of stack. */
/* the UNISTR2s already have 1024 uint16 chars in them... */
@@ -625,23 +611,6 @@ typedef struct r_net_share_add
} SRV_R_NET_SHARE_ADD;
-/* SRV_Q_NET_SHARE_DEL */
-typedef struct q_net_share_del
-{
- uint32 ptr_srv_name;
- UNISTR2 uni_srv_name;
- UNISTR2 uni_share_name;
- uint32 reserved;
-
-} SRV_Q_NET_SHARE_DEL;
-
-/* SRV_R_NET_SHARE_DEL */
-typedef struct r_net_share_del
-{
- WERROR status; /* return status */
-
-} SRV_R_NET_SHARE_DEL;
-
/***/
typedef struct {
diff --git a/source/rpc_client/cli_srvsvc.c b/source/rpc_client/cli_srvsvc.c
index 524678c..c043120 100644
--- a/source/rpc_client/cli_srvsvc.c
+++ b/source/rpc_client/cli_srvsvc.c
@@ -362,38 +362,6 @@ WERROR rpccli_srvsvc_net_share_set_info(struct
rpc_pipe_client *cli,
return result;
}
-WERROR rpccli_srvsvc_net_share_del(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
- const char *sharename)
-{
- prs_struct qbuf, rbuf;
- SRV_Q_NET_SHARE_DEL q;
- SRV_R_NET_SHARE_DEL r;
- WERROR result = W_ERROR(ERRgeneral);
- fstring server;
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Initialise input parameters */
-
- slprintf(server, sizeof(fstring)-1, %s, cli-cli-desthost);
- strupper_m(server);
-
- init_srv_q_net_share_del(q, server, sharename);
-
- /* Marshall data and send request */
-
- CLI_DO_RPC_WERR(cli, mem_ctx, PI_SRVSVC, SRV_NET_SHARE_DEL,
- q, r,
- qbuf, rbuf,
- srv_io_q_net_share_del,
- srv_io_r_net_share_del,
- WERR_GENERAL_FAILURE);
-
- result = r.status;
- return result;
-}
-
WERROR rpccli_srvsvc_net_share_add(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
const char *netname, uint32 type,
const char *remark, uint32 perms,
diff --git a/source/rpc_parse/parse_srv.c b/source/rpc_parse/parse_srv.c
index a09e704..b4cc087 100644
--- a/source/rpc_parse/parse_srv.c
+++ b/source/rpc_parse/parse_srv.c
@@ -1522,70 +1522,6 @@ bool srv_io_r_net_share_add(const char *desc,
SRV_R_NET_SHARE_ADD *r_n, prs_stru
}
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-151-g39e9cfa
The branch, v3-2-test has been updated
via 39e9cfa3018786f176aeb237ea7805da4e576c62 (commit)
via 1e7d77766e282c8c20d03d1b1e80346468848ea9 (commit)
from 6ffd6c814fafe4112fe72a96a0893d5be06f4380 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 39e9cfa3018786f176aeb237ea7805da4e576c62
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:55:52 2008 +0100
Re-run make idl.
Guenther
commit 1e7d77766e282c8c20d03d1b1e80346468848ea9
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Mar 7 23:55:01 2008 +0100
Fix IDL for srvsvc_NetShareAdd().
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_srvsvc.c |2 +-
source/librpc/gen_ndr/cli_srvsvc.h |2 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 25 +++--
source/librpc/gen_ndr/srvsvc.h |2 +-
source/librpc/idl/srvsvc.idl |2 +-
5 files changed, 23 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_srvsvc.c
b/source/librpc/gen_ndr/cli_srvsvc.c
index a9d3399..02c11ab 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.c
+++ b/source/librpc/gen_ndr/cli_srvsvc.c
@@ -760,7 +760,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
uint32_t level,
- union srvsvc_NetShareInfo info,
+ union srvsvc_NetShareInfo *info,
uint32_t *parm_error,
WERROR *werror)
{
diff --git a/source/librpc/gen_ndr/cli_srvsvc.h
b/source/librpc/gen_ndr/cli_srvsvc.h
index b8bdac2..d4acc92 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.h
+++ b/source/librpc/gen_ndr/cli_srvsvc.h
@@ -114,7 +114,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
uint32_t level,
- union srvsvc_NetShareInfo info,
+ union srvsvc_NetShareInfo *info,
uint32_t *parm_error,
WERROR *werror);
NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.c
b/source/librpc/gen_ndr/ndr_srvsvc.c
index 2244a3e..568d380 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source/librpc/gen_ndr/ndr_srvsvc.c
@@ -15232,8 +15232,11 @@ static enum ndr_err_code
ndr_push_srvsvc_NetShareAdd(struct ndr_push *ndr, int f
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r-in.server_unc, ndr_charset_length(r-in.server_unc, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-in.level));
- NDR_CHECK(ndr_push_set_switch_value(ndr, r-in.info,
r-in.level));
- NDR_CHECK(ndr_push_srvsvc_NetShareInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.info));
+ if (r-in.info == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
+ NDR_CHECK(ndr_push_set_switch_value(ndr, r-in.info,
r-in.level));
+ NDR_CHECK(ndr_push_srvsvc_NetShareInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.info));
NDR_CHECK(ndr_push_unique_ptr(ndr, r-in.parm_error));
if (r-in.parm_error) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
*r-in.parm_error));
@@ -15254,6 +15257,7 @@ static enum ndr_err_code
ndr_pull_srvsvc_NetShareAdd(struct ndr_pull *ndr, int f
uint32_t _ptr_server_unc;
uint32_t _ptr_parm_error;
TALLOC_CTX *_mem_save_server_unc_0;
+ TALLOC_CTX *_mem_save_info_0;
TALLOC_CTX *_mem_save_parm_error_0;
if (flags NDR_IN) {
ZERO_STRUCT(r-out);
@@ -15277,8 +15281,14 @@ static enum ndr_err_code
ndr_pull_srvsvc_NetShareAdd(struct ndr_pull *ndr, int f
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_unc_0, 0);
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-in.level));
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r-in.info,
r-in.level));
- NDR_CHECK(ndr_pull_srvsvc_NetShareInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.info));
+ if (ndr-flags LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r-in.info);
+ }
+ _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r-in.info, LIBNDR_FLAG_REF_ALLOC);
+
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-152-gfd3e772
The branch, v3-2-test has been updated
via fd3e7728181e7a208706e477905173bec44c982e (commit)
from 39e9cfa3018786f176aeb237ea7805da4e576c62 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit fd3e7728181e7a208706e477905173bec44c982e
Author: Günther Deschner [EMAIL PROTECTED]
Date: Sat Mar 8 00:22:44 2008 +0100
Use pidl for _srvsvc_NetShareAdd.
Guenther
---
Summary of changes:
source/rpc_server/srv_srvsvc.c| 23 +
source/rpc_server/srv_srvsvc_nt.c | 66 ++---
2 files changed, 33 insertions(+), 56 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c
index 8853295..1873bcb 100644
--- a/source/rpc_server/srv_srvsvc.c
+++ b/source/rpc_server/srv_srvsvc.c
@@ -216,28 +216,7 @@ static bool api_srv_net_share_set_info(pipes_struct *p)
static bool api_srv_net_share_add(pipes_struct *p)
{
- SRV_Q_NET_SHARE_ADD q_u;
- SRV_R_NET_SHARE_ADD r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* Unmarshall the net server add info. */
- if(!srv_io_q_net_share_add(, q_u, data, 0)) {
- DEBUG(0,(api_srv_net_share_add: Failed to unmarshall
SRV_Q_NET_SHARE_ADD.\n));
- return False;
- }
-
- r_u.status = _srv_net_share_add(p, q_u, r_u);
-
- if(!srv_io_r_net_share_add(, r_u, rdata, 0)) {
- DEBUG(0,(api_srv_net_share_add: Failed to marshall
SRV_R_NET_SHARE_ADD.\n));
- return False;
- }
-
- return True;
+ return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREADD);
}
/***
diff --git a/source/rpc_server/srv_srvsvc_nt.c
b/source/rpc_server/srv_srvsvc_nt.c
index a64691c..d45ebb2 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -1726,11 +1726,13 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p,
}
/***
- Net share add. Call 'add_share_command sharename pathname
+ _srvsvc_NetShareAdd.
+ Call 'add_share_command sharename pathname
comment max connections =
/
-WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u,
SRV_R_NET_SHARE_ADD *r_u)
+WERROR _srvsvc_NetShareAdd(pipes_struct *p,
+ struct srvsvc_NetShareAdd *r)
{
struct current_user user;
char *command = NULL;
@@ -1747,9 +1749,9 @@ WERROR _srv_net_share_add(pipes_struct *p,
SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
int max_connections = 0;
TALLOC_CTX *ctx = p-mem_ctx;
- DEBUG(5,(_srv_net_share_add: %d\n, __LINE__));
+ DEBUG(5,(_srvsvc_NetShareAdd: %d\n, __LINE__));
- r_u-parm_error = 0;
+ *r-out.parm_error = 0;
get_current_user(user,p);
@@ -1759,11 +1761,11 @@ WERROR _srv_net_share_add(pipes_struct *p,
SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
return WERR_ACCESS_DENIED;
if (!lp_add_share_cmd() || !*lp_add_share_cmd()) {
- DEBUG(10,(_srv_net_share_add: No add share command\n));
+ DEBUG(10,(_srvsvc_NetShareAdd: No add share command\n));
return WERR_ACCESS_DENIED;
}
- switch (q_u-info_level) {
+ switch (r-in.level) {
case 0:
/* No path. Not enough info in a level 0 to do anything. */
return WERR_ACCESS_DENIED;
@@ -1771,27 +1773,24 @@ WERROR _srv_net_share_add(pipes_struct *p,
SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
/* Not enough info in a level 1 to do anything. */
return WERR_ACCESS_DENIED;
case 2:
- share_name = unistr2_to_ascii_talloc(ctx,
- q_u-info.share.info2.info_2_str.uni_netname);
- comment = unistr2_to_ascii_talloc(ctx,
- q_u-info.share.info2.info_2_str.uni_remark);
- pathname = unistr2_to_ascii_talloc(ctx,
- q_u-info.share.info2.info_2_str.uni_path);
- max_connections = (q_u-info.share.info2.info_2.max_uses ==
0x) ? 0 : q_u-info.share.info2.info_2.max_uses;
- type = q_u-info.share.info2.info_2.type;
+ share_name = talloc_strdup(ctx, r-in.info-info2-name);
+ comment = talloc_strdup(ctx, r-in.info-info2-comment);
+ pathname = talloc_strdup(ctx, r-in.info-info2-path);
+ max_connections = (r-in.info-info2-max_users == 0x) ?
+ 0 : r-in.info-info2-max_users;
+ type =
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-154-g85007cf
The branch, v3-2-test has been updated
via 85007cf3f2e3df67c524cc67442396c114f6b784 (commit)
via 0785acede41301af071db4e8a4c118a44f0454d8 (commit)
from fd3e7728181e7a208706e477905173bec44c982e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 85007cf3f2e3df67c524cc67442396c114f6b784
Author: Günther Deschner [EMAIL PROTECTED]
Date: Sat Mar 8 00:28:38 2008 +0100
Re-run make idl.
Guenther
commit 0785acede41301af071db4e8a4c118a44f0454d8
Author: Günther Deschner [EMAIL PROTECTED]
Date: Sat Mar 8 00:27:41 2008 +0100
Fix IDL for srvsvc_NetSetFileSecurity and srvsvc_NetGetFileSecurity.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_srvsvc.c |8 ++---
source/librpc/gen_ndr/cli_srvsvc.h |4 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 58 ++-
source/librpc/gen_ndr/srv_srvsvc.c |2 +-
source/librpc/gen_ndr/srvsvc.h |4 +-
source/librpc/idl/srvsvc.idl |4 +-
6 files changed, 53 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_srvsvc.c
b/source/librpc/gen_ndr/cli_srvsvc.c
index 02c11ab..2b61fb8 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.c
+++ b/source/librpc/gen_ndr/cli_srvsvc.c
@@ -2040,7 +2040,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct
rpc_pipe_client *cli,
const char *share,
const char *file,
uint32_t securityinformation,
- struct sec_desc_buf *sd_buf,
+ struct sec_desc_buf **sd_buf,
WERROR *werror)
{
struct srvsvc_NetGetFileSecurity r;
@@ -2076,9 +2076,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct
rpc_pipe_client *cli,
}
/* Return variables */
- if (sd_buf r.out.sd_buf) {
- *sd_buf = *r.out.sd_buf;
- }
+ *sd_buf = *r.out.sd_buf;
/* Return result */
if (werror) {
@@ -2094,7 +2092,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct
rpc_pipe_client *cli,
const char *share,
const char *file,
uint32_t securityinformation,
- struct sec_desc_buf sd_buf,
+ struct sec_desc_buf *sd_buf,
WERROR *werror)
{
struct srvsvc_NetSetFileSecurity r;
diff --git a/source/librpc/gen_ndr/cli_srvsvc.h
b/source/librpc/gen_ndr/cli_srvsvc.h
index d4acc92..b8171a3 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.h
+++ b/source/librpc/gen_ndr/cli_srvsvc.h
@@ -289,7 +289,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct
rpc_pipe_client *cli,
const char *share,
const char *file,
uint32_t securityinformation,
- struct sec_desc_buf *sd_buf,
+ struct sec_desc_buf **sd_buf,
WERROR *werror);
NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
@@ -297,7 +297,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct
rpc_pipe_client *cli,
const char *share,
const char *file,
uint32_t securityinformation,
- struct sec_desc_buf sd_buf,
+ struct sec_desc_buf *sd_buf,
WERROR *werror);
NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.c
b/source/librpc/gen_ndr/ndr_srvsvc.c
index 568d380..8f577c6 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source/librpc/gen_ndr/ndr_srvsvc.c
@@ -18257,9 +18257,12 @@ static enum ndr_err_code
ndr_push_srvsvc_NetGetFileSecurity(struct ndr_push *ndr
NDR_CHECK(ndr_push_security_secinfo(ndr, NDR_SCALARS,
r-in.securityinformation));
}
if (flags NDR_OUT) {
- NDR_CHECK(ndr_push_unique_ptr(ndr, r-out.sd_buf));
- if (r-out.sd_buf) {
- NDR_CHECK(ndr_push_sec_desc_buf(ndr,
NDR_SCALARS|NDR_BUFFERS, r-out.sd_buf));
+ if (r-out.sd_buf == NULL) {
+ return
Build status as of Sat Mar 8 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-03-07 00:00:18.0 + +++ /home/build/master/cache/broken_results.txt 2008-03-08 00:00:50.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Mar 7 00:00:02 2008 +Build status as of Sat Mar 8 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -14,9 +14,9 @@ rsync30 13 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 29 16 0 -samba_4_0_test 27 26 0 +samba_3_2_test 29 15 0 +samba_4_0_test 27 24 1 smb-build28 3 0 -talloc 29 8 0 +talloc 30 8 0 tdb 30 15 0
