[Samba] Re: Is anyone maintaining the smb filesystem?
On 03/08/2005 17:03:04 linux-kernel-owner wrote: Is anyone maintaining the smb filesystem in the Linux kernel? It probably won't help you much, but I had the same problem few months ago. There was a bug in smbfs which I tried to discuss with someone, and after failing to contact the maintainer, I sent the fix to Linus. I don't think even he managed to get a response from Urban or someone else. The fix went in so I stopped chasing it. So it looks like smbfs is not maintained. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Winbind Understanding
Is there a way I can present the actual Windows owners and groups as Linux owners and groups? don't know about an option like that, yet. may be someone could enlight us I thought this was the purpose of winbind with windows ACL mapped to the Linux extended ACL. winbindd has nothing to do with ACL greez -- Michael Gasch Max Planck Institute for Evolutionary Anthropology Department of Human Evolution Deutscher Platz 6 D-04103 Leipzig Germany Phone: 49 (0)341 - 3550 137 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] XP slow on first access.
Hi, I read your article on the internet. I have got a similar problem. When on Windows XP clients in Outlook 2000 you try to attach a document from a samba share it takes almost a minute to reply. What was the solution for your problem ? Thanks, Mark Nuyten Dit bericht is uitsluitend bestemd voor de hierboven genoemde geadresseerde(n) en kan vertrouwelijke informatie bevatten. Indien het mailbericht verkeerd is geadresseerd verzoeken wij u dringend ons dit te laten weten (telefonisch of per mail). Verspreiding en/of openbaarmaking van dit mailbericht aan derden is strikt verboden. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] different browselists on multi homed server
On Wednesday, August 03, 2005 6:02 PM John H Terpstra wrote: So which is it? Browse list or share list? Sorry for being not precise and thanks for making it clear! I meant share lists. The browse list can not be different, the shares lists can be. Follow chapter 33 of the Samba3-HOWTO.pdf for insight into how you might achieve your goals. Great document, very detailed and very new. Hint: Use the netbios aliases option, for each alias create it's own smb.conf include file. Use one alias for each network. It can be restricted to its own network address by using the hosts allow and hosts deny facility. Each included smb.conf can have its own share definitions. Since I have 16 interfaces I am afraid to confuse my users with 16 virtual server names. I am looking for using the interface or IP address the virtual server is running on? Samba3-HOWTO is talking about the %i macro on page 873 which seems to be new in Samba3 (I am using Samba 2.2 from Debian Woody stable). I think this macro is what I was searching for. I going to upgrade to Debian Sarge, which in my test installations was terrific. Good whishes to everyone Richard Zimmer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] CUPS: Report errors and problems back to Windows clients
Hi there, my CUPS server runs fine, I can print from within Windows and Linux. However, if I stop the printer in CUPS or some other error occurs, Windows clients never get notified, neither via IPP nor via SMB printing. Windows always sends out the print job, the user thinks the job has been print, although some problem might have happened on the CUPS server. Is it possible to report errors and problems back to Windows clients? Like having Windows giving out a printer error when the CUPS server can't print? Must be something like don't spool and forget about the job, but instead wait from CUPS reply. Is something like that possible? Thanks Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Beta Version Windows Longhorn/Vista cant connect to samba
Hi Ppl Running the following Debian Stable (sarge) Samba version 3.0.14a-Debian I have had the following running fine as a domain controller with an ldap backend, I have windows 2000 and windows xp machines logged into the domain and all working 100%. I recently got hold of the 32bit version of windows vista/longhorn and decided to install it and try it out, when trying to connect to the shares on the samba server it comes up with a login, when trying all types of login combinations ie domain\user, user etc etc it just pops up the login again, in the samba logs for both the daemons and the workstation I am seeing nothing but [2005/08/03 14:32:54, 0] lib/util_sock.c:send_smb(647) Error writing 4 bytes to client. -1. (Connection reset by peer) In the log for that machine. Here is my smb.conf [global] workgroup = DOMAIN server string = %h server (Samba %v) map to guest = Bad User passdb backend = ldapsam:ldap://127.0.0.1/ pam password change = Yes passwd program = /usr/sbin/smbldap-passwd %u passwd chat = *New*password* %n\n *Retype*new*password* %n\n *all*authentication*tokens*updated* syslog = 0 log file = /var/log/samba/log.%m max log size = 1 server signing = auto socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/sbin/smbldap-usermod -g %g %u add machine script = /usr/sbin/smbldap-useradd -w %u logon script = %U.bat logon path = \\%L\%U\profile logon drive = H: logon home = \\%L\%U domain logons = Yes os level = 69 preferred master = Yes domain master = Yes wins support = Yes ldap admin dn = cn=admin,dc=domain,dc=co,dc=za ldap group suffix = ou=groups ldap idmap suffix = ou=idmap ldap machine suffix = ou=machines ldap passwd sync = Yes ldap suffix = dc=domain, dc=co, dc=za ldap user suffix = ou=people admin users = administrator inherit permissions = Yes printing = lprng lppause command = lpc hold '%p' %j lpresume command = lpc release '%p' %j queuepause command = lpc stop '%p' queueresume command = lpc start '%p' vfs objects = recycle:repository, recycle:keeptree, recycle:versions anyone know where I can look ? Thank you, Mark Adrian Coetser [EMAIL PROTECTED], [EMAIL PROTECTED] http://www.bwbtrading.co.za http://www.thummb.com cel: +27 83 296 1199 tel: +27 11 334 7779 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Repost: Temporary files with word
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Nicki Messerschmidt, Linksystem Muenchen GmbH said the following: I have a strange problem with samba 3.0.14a. One of my users is experiencing a lot of temporary files created by winword 2003. Winword does delete the temp files under any other userid. The only difference I know of is that the problematic user was created after the automatic switch from samba 2.2.8a to 3.0.14a (during an upgrade from debian woody to debian sarge). Has anyone an idea what could be wrong and where I could look to understand this problem? It seems that this only profile keeps the connection to the temporary files open. The same userid cannot delete the files, but others can. I'm really at a loss here and hope that someone can point me in the right direction. Cheers and thanks Nicki - -- Linksystem Muenchen GmbH [EMAIL PROTECTED] Schloerstrasse 10 http://www.link-m.de 80634 Muenchen Tel. 089 / 890 518-0 We make the Net work. Fax 089 / 890 518-77 PGP Keys: https://www.link-m.de/pgp/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (MingW32) Comment: Get keys at: https://www.link-m.de/pgp iD8DBQFC8e1K6zWc+bXuIEMRAgFjAKC1fAVr6fGYITtUvyjfjLiQ67w8MQCeJi46 r/BHg0eJFHpxMJJRuM1vkSs= =2eAn -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] Programatically Modifying Users
Jeremy Allison wrote: On Wed, Aug 03, 2005 at 11:07:47AM +0100, Nigel Rantor wrote: Aye, already have been looking at it. One of my other issues at the moment is the GPL issues. Since the samba project has not been designed to have bits of it used by other code I need to ensure that whatever I do won't violate the GPL. The project I'm working on is not OSS at all, let alone GPL. Then you can't link to Samba code. It's that simple. The Samba code is not allowed to be used in proprietary software, you'll have to write your own code. Hi Jeremy, I'm going to address some GPL issues in my reply to Jerry, I'm not ignoring them. :-) n -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3.0.20rc1 Available for Download
Gerald (Jerry) Carter wrote: This is a release candidate of the 3.0.20 code base and is provided for testing purposes only. While close to the make check StrCaseCmp FAIL AssertionError: comparison failed: a=u'\u30a2' b=u'\u30a2' expected=0 result='12450\n' I've narrowed it down to revision 8762 Fedora core 3 Linux 2.6.11-1.27_FC3smp gcc-3.4.4-2.fc3 python-2.3.4-13.1 Doug -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Repost: Temporary files with word
I am guessing that you use roaming profiles on the Samba server. Compare their ntuser.dat (sometimes called NTUSER.DAT) files with one of the users who was created before the migration. You may find that the word registry key inside the NTUSER.DAT file has some inconsitencies with the ones inside the older users. Do you know your domain SID? If not try running the command net getlocalsid (if that doesn't work try running net rpc info). You will find that SID entry for your domain in each users ntuser.dat files (or at least thats how it should work). I am guessing that somehow word seems able to create the files, possibly by overriding the domain SID (what are the user in questions local privelages and do they differ with other users?) but the user cannot then delete them due to Word creating them with this higher power. I may be waffling (infact I know I am) but try running the command profiles ntuser.dat file from within the users profiles, also stick a in their to output to a file so you can easily compare them with each other. Maybe doing a diff if you want to get bogged down with it. Then post your findings. Another thing, this new user isn't missing group membership in any way are they? Nicki Messerschmidt, Linksystem Muenchen GmbH wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Nicki Messerschmidt, Linksystem Muenchen GmbH said the following: I have a strange problem with samba 3.0.14a. One of my users is experiencing a lot of temporary files created by winword 2003. Winword does delete the temp files under any other userid. The only difference I know of is that the problematic user was created after the automatic switch from samba 2.2.8a to 3.0.14a (during an upgrade from debian woody to debian sarge). Has anyone an idea what could be wrong and where I could look to understand this problem? It seems that this only profile keeps the connection to the temporary files open. The same userid cannot delete the files, but others can. I'm really at a loss here and hope that someone can point me in the right direction. Cheers and thanks Nicki - -- Linksystem Muenchen GmbH [EMAIL PROTECTED] Schloerstrasse 10 http://www.link-m.de 80634 Muenchen Tel. 089 / 890 518-0 We make the Net work. Fax 089 / 890 518-77 PGP Keys: https://www.link-m.de/pgp/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (MingW32) Comment: Get keys at: https://www.link-m.de/pgp iD8DBQFC8e1K6zWc+bXuIEMRAgFjAKC1fAVr6fGYITtUvyjfjLiQ67w8MQCeJi46 r/BHg0eJFHpxMJJRuM1vkSs= =2eAn -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] Programatically Modifying Users
Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Nigel Rantor wrote: So, I can't find anything on SAMR rpc on the samba site, is this a very new bit of the project? Any good resources where I can find out more about it or is just talking to the samba-tech list first the way to go? Start by looking at the Samba code. The samr pipe is used for managing user and group accounts. For example, connect to a Samba server with usrmgr.exe and watch the traffic using ethereal. Roger Red Leader, I'll go grab the latest code then, I'm currently using 3.0.7 I have seen jCIFS, although in it's current state it only (AFAICT) supports the access of remote SMB shares. I haven't yet contacted the devs to see what else is in the works though or what it would take to add. I just verified this week that Mike is working on rpc support (hey Mike! :-)) but has some more work to do on it before the feature is available in a release. Groovy. My main problem is that I'm under time pressure (isn't everyone?) to make this bit of the project go faster, as you can imagine calling out to the samba CLI tools from Java is *painfully* slow. Aye, already have been looking at it. One of my other issues at the moment is the GPL issues. Since the samba project has not been designed to have bits of it used by other code I need to ensure that whatever I do won't violate the GPL. The project I'm working on is not OSS at all, let alone GPL. Sorry. Can't use any Samba code in that case. Are we talking about a Unix/Linux application here ? or a Windows management tool for Samba? You would write your client on Win32 pretty easy since the API calls are already there. If you are working on Unix, your only hope is to write your own dce/rpc library or maybe find one that is useable under a license sompatiable with your work. It is a Java app on Linux. Okay, and here comes some stuff that might provoke some reaction so I'll climb into my flame-suit. IANAL but AFAIK ETC ETC The GPL only prohibits the distribution of modified works, it says nothing about those works that are not distributed. In this case there is no intention whatsoever of redistributing source of any kind, modified or otherwise. I am working on a system that is used internally by a business. Having said that, I am an OSS advocate and my ideal route to providing this functionality would be either (as you have suggested) to contribute to getting the SAMR stuff up to scratch/using jCIFS (which is licensed under the LGPL) or producing some form of library that I would license under GPL to provide Java hooks to the functionality that I require. This package would then not be required for the operation of the system I'm working on, it *already* works by calling out to CLI programs, and could be used under the terms of the GPL at arms length. I'll repeat, reiterate and recombobulate that I am not a lawyer, but I'll be making sure that anything I do or am involved in is above board WRT the GPL. I hope this doesn't mean I'll suddenly become persona non grata here, I only just arrived :-) Note that the Samba4 IDL files (not the actual code or pidl itseld) are available for use under more liberal license. You could write your own IDL compiler and use those. Euugh, I've already written one IDL compiler for CORBA...that was hairy enough. Ta, n -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] LDAP, uidNumber, SID
Martin Renner wrote: Hi. I am upgrading a Samba 2.2 PDC (using smbpasswd as its user backend) to Samba 3.0 with LDAP. The current user uids and machine account uids are quite messed up. As the LDAP database stores the uid *and* the SID of each user and machine account, I would like to know if it would be possible to renumber the uids (uidNumber of samba.schema). The SID would remain unchanged (by using the formula oldUid * 2 + 1000). Is this possible without losing account information or machine trusts? Yes. SID and unix uid is used for different purpose. -- --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Mac OSX Tiger 10.4.2 SMB
Hi Guys and girls, I'm having exactly the same error as this person in the post below had. Only differences is we are running Slackware 10.1 with Samba 3.0.14a, and the Mac connecting is using 10.4.2 Does anyone know of a work around, or a solution to the problem? Any help would be appreciated. Thanks. Neil Wilson Powered by Linux, Driven by Passion ! [Samba] OS X 10.4.1 ( Tiger ) client borked cliff white cliffw at easystreet.com Mon May 23 20:31:38 GMT 2005 Previous message: [Samba] OS X 10.4.1 ( Tiger ) client borked Next message: [Samba] Configuration on Sun Solaris 9/Sun SPAARC Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] On Mon, 23 May 2005 07:53:42 -0500 Gerald (Jerry) Carter jerry at samba.org wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 cliffw wrote: | Appears Apple messed something up in 10.4,and 10.4.1. | | Attempting to connect to a 3.0.14a server (debian unstable) | from an OS X client causes OS X Finder to hang, and puts | these errors in the samba server logs: | | [2005/05/22 21:48:20, 0] rpc_parse/parse_prs.c:prs_mem_get(537) | prs_mem_get: reading data of size 2 would overrun buffer. | [2005/05/22 21:48:20, 0] rpc_server/srv_pipe.c:api_pipe_bind_req(919) | api_pipe_bind_req: unable to unmarshall RPC_HDR_RB struct. | | Apparently it's also causing breakage in some NAS boxes | ( Adaptec's Snap is mentioned ) | |From a 'level 2' guy on Apple's support forum ( re: a Snap report ): | | Tiger does a kind of authentication called NTLMv2, | which Panther did not attempt to do. NTLMv2 is more secure than | the kind of authentication Panther did, but Snap may not support | it correctly. Snap grants Tiger only guest access instead of the | full user access requested, and guest access is not sufficient | to even get a list of the files. Panther works OK with Snap because | it doesn't attempt MTLMv2 authentication. | | | Any chance this is the same problem i'm seeing? Possibly. Can you send me a level 10 debug log from smbd and a raw ethereal trace file? tcpdump is fine if you use this following command: tcpdump -w dump.pcap -s 0 -i eth0 port 139 or port 445 I did two tests for you, but nothing captured on port 445. Two tarballs of test logs, and one tcpdump file enclosed cliffw cheers, jerry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] ACL question
hello, i have a strange problem with acl permissions. My samba 2.2 works perfectly but samba 3.x not. For example, i have a share: [prueba] path = /home/prueba comment = Directorio Plataforma writeable = yes force create mode = 770 create mode = 770 force directory mode = 770 directory mode = 770 inherit acls = yes inherit permissions = yes #papelera recycle:keeptree = True recycle:touch = True recycle:versions = True recycle:repository = .recycle vfs objects = recycle and i have a directory, /home/prueba/dir drwxrwx---+ 2 root root 144 Aug 4 13:42 prueba # getfacl prueba # file: prueba # owner: root # group: root user::rwx group::rwx group:test:rwx mask::rwx other::--- My user john: # id john uid=1053(john) gid=1004(aaa) groups=1004(aaa),1012(bbb),(test) This user can join to the directory 'dir' but can't create any dir or file. why? if i delete ACL and assign perms 770 (chmod 770 dir chown root:test) works perfectly. In my samba 2.2 works all. I have in smb.conf the line acl compatibility = Auto and my FS support acl (/dev/mapper/data-home on /home type reiserfs (rw,acl,user_xattr) anyone help me please? thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] EFS crypted files and smbclient.
Is there a way to copy a NTFS encrypted file using smbclient (even not decrypted) so It can be backed up using backuppc (http://backuppc.sourceforge.net) ? I have exported the NTFS keys in a pfx file. could it help copy the file? Thanks for any help or advise. Regards. -- Olivier LAHAYE Motorola Labs IT manager Saclay, FRANCE -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba3 xserve file size limit.
Hello, We have a 40To (fourty TerraBytes) Xserve+Xraid system to store years and years of video tapes. It's being used as a fileserver in a windows network, and so it uses samba. The samba version is 3.0.10 (provided with Apple Xserve) As we're dealing with gibabytes file size, we're hitting a strange problem: We can copy -any filesize from xraid volumes to xraid volumes with cp command from xraid volume (through samba share) to a windows computer. -a 20GB file from a windows system to a samba BUT We cannot copy a 34GB file from a windows system to a samba So before starting to try blindfolded what size has my Xserve hang, I think I'd better ask to my specialist friends. Is there a built-in size limit for files copied from windows to the Unix system. cheers -- Fabrice Clerc -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Trouble in Joining Suse 9.3 to Win2k3 Server
Hi, After installing Suse 9.3 Professional, I am unable to join it to AD. From the Docs ( http://www.samba.org/samba/docs/man/Samba3-HOWTO/domain-member.html#ads-member) its clear that we need to first get a kerberos ticket... via #kinit [EMAIL PROTECTED] in Suse9,3, I get this error susles93WSA:~ # kinit [EMAIL PROTECTED] Password for [EMAIL PROTECTED]:dingdong.com http://dingdong.com Exception: krb_error 24 Pre-authentication information was invalid (24) Pre-authentication information was invalid KrbException: Pre-authentication information was invalid (24) at sun.security.krb5.KrbAsRep.init(DashoA12275:67) at sun.security.krb5.KrbAsReq.getReply(DashoA12275:315) at sun.security.krb5.KrbAsReq.getReply(DashoA12275:276) at sun.security.krb5.internal.tools.Kinit.init(DashoA12275:271) at sun.security.krb5.internal.tools.Kinit.main(DashoA12275:109) Caused by: KrbException: Identifier doesn't match expected value (906) at sun.security.krb5.internal.af.a(DashoA12275:134) at sun.security.krb5.internal.at.a(DashoA12275:63) at sun.security.krb5.internal.at.init(DashoA12275:58) at sun.security.krb5.KrbAsRep.init(DashoA12275:53) This is kind of a strange error and the kinit program is located at /usr/lib/jvm/jre/bin/kinit and from a RPM querry it belongs to the package 'java-1_4_2-sun-1.4.2.06-4' when I querried 'rpm -qa | grep heimdal' there was none, meaning heimdal libraries were not installed. and neither is it in the ISO images. Hence I wonder if it is at all possible to join a Suse 9.3 to an AD. Any suggestion would be very helpfull.. regards -- Sanjay Upadhyay http://saneax.blogspot.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Trouble in Joining Suse 9.3 to Win2k3 Server
Hi, From the suggestion as you said, I will need to install kerberos packages, as on Suse, building is not what I can do, Can you give me some links... to the required RPMS I have done the time sync before the kinit process, and they are absolutely in sync... On 8/4/05, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hi, You have not to use heimdahl, instead use mit kerberos. Next point is to check the clocks between systems. Then it should work karl -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Sanjay Upadhyay Sent: Thursday, August 04, 2005 3:52 PM To: samba@lists.samba.org Subject: [Samba] Trouble in Joining Suse 9.3 to Win2k3 Server Hi, After installing Suse 9.3 Professional, I am unable to join it to AD. From the Docs ( http://www.samba.org/samba/docs/man/Samba3-HOWTO/domain-member.html#ads-memb er) its clear that we need to first get a kerberos ticket... via #kinit [EMAIL PROTECTED] in Suse9,3, I get this error susles93WSA:~ # kinit [EMAIL PROTECTED] Password for [EMAIL PROTECTED]:dingdong.com http://dingdong.com http://dingdong.com Exception: krb_error 24 Pre-authentication information was invalid (24) Pre-authentication information was invalid KrbException: Pre-authentication information was invalid (24) at sun.security.krb5.KrbAsRep.init(DashoA12275:67) at sun.security.krb5.KrbAsReq.getReply(DashoA12275:315) at sun.security.krb5.KrbAsReq.getReply(DashoA12275:276) at sun.security.krb5.internal.tools.Kinit.init(DashoA12275:271) at sun.security.krb5.internal.tools.Kinit.main(DashoA12275:109) Caused by: KrbException: Identifier doesn't match expected value (906) at sun.security.krb5.internal.af.a(DashoA12275:134) at sun.security.krb5.internal.at.a(DashoA12275:63) at sun.security.krb5.internal.at.init(DashoA12275:58) at sun.security.krb5.KrbAsRep.init(DashoA12275:53) This is kind of a strange error and the kinit program is located at /usr/lib/jvm/jre/bin/kinit and from a RPM querry it belongs to the package 'java-1_4_2-sun-1.4.2.06-4' when I querried 'rpm -qa | grep heimdal' there was none, meaning heimdal libraries were not installed. and neither is it in the ISO images. Hence I wonder if it is at all possible to join a Suse 9.3 to an AD. Any suggestion would be very helpfull.. regards -- Sanjay Upadhyay http://saneax.blogspot.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Sanjay Upadhyay http://saneax.blogspot.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Beta Version Windows Longhorn/Vista cant connect to samba
On Thu, Aug 04, 2005 at 11:59:29AM +0200, Mark Coetser wrote: Hi Ppl Running the following Debian Stable (sarge) Samba version 3.0.14a-Debian I have had the following running fine as a domain controller with an ldap backend, I have windows 2000 and windows xp machines logged into the domain and all working 100%. I recently got hold of the 32bit version of windows vista/longhorn and decided to install it and try it out, when trying to connect to the shares on the samba server it comes up with a login, when trying all types of login combinations ie domain\user, user etc etc it just pops up the login again, in the samba logs for both the daemons and the workstation I am seeing nothing but This is something that Andrew Bartlett has *just* (this week) fixed here at the CIFS conference. The fix will be in 3.0.20 when it is officially released, and in the next 3.0.20 release candidate. Andrew fixed it within about 1-2 hours of first seeing a Windows vista system, which I think was pretty good going :-). As it's not officially out yet we won't officially support it until Microsoft does, but we will track the betas. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] WinXP maps home drive to logon home
Hi, I am having a logon home problem. I have a mixture of Win98 and WinXP machines and regardless which I use to connect to the Samba server, it will try to map the home drive to what I have set the logon home = to. This is the line .. logon home = \\%N\profile.%U The user is admin This is the error I see in the syslog from a Win98 Machine: lab_thinkpad (192.168.30.180) couldn't find service profile.admin and from a WinXP machine: genserv-lab4 (192.168.30.184) couldn't find service profile.admin If I create a folder in the home share called profile.admin, then WinXP will map the Home drive to it instead of the parent of profile.admin. If I remove the logon home line from the smb.conf file, WinXP will map the Home drive to the home share root correctly, but the Win98 client will put the profile information in the home share root, and I want it in a folder called profile.%U under the home share. This is the full smb.conf: [global] netbios name = Samba-1 workgroup = TESTGROUP log file = /var/log/samba/%U.log syslog = 1 max log size = 1000 time server = Yes add machine script = /usr/sbin/useradd -d /dev/null -g 110 -s /bin/false -M %u logon script = logon.bat logon path = \\%N\Profiles\%U logon home = \\%N\profile.%U logon drive = H: domain logons = Yes domain master = Yes wins support = Yes security = user os level = 65 admin users = admin, ron [netlogon] path = /usr/local/samba/lib/netlogon browseable = No [homes] read only = No browseable = No guest ok = No map archive = No [profiles] path = /home/testshare/%g/Profiles browsable = no writable = yes create mask = 0600 directory mask = 0700 #end The logon.bat file is: @echo on net use H: /home pause The server is a Mandrake 10.1 (before Mandriva), but samba is NOT an RPM, it's from samba.org source version 3.0.14a, configured with the following arguments: $ ./configure --bindir=/usr/local/bin --sbindir=/usr/local/sbin --sysconfdir=/etc --with-msdfs --with-smbwrapper --with-smbmount --with-quotas --with-acl-support --with-syslog I've RTFM for the last 2 solid 16 hour days, I'm baffled. I would very much appreciate any help anyone out there can offer. Thanks, R Smith -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Repost: Temporary files with word
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Nicki Messerschmidt, Linksystem Muenchen GmbH wrote: Nicki Messerschmidt, Linksystem Muenchen GmbH said the following: I have a strange problem with samba 3.0.14a. One of my users is experiencing a lot of temporary files created by winword 2003. Winword does delete the temp files under any other userid. The only difference I know of is that the problematic user was created after the automatic switch from samba 2.2.8a to 3.0.14a (during an upgrade from debian woody to debian sarge). Has anyone an idea what could be wrong and where I could look to understand this problem? It seems that this only profile keeps the connection to the temporary files open. The same userid cannot delete the files, but others can. I'm really at a loss here and hope that someone can point me in the right direction. Dooh! The problem was so stupid simple I did not see it. As we say here in Germany I did not see the wood due to all the trees. Every user belonged to the group staff and this one had the group users. The configuration stated force group = staff and force mode = 0770. What I don't understand is why the user was able to create files in the first place... *arg* Cheers and thanks for the patience. I'll go and bang my head hard against the next wall! Nicki - -- Linksystem Muenchen GmbH [EMAIL PROTECTED] Schloerstrasse 10 http://www.link-m.de 80634 Muenchen Tel. 089 / 890 518-0 We make the Net work. Fax 089 / 890 518-77 PGP Keys: https://www.link-m.de/pgp/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (MingW32) Comment: Get keys at: https://www.link-m.de/pgp iD8DBQFC8jJJ6zWc+bXuIEMRAon1AKD5/otD2jNlkA49pI4+qmIVbWd03ACgiWuB VbvTIS9Lb9c63sWyO5O4gDg= =kDTL -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba, win xp and acls
Hello all, I'm working and searching for a few days to obtain this result : * I want to share some directories between differents users and groups (windows XP clients) using a minimum but efficient configuration with samba and posix acls. * I would like that users windows configuration stay on locals machines (no roaming accounts), * When registering users and computers on the domain, users must keep there configuration, * I want to manage users and groups using srvtools.exe I use tdbsam, posix acls work fine and samba (3.0.14a) runs as a PDC. My problems are : * On windows (with administrator account), some directories don't have the acl (security) panel, * On other directories, the panel is present but I cannot modify permissions, * Users configurations are never stored locally, * Creating new users with srvtools not possible, * How to keep old users windows configuration when entering the domain ? * No way to find a good tutorial answering my needs... Here is my configuration : smb.conf : [global] interfaces = 192.168.1.120/24 enable privileges = yes nt acl support = yes security = user netbios name = FSERVER workgroup = FWSERVER passdb backend = tdbsam server string = File Server add user script = /usr/sbin/useradd -m '%u' add group script = /usr/sbin/groupadd '%g' add user to group script = /usr/sbin/usermod -G '%g' '%u' add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null '%u' logon script = scripts\logon.bat logon path = logon drive = H: domain logons = yes username map = /etc/samba/smbusers admin users = root socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=4096 SO_RCVBUF=4096 encrypt passwords = yes wins support = yes os level = 50 domain master = yes local master = yes preferred master = yes name resolve order = lmhosts host wins bcast preserve case = yes short preserve case = yes unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . [public] writable = yes path = /share/public public = yes create mode = 0777 directory mask = 0777 admin users = root nt acl support = yes [technique] writable = yes path = /share/technique public = no create mode = 0770 directory mask = 0770 valid users= @technique, @admins admin users = root nt acl support = yes [stagiaires] writable = yes path = /share/stagiaires public = no create mode = 0770 directory mask = 0770 valid users= @stagiaires, @admins admin users = root nt acl support = yes [secretariat] writable = yes path = /share/secretariat public = no create mode = 0770 directory mask = 0770 valid users= @secretariat @admins admin users = root nt acl support = yes [finances] writable = yes path = /share/finances public = no create mode = 0770 directory mask = 0770 valid users = @finances @admins admin users = root nt acl support = yes --- My groupmaps seems to be good : System Operators (S-1-5-32-549) - -1 Replicators (S-1-5-32-552) - -1 Guests (S-1-5-32-546) - -1 Domain Admins (S-1-5-21-3171617769-241562045-158900556-512) - admins Power Users (S-1-5-32-547) - -1 Domain Guests (S-1-5-21-3592376627-3846121942-908627037-514) - -1 Domain Users (S-1-5-21-3592376627-3846121942-908627037-513) - -1 Print Operators (S-1-5-32-550) - -1 Administrators (S-1-5-32-544) - admins Domain Users (S-1-5-21-3171617769-241562045-158900556-513) - ntusers Account Operators (S-1-5-32-548) - -1 Secretariat (S-1-5-21-3171617769-241562045-158900556-3003) - secretariat Technique (S-1-5-21-3171617769-241562045-158900556-3005) - technique Finances (S-1-5-21-3171617769-241562045-158900556-3007) - finances Stagiaires (S-1-5-21-3171617769-241562045-158900556-3009) - stagiaires Domain Guests (S-1-5-21-3171617769-241562045-158900556-514) - -1 Backup Operators (S-1-5-32-551) - -1 Users (S-1-5-32-545) - -1 Thx for help. Max -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE [Samba] Samba, win xp and acls
Hi, [EMAIL PROTECTED] a écrit sur 04/08/2005 17:26:59 : Hello all, I'm working and searching for a few days to obtain this result : * I want to share some directories between differents users and groups (windows XP clients) using a minimum but efficient configuration with samba and posix acls. * I would like that users windows configuration stay on locals machines (no roaming accounts), * When registering users and computers on the domain, users must keep there configuration, * I want to manage users and groups using srvtools.exe I use tdbsam, posix acls work fine and samba (3.0.14a) runs as a PDC. My problems are : * On windows (with administrator account), some directories don't have the acl (security) panel, * On other directories, the panel is present but I cannot modify permissions, If you specify that the admin user is root, the administrator user don't have the right to admin the system. * Users configurations are never stored locally, * Creating new users with srvtools not possible, * How to keep old users windows configuration when entering the domain ? * No way to find a good tutorial answering my needs... SAMBA-HOWTO-COLLECTION and samba by-example in samba web-site Here is my configuration : smb.conf : [global] interfaces = 192.168.1.120/24 enable privileges = yes nt acl support = yes security = user netbios name = FSERVER workgroup = FWSERVER passdb backend = tdbsam server string = File Server add user script = /usr/sbin/useradd -m '%u' add group script = /usr/sbin/groupadd '%g' add user to group script = /usr/sbin/usermod -G '%g' '%u' add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null '%u' logon script = scripts\logon.bat logon path = logon drive = H: domain logons = yes username map = /etc/samba/smbusers admin users = root socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=4096 SO_RCVBUF=4096 encrypt passwords = yes wins support = yes os level = 50 domain master = yes local master = yes preferred master = yes name resolve order = lmhosts host wins bcast preserve case = yes short preserve case = yes unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . [public] writable = yes path = /share/public public = yes create mode = 0777 directory mask = 0777 admin users = root nt acl support = yes [technique] writable = yes path = /share/technique public = no create mode = 0770 directory mask = 0770 valid users= @technique, @admins admin users = root nt acl support = yes [stagiaires] writable = yes path = /share/stagiaires public = no create mode = 0770 directory mask = 0770 valid users= @stagiaires, @admins admin users = root nt acl support = yes [secretariat] writable = yes path = /share/secretariat public = no create mode = 0770 directory mask = 0770 valid users= @secretariat @admins admin users = root nt acl support = yes [finances] writable = yes path = /share/finances public = no create mode = 0770 directory mask = 0770 valid users = @finances @admins admin users = root nt acl support = yes --- My groupmaps seems to be good : System Operators (S-1-5-32-549) - -1 Replicators (S-1-5-32-552) - -1 Guests (S-1-5-32-546) - -1 Domain Admins (S-1-5-21-3171617769-241562045-158900556-512) - admins Power Users (S-1-5-32-547) - -1 Domain Guests (S-1-5-21-3592376627-3846121942-908627037-514) - -1 Domain Users (S-1-5-21-3592376627-3846121942-908627037-513) - -1 Print Operators (S-1-5-32-550) - -1 Administrators (S-1-5-32-544) - admins Domain Users (S-1-5-21-3171617769-241562045-158900556-513) - ntusers Account Operators (S-1-5-32-548) - -1 Secretariat (S-1-5-21-3171617769-241562045-158900556-3003) - secretariat Technique (S-1-5-21-3171617769-241562045-158900556-3005) - technique Finances (S-1-5-21-3171617769-241562045-158900556-3007) - finances Stagiaires (S-1-5-21-3171617769-241562045-158900556-3009) - stagiaires Domain Guests (S-1-5-21-3171617769-241562045-158900556-514) - -1 Backup Operators (S-1-5-32-551) - -1 Users (S-1-5-32-545) - -1 Thx for help. Max -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba --- Stéphane PURNELLE [EMAIL PROTECTED] Service Informatique Corman S.A. Tel : 00 32 087/342467-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: [SLE] printer loss [susepro 9.1]
Hi Johannes and others, Your analysis made a lot of sense to me and I have been trying to see where port 631 has been used: I found that I had added port 631 to the firewall and the /etc/samba/smb.conf I eliminated both and tried to start cupsd ... the result is not clear: http://localhost:631/ goes howhere west:/home/scn # cupsd cupsd: Child exited with status 98! I am not sure what status 98 and child mean? I also tried to get the yast printer configuation tool to complete but it is still stalling in the `load current settings´ phase of the printer definition. Is there a command/function which will let me find out where/how port 631 is being used? I also feel, no proof, that the problem has to do with the interaction of samba3.0.9-2.6-suse and susepro9.1 because the printer-loss and yast-printer-definition stall occurred with both machines - each has a different printer. Both were in samba. Any thoughts? I look forward to resolving this problem. On Mon, 2005-08-01 at 08:22, Johannes Meixner wrote: Hello, On Monday 01 August 2005 03:25, Serge Naggar wrote: E [31/Jul/2005:18:40:04 -0400] StartListening: Unable to bind socket - Address already in use. Some other program or service has posr 631 already in use. It may happen that the other program has finished so that cupsd would start fine later. It may happen that the other sevice still has the port 631 in use so that you must stop the other sevice, start cups and then start the other sevice. The reason is that the other program or service simply uses any free port and by accident it may use the IPP port. Kind Regards Johannes Meixner -- SUSE LINUX Products GmbH, Maxfeldstrasse 5 Mail: [EMAIL PROTECTED] 90409 Nuernberg, GermanyWWW: http://www.suse.de/ -- Cheers, Serge [Naggar Consulting] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Beta Version Windows Longhorn/Vista cant connect to samba
Does anyone now if Vista will support NT/Samba domains or just Active Directory domains? Since NT is out of support since last year, Vista wouldn't have to support them (and thus not being able to join Samba domains either). On 8/4/05, Jeremy Allison [EMAIL PROTECTED] wrote: On Thu, Aug 04, 2005 at 11:59:29AM +0200, Mark Coetser wrote: Hi Ppl Running the following Debian Stable (sarge) Samba version 3.0.14a-Debian I have had the following running fine as a domain controller with an ldap backend, I have windows 2000 and windows xp machines logged into the domain and all working 100%. I recently got hold of the 32bit version of windows vista/longhorn and decided to install it and try it out, when trying to connect to the shares on the samba server it comes up with a login, when trying all types of login combinations ie domain\user, user etc etc it just pops up the login again, in the samba logs for both the daemons and the workstation I am seeing nothing but This is something that Andrew Bartlett has *just* (this week) fixed here at the CIFS conference. The fix will be in 3.0.20 when it is officially released, and in the next 3.0.20 release candidate. Andrew fixed it within about 1-2 hours of first seeing a Windows vista system, which I think was pretty good going :-). As it's not officially out yet we won't officially support it until Microsoft does, but we will track the betas. Jeremy. -- 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
[Samba] totally confused, samba flipflop fuctionality
It's working from the linux box and not the xp then it's not Yes I try making corrections and this probably accounts for the confusion and broken samba communication. I just never seem to be able to come up with a working working configuration. Exception: smbclient; I can mount the XP share in a directory on my Linux box or at least the last time I checked. I have to turn off the linux firewall to do this. But I'd rather be able to select a gui like my file manager by GNOME on my Fedora linux box to view my XP shared folders. I have had this working up until yesterday. In recent months that's all I've had working. Back when I ran FC1 I think I had communication both way's. On the Windows box I created a Linux user account. In this account I created only shared folders. This is the account that has loaded using either smbclient. I just check this and it is still working for me ! When mounted I can view the files on my XP /familypc/linux/linuxshare in the mounted folder on my FC3 box which is where I'm sitting and writing this message from. I just added a 2nd linux box running FC4. This a home network with 3 machines. Two Linux boxes and a XP. I have the same smb.conf setting on my FC4 with this exception: netbios name = Samba Server on FC4 The XP is setup with a computer name assigned as familypc The XP is setup with a workgroup name assigned as SUNRISE When trying to access from the XP from the Microsoft Windows Network - SUNRISE I get: Two Icons (presently) familypc and Samba Server on FC4 note: the Samba Server on FC3 is not displayed Microsoft wizard setups ask questions like: ...my computer is part of a business network or ... my compute is for home use Well I do have a network but it's not a business network how do I answer this? another question Microsoft wizard asks is: my computer network uses a domain name or my computer network does not use a domain name As far as I know I havn't assigned a domain name on either the XP or the FC3 or FC4 machines. How do I confirm this? Follows is my smb.config settings: workgroup = SUNRISE netbios name = Samba Server on FC3 printcap name = /etc/printcap load printers = yes cups options = raw max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 dns proxy = no # Share Definitions == idmap uid = 16777216-33554431 idmap gid = 16777216-33554431 template shell = /bin/false winbind use default domain = no security = share ;encrypt passwords = yes guest ok = yes ;encrypt passwords = yes ;guest account = nobody ;encrypt passwords = yes ;guest account = nobody ;encrypt passwords = yes ;guest account = nobody ;encrypt passwords = yes ;guest account = nobody ;guest account = nobody ;encrypt passwords = yes ;guest ok = no ;guest account = nobody [homes] comment = Home Directories browseable = no writeable = yes printers] comment = All Printers path = /var/spool/samba browseable = no craigshare] comment = workgroup is - fc3 path = /home/craig/craigshare valid userse = craig linux writeable = yes guest ok = yes browseable = yes If you need more info on my sytems please let me know. If it's linux info it would help if you know the command or where abouts of the info you need in order to help me out thank you craig __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbind UID/GID mapping
I have read with great interest the chapter on IDMAP in the Samba 3 HOWTO. I was hoping to get some clarification from someone in the know as to the feasibility of using winbind in may setup. Here is what I want to do: 1. I would like to use winbind for a single sign on (SSO) type solution for integrating my linux clients with AD. The goal here is to eliminate local accounts from my linux boxes so that I can take advantage on account policies that we have set up in AD. 2. I would be perfectly happy to use the IDMAP_RID option with winbind since it allows for consistent UID/GID mapping across multiple linux clients except for one complication... 3. We have a group of existing solaris accounts that we have already synchronized linux UID/GIDs to and I don't want to change that. We need to maintain the capability of sharing files, etc. via NFS between the Unix and Linux machines. 4. So, I want winbind to map SIDs to UIDs in a very specific way. From what I've read, IDMAP with ldap will do that for me. My question: If I use IDMAP with ldap to map SIDs to UIDs in a way that will maintain consistency with our existing unix accounts, will the Linux machines still use winbind as the authentication mechanism, or will that be handed over to ldap? I really want password policies like aging, etc to come from Active Directory, not from LDAP. All I want from LDAP is to provide the specific mapping of SIDs to UIDs for my setup. Nothing more. Is this possible? Is it the preferred way to do this? And if so, can anyone give me a brief description of the relevant setup parameters? (i.e. smb.conf, nsswitch.conf, ldap settings). I'm not looking for anything too detailed, just enough to get a reasonably knowledgeable person started down the right path. Thanks for your time. Craig This email message is for the sole use of the intended recipient(s) and may contain privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Mapping HPUX to Windows Shared Directories
Samba Community: In the event there are other HPUX users who may be interested in the answer to this question, I am forwarding the following response which I received from Hewlett Packard: Tony, From the verbiage in your original case I kind of suspected this may be want you wanted to do. Unfortunately Samba is not the product that will allow you to accomplish this goal. Samba only allows you to share out Unix file systems and printers for use by Windows/SMB clients. What you want is a product called CIFS/9000 Client. The CIFS Client application makes the HPUX Server a SMB Client, allowing you to mount a Windows share onto the Unix server for use by your Unix users and programs. It would allow you to mount the docs share onto your Unix box. If you do not have CIFS/9000 Client installed on the system you can download the latest version here: https://h20293.www2.hp.com/portal/swdepot/try.do?productNumber=B8724AA the most current version is the A.02.01. This product does require a system reboot when installing. I am attaching a copy of the Installation and Administration Guide for the product to this email. Some key points: - You can mount the Windows shares manually, using either the Unix mount command or a command called cifsmount. You can also place your mounts in the /etc/fstab file. - Security is maintained by the Windows server exporting the share, this means that EACH and EVERY user/process that wants to access the mounted file system must be authenticated as a valid Windows user. It is unlike NFS where once it's there anyone can access it. Authentication is done on a per user basis, unless you setup what is knows as guest access, where everyone looks like the same generic Windows account. - CIFS Client does NOT support file locking across the mount, it will cause your program to hang very often. - The Unix users can be authenticated either using NTLM or Kerberos by the Windows server. This is configured in the cifsclient configuration file, and is one of the very few changes you should make to this file (unlike Samba where you modify many things). Please review the documentation and let me know if you have any specific questions regarding the CIFS Client product. Regards, Keith Lautenschlager Senior Response Center Engineer Hewlett-Packard Corporation Office Hours: 7 a.m. - 4 p.m. EDT -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf Of Tony Gardner Sent: Wednesday, August 03, 2005 2:03 PM To: samba@lists.samba.org Subject: [Samba] Mapping HPUX to Windows Shared Directories I need to know what the command would be to map an HPUX directory to a Windows shared directory. I am running Samba 3.0.7 on HPUX 11i and have Windows Server 2003. Any help would be greatly appreciated. Regards, Tony Gardner UNIX Contractor Haas Automation, Inc. -- 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] Mapping HPUX to Windows Shared Directories
Hi Tony, I am not sure that I understand your question, but it may be that you have a share on your W2003 server that you want to map from your HP-UX system. If this is true, then you need to use the HP CIFS Client. If you need help with the CIFS Client, email me off-list and I'll help you out. If I mis-understood your question, then re-state the question to help me out. Thanks, Eric Roseme Hewlett-Packard Tony Gardner wrote: I need to know what the command would be to map an HPUX directory to a Windows shared directory. I am running Samba 3.0.7 on HPUX 11i and have Windows Server 2003. Any help would be greatly appreciated. Regards, Tony Gardner UNIX Contractor Haas Automation, Inc. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] [ADMIN] Changing list to members-only posting
Hi everyone. In reaction to the escalating spam problem I'm trialling turning on member-only posting for a week or so. Hopefully this should make the list a bit nicer for everyone but at the expense of posters requiring to join the list. Tim. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] [ADMIN] Testing non-member posting to list
Testing non-member posting to the Samba list. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Unix server joining NT4 Domain--User question
Hi, I have recently installed samba 3.0.14a on an AIX 5.2.0.6 server. I have joined the AIX server to a NT4 domain called ESC. When I do a wbinfo -u I get the users of the domain. I then setup a share psoft that I want to be read only to everybody but 5 users. Those 5 users I've added to the write list of that share. I also setup the force user and force group of the share to be psoft and psoft respectively. These 5 users do not know how to login to the psoft unix user due other things that unix user does. This share is basically a read only share of the application files which are on the server. Only 5 people apply patches to the software. The read only is working. The users can be authenticated and work _only_ if I add a matching unix user in /etc/passwd. Due to recent audit problems, I do not want to make unix users at all (Besides, I'm force user/group'ing anyways). Is it not possible to have an NT4 PDC authenticate a user and that user _not_ exist as a unix user? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Machine account setup fail
Hi all I am trying to set up a Ubuntu Samba server from scratch. I did this last year with 2.2. I need a PDC and roaming profiles. Problem is I can't join the domain with my lone test PC running NT4. I am getting a message saying that the machine account cant be established. Her is the log data; 2005/08/03 20:30:08, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2324) _samr_create_user: Running the command `/usr/sbin/useradd -s /bin/ false \-d /dev/null l200772$' gave 1 useradd: unable to lock password file Testparm runs oK, I have encrypt password = yes, I have been studying the Official Samba 3 How to guide but can't figure this out. I can net use the server from the client and map a home share. Smbclient gives me : [EMAIL PROTECTED]:~$ smbclient -L Ubuntu Password: Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Sharename Type Comment - --- print$ Disk Printer Drivers HomeDisk Home folders IPC$IPC IPC Service (ubuntu server (Samba, Ubuntu)) ADMIN$ IPC IPC Service (ubuntu server (Samba, Ubuntu)) Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Server Comment ---- GATEWAY Gateway (Xandros Desktop) UBUNTU ubuntu server (Samba, Ubuntu) WorkgroupMaster ---- HOME L200772 MDKGROUP LOCALHOST TCCGIRLS UBUNTU Note: MDKGROUP has Samba services turned off and L200772 is the NT workstation that I am trying to join the domain with. Any ideas? Thanks Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] how can i add group policy in samba
Hi all, I am new to samba. I have created samba as PDC. I want to restrict users for changing settings. I have configured all client machines with XP. How can i use Group Policy with netlogon. Thanks in advance. Regards, Saravanan __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Machine account setup fail
Hi, I also got the same error when i tried to add machine account with the add user script. add user script = /usr/sbin/useradd -d /dev/null -g 1 -s /bin/false -M %u You first create machine account manually from the shell. After that you can join machine in the domain. Regards, Saravanan --- Mark Wright [EMAIL PROTECTED] wrote: Hi all I am trying to set up a Ubuntu Samba server from scratch. I did this last year with 2.2. I need a PDC and roaming profiles. Problem is I can't join the domain with my lone test PC running NT4. I am getting a message saying that the machine account cant be established. Her is the log data; 2005/08/03 20:30:08, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2324) _samr_create_user: Running the command `/usr/sbin/useradd -s /bin/ false \-d /dev/null l200772$' gave 1 useradd: unable to lock password file Testparm runs oK, I have encrypt password = yes, I have been studying the Official Samba 3 How to guide but can't figure this out. I can net use the server from the client and map a home share. Smbclient gives me : [EMAIL PROTECTED]:~$ smbclient -L Ubuntu Password: Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Sharename Type Comment - --- print$ Disk Printer Drivers HomeDisk Home folders IPC$IPC IPC Service (ubuntu server (Samba, Ubuntu)) ADMIN$ IPC IPC Service (ubuntu server (Samba, Ubuntu)) Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Server Comment ---- GATEWAY Gateway (Xandros Desktop) UBUNTU ubuntu server (Samba, Ubuntu) WorkgroupMaster ---- HOME L200772 MDKGROUP LOCALHOST TCCGIRLS UBUNTU Note: MDKGROUP has Samba services turned off and L200772 is the NT workstation that I am trying to join the domain with. Any ideas? Thanks Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] need help in solving the metion problem,
I am trying to install printer drivers on XP workstation using APW, and the printers are avalible on linux box (server) and shared over network using samba 3.0. I could add printer, associate driver, delete driver using rpcclient. But the requirement is that the printer will be added using rpcclient and user must be able to add drivers using APW method locally on XP/Windows system. When ever I tired to do this, by double clicking on the printer at explore, it is trying to locate driver and asking for the installation. If I opt for installation, though the printer drivers are available it is giving error message windows cannot locate a suitable printer driver. Contact your administrator for help locating and installing a suitable driver. Here are the my configuration detail, [printers] available = yes browseable = yes comment = All Printers path = /var/ispQ guest ok = yes printable = yes writeable = no public = yes [print$] path = /usr/project/isp/var/printers guest ok = yes browseable = yes read only = yes write list = root @printeradmin admin users = root @printeradmin create mask = 0777 directory mask = 0777 force create mode = 0777 directory mode = 0777 force directory mode = 0777 [global] load printers = yes local master = no dns proxy = no winbind gid = 1-2 winbind uid = 1-2 guest ok = yes printing = lprng show add printer wizard = yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 #log level = 10 log file = /var/samba/smbd.log addprinter command = /scripts/addprinter enumports command = /scripts/listports printcap name = name encrypt passwords = yes guest account = guest max connections = 50 lock directory = /var/locks username map = /etc/samba/smbusers browseable = yes please help me in solving this problem. The same configuration did work fine with samba 2.X version. This started occured when we migrated to samba3.0 Tekkem __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Establishing an Extensible Directory Service with OpenLDAP - Part 1
Establishing an Extensible Directory Service with OpenLDAP - Part 1 August 4th, 2005 by Dustin A. Dortch In this series we will look into the use of OpenLDAP as a core service in a network infrastructure. Our key concerns will be extensibility, security, reliability, and ease of use. Directories are becoming common place is network infrastructures. With Microsoft Active Directory and Novell eDirectory/NDS use of LDAP to provide their core services, we have further validation of that fact. Another positive fact is that Samba has great LDAP integration and is often used for single sign-on (SSO) purposes. Read full text... http://www.sambadmin.com/sambadmin/?postid=10 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Machine account setup fail
Check that your user scripts are in that path, that looks like the default, you may need to adjust the path to match yours. If you are using IDEALX scripts, then the path should point to /opt/IDEALX/sbin/smbldap-useradd. --mark - Original Message - From: Saravanan [EMAIL PROTECTED] To: Mark Wright [EMAIL PROTECTED]; samba@lists.samba.org Sent: Thursday, August 04, 2005 3:02 PM Subject: Re: [Samba] Machine account setup fail Hi, I also got the same error when i tried to add machine account with the add user script. add user script = /usr/sbin/useradd -d /dev/null -g 1 -s /bin/false -M %u You first create machine account manually from the shell. After that you can join machine in the domain. Regards, Saravanan --- Mark Wright [EMAIL PROTECTED] wrote: Hi all I am trying to set up a Ubuntu Samba server from scratch. I did this last year with 2.2. I need a PDC and roaming profiles. Problem is I can't join the domain with my lone test PC running NT4. I am getting a message saying that the machine account cant be established. Her is the log data; 2005/08/03 20:30:08, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2324) _samr_create_user: Running the command `/usr/sbin/useradd -s /bin/ false \-d /dev/null l200772$' gave 1 useradd: unable to lock password file Testparm runs oK, I have encrypt password = yes, I have been studying the Official Samba 3 How to guide but can't figure this out. I can net use the server from the client and map a home share. Smbclient gives me : [EMAIL PROTECTED]:~$ smbclient -L Ubuntu Password: Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Sharename Type Comment - --- print$ Disk Printer Drivers HomeDisk Home folders IPC$IPC IPC Service (ubuntu server (Samba, Ubuntu)) ADMIN$ IPC IPC Service (ubuntu server (Samba, Ubuntu)) Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Server Comment ---- GATEWAY Gateway (Xandros Desktop) UBUNTU ubuntu server (Samba, Ubuntu) WorkgroupMaster ---- HOME L200772 MDKGROUP LOCALHOST TCCGIRLS UBUNTU Note: MDKGROUP has Samba services turned off and L200772 is the NT workstation that I am trying to join the domain with. Any ideas? Thanks Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs -- 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] how can i add group policy in samba
when you say change settings are you referring to the client machine? if so, then there are a number of ways to do this. 1. By using user profiles 2. If you set this server up as an LDAP server, then you can manage the groups the same way you would manage the groups on a Win2000 Server, with the help Poledit.exe. 3. On the client by using gpedit.msc --mark - Original Message - From: Saravanan [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Thursday, August 04, 2005 2:57 PM Subject: [Samba] how can i add group policy in samba Hi all, I am new to samba. I have created samba as PDC. I want to restrict users for changing settings. I have configured all client machines with XP. How can i use Group Policy with netlogon. Thanks in advance. Regards, Saravanan __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail -- 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] Machine account setup fail
Hi mark, Thanks for your reply. I think /opt/IDEALX/sbin/smbldap-useradd is used to add users in ldap directory. But we are using samba as PDC without ldap support. When we try to join machine it should create machine account using the following [global] option add user script = /usr/sbin/useradd -d /dev/null -g 1 -s /bin/false -M %u Regards, Saravanan --- Mark Sarria [EMAIL PROTECTED] wrote: Check that your user scripts are in that path, that looks like the default, you may need to adjust the path to match yours. If you are using IDEALX scripts, then the path should point to /opt/IDEALX/sbin/smbldap-useradd. --mark - Original Message - From: Saravanan [EMAIL PROTECTED] To: Mark Wright [EMAIL PROTECTED]; samba@lists.samba.org Sent: Thursday, August 04, 2005 3:02 PM Subject: Re: [Samba] Machine account setup fail Hi, I also got the same error when i tried to add machine account with the add user script. add user script = /usr/sbin/useradd -d /dev/null -g 1 -s /bin/false -M %u You first create machine account manually from the shell. After that you can join machine in the domain. Regards, Saravanan --- Mark Wright [EMAIL PROTECTED] wrote: Hi all I am trying to set up a Ubuntu Samba server from scratch. I did this last year with 2.2. I need a PDC and roaming profiles. Problem is I can't join the domain with my lone test PC running NT4. I am getting a message saying that the machine account cant be established. Her is the log data; 2005/08/03 20:30:08, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2324) _samr_create_user: Running the command `/usr/sbin/useradd -s /bin/ false \-d /dev/null l200772$' gave 1 useradd: unable to lock password file Testparm runs oK, I have encrypt password = yes, I have been studying the Official Samba 3 How to guide but can't figure this out. I can net use the server from the client and map a home share. Smbclient gives me : [EMAIL PROTECTED]:~$ smbclient -L Ubuntu Password: Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Sharename Type Comment - --- print$ Disk Printer Drivers HomeDisk Home folders IPC$IPC IPC Service (ubuntu server (Samba, Ubuntu)) ADMIN$ IPC IPC Service (ubuntu server (Samba, Ubuntu)) Anonymous login successful Domain=[TCCGIRLS] OS=[Unix] Server=[Samba 3.0.14a-Ubuntu] Server Comment ---- GATEWAY Gateway (Xandros Desktop) UBUNTU ubuntu server (Samba, Ubuntu) WorkgroupMaster ---- HOME L200772 MDKGROUP LOCALHOST TCCGIRLS UBUNTU Note: MDKGROUP has Samba services turned off and L200772 is the NT workstation that I am trying to join the domain with. Any ideas? Thanks Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] how can i add group policy in samba
when you say change settings are you referring to the client machine? if so, then there are a number of ways to do this. 1. By using user profiles 2. If you set this server up as an LDAP server, then you can manage the groups the same way you would manage the groups on a Win2000 Server, with the help Poledit.exe. This statement is a little bit off. With a Windows 200x ADC you use Group Policies to do most of this type of work. With a WinNT DC you use poledit.exe and the NTConfig.POL style policy file. With a Samba controlled domain you cannot do ADC Group Policies, but you can utilize the NTConfig.POL method. 3. On the client by using gpedit.msc --mark - Original Message - From: Saravanan [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Thursday, August 04, 2005 2:57 PM Subject: [Samba] how can i add group policy in samba Hi all, I am new to samba. I have created samba as PDC. I want to restrict users for changing settings. I have configured all client machines with XP. How can i use Group Policy with netlogon. Thanks in advance. Regards, Saravanan __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail -- 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 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Help ! compatibility between SRVTOOLS and Samba-PDC
I want to use NT4's SRVTOOLS to manage the Samba-PDC,But when i use it ,i mean ,when i add a account for windows,Samba can only receive the username from the tool. The others ,such as logon_path,Fullname and Description cannot be received by samba. Is some thing wrong with samba? what can i do ? I add the information of a user to the LDAP-server by LDIF-file handly .It works fine.And the SRVTOOLS can read it correctly. Can samba receive all the informations from SRVTOOLS? And my smb.conf is configured as this : -- # Global parameters [global] workgroup = TECH.JSLC netbios name = PDC-SRV security = user enable privileges = yes server string = Samba Server %v encrypt passwords = Yes ldap passwd sync = Yes unix password sync = Yes passwd program = /usr/sbin/smbldap-passwd %u passwd chat = Changing password for*\nNew password* %n\n *Retype new password* %n\n passwd chat debug = Yes log level = 0 syslog = 0 log file = /var/log/samba/log.%m max log size = 10 time server = Yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 mangling method = hash2 Dos charset = 850 Unix charset = ISO8859-1 logon script = hello.vbs logon drive = H: logon home = \\%L\%u file://%25L/%25u logon path = \\%N\profiles\%u file://%25N/profiles/%25u domain logons = Yes domain master = Yes os level = 65 preferred master = Yes wins support = yes passdb backend = ldapsam:ldap://127.0.0.1/ ldap admin dn = cn=admin,dc=tech,dc=jslc ldap suffix = dc=tech,dc=jslc ldap group suffix = ou=Groups ldap user suffix = ou=Users ldap machine suffix = ou=Computers add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add machine script = /usr/sbin/smbldap-useradd -w %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/sbin/smbldap-usermod -g '%g' '%u' [homes] comment = Home Directories browseable = no writable = no create mask = 0700 directory mask = 0700 [netlogon] path = /home/netlogon/ browseable = No read only = yes [profiles] path = /home/profiles read only = no create mask = 0600 directory mask = 0700 browseable = No guest ok = Yes --- When i use the SRVTOOLS to add someone ,for example , i add a account who is andy,and its User Profile Path is \\PDC-SRV\profiles\andyfile://PDC-SRV/profiles/andy,Logon Script Name is hello.vbs,and he is a member of Account Operators,Backup Operators,Domain Admins. When i add it, as the parameter add user script = is set to add user script = /usr/sbin/smbldap-useradd -m %u ,this mean that ,this script smbldap-useradd will be executed,but the script has only a argument (%u). I mean ,can the other information User Profile ,Logon Script Name ,etc. be received by samba ? I know that %u means andy.And what's for the others? Off couse,when i write all the info. into a LDIF-File ,then i use ldapadd to add it to LDAP-Server. The SRVTOOLS can read it all. Thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Help! About SAMBA_PDC and SRVTOOLS
I want to use NT4's SRVTOOLS to manage the Samba-PDC,But when i use it ,i mean ,when i add a account for windows,Samba can only receive the username from the tool. The others ,such as logon_path,Fullname and Description cannot be received by samba. Is some thing wrong with samba? what can i do ? I add the information of a user to the LDAP-server by LDIF-file handly .It works fine.And the SRVTOOLS can read it correctly. Can samba receive all the informations from SRVTOOLS? And my smb.conf is configured as this : -- # Global parameters [global] workgroup = TECH.JSLC netbios name = PDC-SRV security = user enable privileges = yes server string = Samba Server %v encrypt passwords = Yes ldap passwd sync = Yes unix password sync = Yes passwd program = /usr/sbin/smbldap-passwd %u passwd chat = Changing password for*\nNew password* %n\n *Retype new password* %n\n passwd chat debug = Yes log level = 0 syslog = 0 log file = /var/log/samba/log.%m max log size = 10 time server = Yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 mangling method = hash2 Dos charset = 850 Unix charset = ISO8859-1 logon script = hello.vbs logon drive = H: logon home = \\%L\%u logon path = \\%N\profiles\%u domain logons = Yes domain master = Yes os level = 65 preferred master = Yes wins support = yes passdb backend = ldapsam:ldap://127.0.0.1/ ldap admin dn = cn=admin,dc=tech,dc=jslc ldap suffix = dc=tech,dc=jslc ldap group suffix = ou=Groups ldap user suffix = ou=Users ldap machine suffix = ou=Computers add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add machine script = /usr/sbin/smbldap-useradd -w %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/sbin/smbldap-usermod -g '%g' '%u' [homes] comment = Home Directories browseable = no writable = no create mask = 0700 directory mask = 0700 [netlogon] path = /home/netlogon/ browseable = No read only = yes [profiles] path = /home/profiles read only = no create mask = 0600 directory mask = 0700 browseable = No guest ok = Yes --- When i use the SRVTOOLS to add someone ,for example , i add a account who is andy,and its User Profile Path is \\PDC-SRV\profiles\andy ,Logon Script Name is hello.vbs,and he is a member of Account Operators,Backup Operators,Domain Admins. When i add it, as the parameter add user script = is set to add user script = /usr/sbin/smbldap-useradd -m %u ,this mean that ,this script smbldap-useradd will be executed,but the script has only a argument (%u). I mean ,can the other information User Profile ,Logon Script Name ,etc. be received by samba ? I know that %u means andy.And what's for the others? Off couse,when i write all the info. into a LDIF-File ,then i use ldapadd to add it to LDAP-Server. The SRVTOOLS can read it all. Thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] WinXP maps home drive to logon home
Ron Smith wrote: Hi, I am having a logon home problem. I have a mixture of Win98 and WinXP machines and regardless which I use to connect to the Samba server, it will try to map the home drive to what I have set the logon home = to. That's not quite correct, only the WinXP machine will try to use the value of logon home as the home folder. This is the line .. logon home = \\%N\profile.%U The user is admin This is the error I see in the syslog from a Win98 Machine: lab_thinkpad (192.168.30.180) couldn't find service profile.admin and from a WinXP machine: genserv-lab4 (192.168.30.184) couldn't find service profile.admin If I create a folder in the home share called profile.admin, then WinXP will map the Home drive to it instead of the parent of profile.admin. If I remove the logon home line from the smb.conf file, WinXP will map the Home drive to the home share root correctly, but the Win98 client will put the profile information in the home share root, and I want it in a folder called profile.%U under the home share. I'm replying to my own post I still don't know why a Windows XP machine will try to use the logon home value as it's home folder instead of what's in the /etc/passwd file on the Samba PDC, but until I find out, I came up with a work-around. I changed logon home = \\%N\profile.%U to logon home = \\%N\profile.%a, so that when a user at a Win98 machine logs on, his profile is stored in the profile.Win95 folder. When that user is at a WinXP machine and logs on, it looks for a profile.WinXP folder, doesn't find it and uses the correct home folder instead. R Smith -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Low throughput on high bandwidth delay network
Hi, I am trying to use samba with a high latency (100ms) and bandwidth ( 1 Gbps) network. Both the samba server and client run 2.6.9-5.0.3 linux kernel. I am testing performance from a share mounted by smbmount on the client. The performance is pretty low as each packet sent during RTT is just 4KB. I tried to increase the following parameters in smb.conf socket options = TCP_NODELAY IPTOS_THROUGHPUT SO_SNDBUF=16777 SO_RCVBUF=1677 block size = 1048576 read size = 1048576 read prediction = true read raw = yes max xmit = 1048576 packet size = 1048576 No effect on the throughput. It hovers around 400 kbps. Any input on how to fill the network with larger read requests would be very much appreciated. Thanks, Praveen __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Help! About SAMBA_PDC and SRVTOOLS
On Fri, 5 Aug 2005 01:40 pm, kunyliu wrote: I want to use NT4's SRVTOOLS to manage the Samba-PDC,But when i use it ,i mean ,when i add a account for windows,Samba can only receive the username from the tool. The others ,such as logon_path,Fullname and Description cannot be received by samba. Is some thing wrong with samba? what can i do ? I add the information of a user to the LDAP-server by LDIF-file handly .It works fine.And the SRVTOOLS can read it correctly. Can samba receive all the informations from SRVTOOLS? What's so hard about using even like Webmin/SWAT for that? -- illawarra computer services stephen kuhn mobile: 0410-728-389 illawarra and regional new south wales - windows/mac/linux home and business solutions fix it right. fix it now. fix it right now. - Booze is the answer. I don't remember the question. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems with 3.0.20rc1 and International Characters
Hi, I am having some problems with copying file with international characters (icelandic) to my samba server from OS X 10.4.2. I had to upgrade to Samba 3.0.20rc1 as I'm running Fedor Core 4 and Samba 3.0.14 which ships with FC 4 doesn't work at all with OS X 10.4.2. When I try to copy for example the folder named Múm the finder just gives an error message saying invalid character. But when I copy the same folder to a boc Running FC 3 with Samba 3.0.8 it works fine. Is there any way to fix this problem apart from downgrading to Samba 3.0.8?. Thanks Mike -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r9054 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2005-08-04 06:14:34 + (Thu, 04 Aug 2005)
New Revision: 9054
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9054
Log:
removed incorrect paranoia check on opening streams (this caused RAW-STREAMS to
fail)
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-08-04 05:46:17 UTC
(rev 9053)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-08-04 06:14:34 UTC
(rev 9054)
@@ -1075,9 +1075,6 @@
/* if this was a stream create then create the stream as well */
if (!name-stream_exists) {
- if (!(access_mask SEC_FILE_WRITE_ATTRIBUTE)) {
- return NT_STATUS_ACCESS_DENIED;
- }
status = pvfs_stream_create(pvfs, f-handle-name, fd);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(lck);
svn commit: samba r9055 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba: .
Author: metze
Date: 2005-08-04 06:52:58 + (Thu, 04 Aug 2005)
New Revision: 9055
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9055
Log:
fix header generation for string_array and some other scalar types
the are actualy mapped to pointers in the api
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm
2005-08-04 06:14:34 UTC (rev 9054)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm
2005-08-04 06:52:58 UTC (rev 9055)
@@ -62,7 +62,7 @@
next if is_constant($_);
$numstar++;
}
- $numstar-- if ($element-{TYPE} eq string);
+ $numstar-- if
Parse::Pidl::Typelist::scalar_is_reference($element-{TYPE});
pidl * foreach (1..$numstar);
pidl $element-{NAME};
foreach (@{$element-{ARRAY_LEN}}) {
svn commit: samba r9056 - in branches/SOC/SAMBA_3_0/source: include libmsrpc libmsrpc/test
Author: skel Date: 2005-08-04 07:27:25 + (Thu, 04 Aug 2005) New Revision: 9056 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9056 Log: added functions to manipulate privileges (lsa) and some test programs. added privlege constants and info class constsants (which need to be fixed) Added: branches/SOC/SAMBA_3_0/source/libmsrpc/test/ear.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/lsaaddrights.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/lsaenumprivs.c Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/Makefile Changeset: Sorry, the patch is too large (1194 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9056
svn commit: lorikeet r393 - in trunk/sangria/src/LatestDesign: classes classes/AccountManager classes/ServerObjects test
Author: amit Date: 2005-08-04 08:57:40 + (Thu, 04 Aug 2005) New Revision: 393 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=393 Log: updated files with elaborated testing on the GroupManagerClass Added: trunk/sangria/src/LatestDesign/classes/AccountManager/ trunk/sangria/src/LatestDesign/classes/AccountManager/AccountManagerClass.py Removed: trunk/sangria/src/LatestDesign/classes/ServerObjects/AccountsClass.py Modified: trunk/sangria/src/LatestDesign/classes/ServerObjects/FileShareClass.py trunk/sangria/src/LatestDesign/classes/ServerObjects/PrintShareClass.py trunk/sangria/src/LatestDesign/classes/ServerObjects/ServerClass.py trunk/sangria/src/LatestDesign/test/test.py Changeset: Sorry, the patch is too large (808 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=393
svn commit: samba r9057 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2005-08-04 15:07:17 + (Thu, 04 Aug 2005) New Revision: 9057 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9057 Log: fix cut-and-paste error Modified: branches/SAMBA_3_0/source/VERSION Changeset: Modified: branches/SAMBA_3_0/source/VERSION === --- branches/SAMBA_3_0/source/VERSION 2005-08-04 07:27:25 UTC (rev 9056) +++ branches/SAMBA_3_0/source/VERSION 2005-08-04 15:07:17 UTC (rev 9057) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r9058 - in trunk/source: .
Author: herb Date: 2005-08-04 15:09:18 + (Thu, 04 Aug 2005) New Revision: 9058 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9058 Log: fix cut-and-paste error Modified: trunk/source/VERSION Changeset: Modified: trunk/source/VERSION === --- trunk/source/VERSION2005-08-04 15:07:17 UTC (rev 9057) +++ trunk/source/VERSION2005-08-04 15:09:18 UTC (rev 9058) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r9059 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-04 16:10:13 + (Thu, 04 Aug 2005)
New Revision: 9059
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9059
Log:
add a basic credentials object for mimir
Added:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Modified:
branches/SAMBA_4_0/source/scripting/ejs/config.mk
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-04 15:09:18 UTC
(rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-04 16:10:13 UTC
(rev 9059)
@@ -24,6 +24,7 @@
scripting/ejs/smbcalls_string.o \
scripting/ejs/smbcalls_rand.o \
scripting/ejs/smbcalls_sys.o \
+ scripting/ejs/smbcalls_creds.o \
scripting/ejs/mprutil.o
REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
# End SUBSYSTEM SMBCALLS
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-04 15:09:18 UTC
(rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-04 16:10:13 UTC
(rev 9059)
@@ -127,6 +127,7 @@
smb_setup_ejs_string();
smb_setup_ejs_random();
smb_setup_ejs_system();
+ smb_setup_ejs_credentials();
ejsDefineCFunction(-1, typeof, ejs_typeof, NULL,
MPR_VAR_SCRIPT_HANDLE);
ejsDefineStringCFunction(-1, libinclude, ejs_libinclude, NULL,
MPR_VAR_SCRIPT_HANDLE);
Added: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
15:09:18 UTC (rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
16:10:13 UTC (rev 9059)
@@ -0,0 +1,107 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ provide hooks credentials calls
+
+ Copyright (C) Andrew Tridgell 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include scripting/ejs/smbcalls.h
+#include lib/appweb/ejs/ejs.h
+
+/*
+ helper function to get the local objects credentials ptr
+*/
+static struct cli_credentials *ejs_creds_get_credentials(int eid)
+{
+ struct cli_credentials *creds = mprGetThisPtr(eid, creds);
+ if (creds == NULL) {
+ ejsSetErrorMsg(eid, NULL ejs credentials);
+ }
+ return creds;
+}
+
+/*
+ get a domain
+*/
+static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_domain(creds)));
+ return 0;
+}
+
+
+static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
+ return 0;
+}
+
+static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, bad arguments to set_username);
+ return -1;
+ }
+
+ cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ initialise credentials ejs object
+*/
+static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct MprVar *obj = mprInitObject(eid, credentials, argc, argv);
+ struct cli_credentials *creds;
+
+ creds = cli_credentials_init(mprMemCtx());
+ if (creds == NULL) {
+ return -1;
+ }
+
+ cli_credentials_guess(creds);
+ cli_credentials_set_username(creds, , CRED_GUESSED);
+ cli_credentials_set_password(creds, , CRED_GUESSED);
+
+ mprSetPtrChild(obj, creds, creds);
+
+ /* setup our object methods */
+ mprSetCFunction(obj, get_domain, ejs_creds_get_domain);
+ mprSetCFunction(obj,
svn commit: samba r9060 - in branches/SAMBA_4_0/source: .
Author: metze Date: 2005-08-04 16:11:26 + (Thu, 04 Aug 2005) New Revision: 9060 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9060 Log: prepend not overwrite the libs metze Modified: branches/SAMBA_4_0/source/aclocal.m4 Changeset: Modified: branches/SAMBA_4_0/source/aclocal.m4 === --- branches/SAMBA_4_0/source/aclocal.m42005-08-04 16:10:13 UTC (rev 9059) +++ branches/SAMBA_4_0/source/aclocal.m42005-08-04 16:11:26 UTC (rev 9060) @@ -139,7 +139,7 @@ fi LIBS=$ac_func_search_ext_save_LIBS]) AS_IF([test $ac_cv_search_ext_$1 != no], - [test $ac_cv_search_ext_$1 = none required || $3=$ac_cv_search_ext_$1 + [test $ac_cv_search_ext_$1 = none required || $3=$ac_cv_search_ext_$1 $$3 $4], [$5])dnl ])
svn commit: samba r9061 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 16:17:36 + (Thu, 04 Aug 2005)
New Revision: 9061
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9061
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-03 21:01:02 -0600
Start using libnet_Join() for DC join.
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5246
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5249
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:11:26 UTC
(rev 9060)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:36 UTC
(rev 9061)
@@ -22,6 +22,7 @@
#include includes.h
#include lib/cmdline/popt_common.h
+#include libnet/libnet.h
#include librpc/gen_ndr/ndr_drsuapi.h
#include librpc/gen_ndr/ndr_samr.h
#include libcli/ldap/ldap.h
@@ -43,6 +44,7 @@
struct dcerpc_binding *drsuapi_binding;
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
+ struct libnet_context *libnet_ctx;
const char *ldap_url;
const char *domain_dn;
@@ -141,32 +143,23 @@
dn: %s\n
changetype: delete\n,
ctx-new_dc.dc_info2.ntds_dn);
-
- ldb_req = ldb_ldif_read_string(ldb_ctx,ldif);
*/
- /*
-I'm pretty sure this delete fails because dcerpc_drsuapi_DsAddEntry Fails
DCERPC_FAULT_NDR
-in test_CompleteJoin().
-
+ /*
+ This delete fails because dcerpc_drsuapi_DsAddEntry Fails
DCERPC_FAULT_NDR
+ in test_CompleteJoin().
+ */
printf(test_destroy_context(): deleting ntds_dn
%s.\n,ctx-new_dc.dc_info2.ntds_dn);
rtn = ldb_delete(ctx-ldb_ctx,ctx-new_dc.dc_info2.ntds_dn);
if (rtn != 0) {
printf(test_destroy_context(): ldb_delete(ntds_dn)
failed: %s.\n,
ldb_errstring(ctx-ldb_ctx));
+ /* I want ldb_delete(server_dn) to get called.
+ I should just change the ordering or
+ not have this return at all perhaps.
return;
+ */
}
- */
-
-
- /* req = ldap_ldif2msg(ctx, ldif);
-req.messageid = ;
-req-type = LDAP_TAG_DelRequest;
-req-r.DelRequest.dn = ctx-new_dc.dc_info2.ntds_dn;
-req.num_controls = ;
-req.controls = ;
- rtn = ldap_transaction(ctx-admin.ldap.conn, req);
- */
}
{
@@ -177,7 +170,6 @@
dn: %s\n
changetype: delete\n,
ctx-new_dc.dc_info2.server_dn);
- ldb_req = ldb_ldif_read_string(ldb_ctx,ldif);
*/
printf(test_destroy_context(): deleting server_dn
%s.\n,ctx-new_dc.dc_info2.server_dn);
@@ -312,7 +304,7 @@
ctx-schema_dn = talloc_asprintf(ctx, CN=Schema,%s, ctx-config_dn);
ctx-new_dc.dc_info2.server_dn = talloc_asprintf(ctx,
-/*
CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s,
*/
+
/*CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s,*/
CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s,
TEST_MACHINE_NAME, ctx-domain_dn);
@@ -330,6 +322,8 @@
BOOL ret = True;
int rtn;
char *old_dn;
+ struct libnet_Join libnet_r;
+
rtn = ldb_connect(ctx-ldb_ctx,ctx-ldap_url,0,NULL);
if (rtn != 0) {
printf(test_CompleteJoin(): ldb_connect() failed: %s.\n,
@@ -340,6 +334,8 @@
/* userAccountControl: 532480 0x82000
* UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION
+ */
+ /*
ldif = talloc_asprintf(ctx,
dn: %s\n
changetype: modify\n
@@ -348,8 +344,6 @@
ctx-new_dc.dc_info2.computer_dn,
UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
*/
-/* = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;*/
-
ctx-ldb_msg = ldb_msg_new(ctx);
svn commit: samba r9062 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 16:17:47 + (Thu, 04 Aug 2005)
New Revision: 9062
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9062
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-04 10:21:34 -0600
Some more work towards performing a dc join.
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5249
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5250
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:36 UTC
(rev 9061)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:47 UTC
(rev 9062)
@@ -45,6 +45,7 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
+ struct libnet_Join *libnet_r;
const char *ldap_url;
const char *domain_dn;
@@ -123,6 +124,9 @@
ctx-new_dc.invocation_id = GUID_random();
/* ctx-old_dc ...*/
+
+ ctx-ldb_ctx = ldb_init(mem_ctx);
+ ctx-libnet_ctx = libnet_context_init(mem_ctx);
return ctx;
}
@@ -708,30 +712,30 @@
attribute_ctr-num_attributes = i;
-
-
- printf(The libnet_Join struct has a domain_name element. I am
going to assume it is my ldap base dn.\n);
- printf(That said, my ldap base dn is: %s.\n,ctx-domain_dn);
- /* ctx-domain_dn is the ldap dn.*/
- libnet_r.in.domain_name =
talloc_asprintf(ctx,%s,ctx-domain_dn);
+ libnet_r.in.domain_name = ctx-admin.credentials-domain;
libnet_r.in.secure_channel_type = SEC_CHAN_BDC;
- printf(attempting a DC join with libnet_Join()\n);
+ printf(attempting a DC join with
libnet_Join(%s)\n,libnet_r.in.domain_name);
/*
- we get the following error when libnet_Join gets reached,
- probably because we haven't provisioned these ldb's!
- Unable to open tdb '/usr/local/samba/private/secrets.ldb'
- Failed to connect to '/usr/local/samba/private/secrets.ldb'
+ if you haven't run the provision script, you get:
+ Unable to open tdb
'/usr/local/samba/private/secrets.ldb'
+ Failed to connect to
'/usr/local/samba/private/secrets.ldb'
+ when libnet_Join() is called.
+
+ libnet_r.in.domain_name is a netbios domain name.
*/
- status = libnet_Join(ctx-libnet_ctx,ctx,libnet_r);
+
+ status = libnet_Join(ctx-libnet_ctx, ctx, libnet_r);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT))
{
errstr = dcerpc_errstr(ctx,
ctx-admin.drsuapi.pipe-last_fault_code);
}
printf(libnet_Join() failed - %s\n, errstr);
+ printf(libnet_r.out.error_string returned:
%s\n,libnet_r.out.error_string);
ret = False;
}
+
/*
status = dcerpc_drsuapi_DsAddEntry(ctx-admin.drsuapi.pipe,
ctx, r);
if (!NT_STATUS_IS_OK(status)) {
@@ -804,8 +808,10 @@
mem_ctx = talloc_init(torture_rpc_dssync);
ctx = test_create_context(mem_ctx);
+ /*
ctx-ldb_ctx = ldb_init(mem_ctx);
- ctx-libnet_ctx = libnet_context_init(mem_ctx);
+ ctx-libnet_ctx = libnet_context_init(mem_ctx);
+ */
rtn = ldb_connect(ctx-ldb_ctx,ctx-ldap_url,0,NULL);
printf(Connected to %s.\n,ctx-ldap_url);
svn commit: samba r9063 - in branches/SAMBA_4_0/source: . build/m4 lib/netif lib/replace lib/socket
Author: metze Date: 2005-08-04 16:49:17 + (Thu, 04 Aug 2005) New Revision: 9063 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9063 Log: - don't pollute the global $LIBS variable with -ldl - -lresolve seems to not being needed any more (it's actually not used, and the build farm seem to happy with it) - move socket and netif configure test to seperate files - don't pollute the global $LIBS variable with -lsocket ... - actually make use of the -lsocket when needed (should fix the solaris build) metze Added: branches/SAMBA_4_0/source/lib/netif/config.m4 branches/SAMBA_4_0/source/lib/replace/config.m4 Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/lib/socket/config.m4 branches/SAMBA_4_0/source/lib/socket/config.mk Changeset: Sorry, the patch is too large (474 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9063
svn commit: samba r9064 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad Date: 2005-08-04 16:53:51 + (Thu, 04 Aug 2005) New Revision: 9064 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9064 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-04 10:53:00 -0600 Fixed a bug (passing a TALLOC_CTX to libnet_context_init() ) Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c Changeset: Property changes on: branches/SOC/SAMBA_4_0 ___ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5250 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5253 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244 Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c === --- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:49:17 UTC (rev 9063) +++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:53:51 UTC (rev 9064) @@ -45,7 +45,6 @@ struct ldb_context *ldb_ctx; struct ldb_message *ldb_msg; struct libnet_context *libnet_ctx; - struct libnet_Join *libnet_r; const char *ldap_url; const char *domain_dn; @@ -80,7 +79,8 @@ struct drsuapi_DsBindInfoCtr *our_bind_info; const char *binding = lp_parm_string(-1, torture, binding); const char *new_dc_pass; - + struct event_context *event_ctx = NULL; + ctx = talloc_zero(mem_ctx, struct DsSyncTest); if (!ctx) return NULL; @@ -126,7 +126,10 @@ /* ctx-old_dc ...*/ ctx-ldb_ctx = ldb_init(mem_ctx); - ctx-libnet_ctx = libnet_context_init(mem_ctx); + /*libnet_context_init should be passed an event_context *ev, + not a TALLOC_CTX *mem_ctx. + */ + ctx-libnet_ctx = libnet_context_init(event_ctx); return ctx; } @@ -808,10 +811,6 @@ mem_ctx = talloc_init(torture_rpc_dssync); ctx = test_create_context(mem_ctx); - /* - ctx-ldb_ctx = ldb_init(mem_ctx); - ctx-libnet_ctx = libnet_context_init(mem_ctx); - */ rtn = ldb_connect(ctx-ldb_ctx,ctx-ldap_url,0,NULL); printf(Connected to %s.\n,ctx-ldap_url);
svn commit: samba r9065 - in branches/SOC/SAMBA_4_0: . source source/build/pidl/Parse/Pidl/Samba source/build/smb_build source/heimdal_build source/include source/libcli/util source/libnet source/ntvf
Author: brad Date: 2005-08-04 16:54:01 + (Thu, 04 Aug 2005) New Revision: 9065 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9065 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-04 10:56:01 -0600 [EMAIL PROTECTED]: j0j0 | 2005-08-04 10:54:14 -0600 [EMAIL PROTECTED] (orig r9037): mimir | 2005-08-03 20:51:26 -0600 New fields in usermod function - allow_password_change and force_password_change datetime. rafal [EMAIL PROTECTED] (orig r9038): lmuelle | 2005-08-03 20:59:19 -0600 Revert svn rev 414. Discussed with Jerry and Metze. We need the option to add an 'a' if we're already in pre or rc state with the next release. Bugzilla Bug 2618 [EMAIL PROTECTED] (orig r9042): tridge | 2005-08-03 22:20:26 -0600 fixed the valgrind error in the RAW-SFILEINFO test [EMAIL PROTECTED] (orig r9043): tridge | 2005-08-03 22:20:43 -0600 fixed return code in RAW-STREAMS test [EMAIL PROTECTED] (orig r9044): tridge | 2005-08-03 22:21:03 -0600 added a comment so you can see what this test does :-) [EMAIL PROTECTED] (orig r9045): tridge | 2005-08-03 22:21:52 -0600 be friendly towards servers that don't understand the 'share' form for tconx, instead of the \\server\share form [EMAIL PROTECTED] (orig r9046): tridge | 2005-08-03 22:23:08 -0600 fixed display of privileges in RAW-ACLS test [EMAIL PROTECTED] (orig r9047): tridge | 2005-08-03 22:23:40 -0600 show the order of the server/correct output to make it easier to demo this test ;) [EMAIL PROTECTED] (orig r9048): tridge | 2005-08-03 22:24:37 -0600 added a new DOS error code (thanks to EMC) [EMAIL PROTECTED] (orig r9049): metze | 2005-08-03 22:45:42 -0600 - add property dependencies to include/proto.h - make some stuff easier metze [EMAIL PROTECTED] (orig r9050): metze | 2005-08-03 22:53:06 -0600 fix make pch all metze [EMAIL PROTECTED] (orig r9052): jelmer | 2005-08-03 23:23:07 -0600 Support lex/yacc compilers without support for -o [EMAIL PROTECTED] (orig r9053): jelmer | 2005-08-03 23:46:17 -0600 Change order of dependencies (.h files are used when creating the two compilers used for generating the rest of the heimdal files) [EMAIL PROTECTED] (orig r9054): tridge | 2005-08-04 00:14:34 -0600 removed incorrect paranoia check on opening streams (this caused RAW-STREAMS to fail) [EMAIL PROTECTED] (orig r9055): metze | 2005-08-04 00:52:58 -0600 fix header generation for string_array and some other scalar types the are actualy mapped to pointers in the api metze [EMAIL PROTECTED] (orig r9059): tridge | 2005-08-04 10:10:13 -0600 add a basic credentials object for mimir [EMAIL PROTECTED] (orig r9060): metze | 2005-08-04 10:11:26 -0600 prepend not overwrite the libs metze Added: branches/SOC/SAMBA_4_0/source/script/lex_compile.sh branches/SOC/SAMBA_4_0/source/script/yacc_compile.sh branches/SOC/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/VERSION branches/SOC/SAMBA_4_0/source/aclocal.m4 branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm branches/SOC/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SOC/SAMBA_4_0/source/heimdal_build/config.mk branches/SOC/SAMBA_4_0/source/include/doserr.h branches/SOC/SAMBA_4_0/source/libcli/util/nterr.c branches/SOC/SAMBA_4_0/source/libnet/composite.h branches/SOC/SAMBA_4_0/source/libnet/userman.c branches/SOC/SAMBA_4_0/source/main.mk branches/SOC/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c branches/SOC/SAMBA_4_0/source/script/mkversion.sh branches/SOC/SAMBA_4_0/source/scripting/ejs/config.mk branches/SOC/SAMBA_4_0/source/scripting/ejs/smbcalls.c branches/SOC/SAMBA_4_0/source/torture/basic/denytest.c branches/SOC/SAMBA_4_0/source/torture/libnet/userman.c branches/SOC/SAMBA_4_0/source/torture/raw/acls.c branches/SOC/SAMBA_4_0/source/torture/raw/context.c branches/SOC/SAMBA_4_0/source/torture/raw/open.c branches/SOC/SAMBA_4_0/source/torture/raw/setfileinfo.c branches/SOC/SAMBA_4_0/source/torture/raw/streams.c branches/SOC/SAMBA_4_0/source/torture/torture_util.c Changeset: Sorry, the patch is too large (709 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9065
svn commit: samba r9066 - in branches/SOC/SAMBA_4_0: . source source/build/m4 source/lib/netif source/lib/replace source/lib/socket
Author: brad Date: 2005-08-04 17:09:21 + (Thu, 04 Aug 2005) New Revision: 9066 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9066 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-04 11:14:04 -0600 [EMAIL PROTECTED]: j0j0 | 2005-08-04 11:12:58 -0600 [EMAIL PROTECTED] (orig r9063): metze | 2005-08-04 10:49:17 -0600 - don't pollute the global $LIBS variable with -ldl - -lresolve seems to not being needed any more (it's actually not used, and the build farm seem to happy with it) - move socket and netif configure test to seperate files - don't pollute the global $LIBS variable with -lsocket ... - actually make use of the -lsocket when needed (should fix the solaris build) metze Added: branches/SOC/SAMBA_4_0/source/lib/netif/config.m4 branches/SOC/SAMBA_4_0/source/lib/replace/config.m4 Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SOC/SAMBA_4_0/source/configure.in branches/SOC/SAMBA_4_0/source/lib/socket/config.m4 branches/SOC/SAMBA_4_0/source/lib/socket/config.mk Changeset: Sorry, the patch is too large (485 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9066
svn commit: samba r9067 - in branches/SAMBA_4_0/source: .
Author: lmuelle Date: 2005-08-04 17:32:05 + (Thu, 04 Aug 2005) New Revision: 9067 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9067 Log: Use the right variable name in the example too. Modified: branches/SAMBA_4_0/source/VERSION Changeset: Modified: branches/SAMBA_4_0/source/VERSION === --- branches/SAMBA_4_0/source/VERSION 2005-08-04 17:09:21 UTC (rev 9066) +++ branches/SAMBA_4_0/source/VERSION 2005-08-04 17:32:05 UTC (rev 9067) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a # # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r9068 - in branches/SAMBA_4_0/source: .
Author: lmuelle Date: 2005-08-04 17:33:10 + (Thu, 04 Aug 2005) New Revision: 9068 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9068 Log: Move # sign. Modified: branches/SAMBA_4_0/source/VERSION Changeset: Modified: branches/SAMBA_4_0/source/VERSION === --- branches/SAMBA_4_0/source/VERSION 2005-08-04 17:32:05 UTC (rev 9067) +++ branches/SAMBA_4_0/source/VERSION 2005-08-04 17:33:10 UTC (rev 9068) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_REVISION=a # +# e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r9069 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 19:59:55 + (Thu, 04 Aug 2005)
New Revision: 9069
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9069
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-04 14:04:55 -0600
Some more work on the domain join
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9063
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5277
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5276
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9063
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5279
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5276
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 17:33:10 UTC
(rev 9068)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 19:59:55 UTC
(rev 9069)
@@ -45,6 +45,8 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
+ struct event_context *libnet_evt_ctx;
+ struct event_context *dcerpc_evt_ctx;
const char *ldap_url;
const char *domain_dn;
@@ -79,7 +81,7 @@
struct drsuapi_DsBindInfoCtr *our_bind_info;
const char *binding = lp_parm_string(-1, torture, binding);
const char *new_dc_pass;
- struct event_context *event_ctx = NULL;
+ /*struct event_context *evt_ctx = NULL;*/
ctx = talloc_zero(mem_ctx, struct DsSyncTest);
if (!ctx) return NULL;
@@ -129,8 +131,13 @@
/*libnet_context_init should be passed an event_context *ev,
not a TALLOC_CTX *mem_ctx.
*/
- ctx-libnet_ctx = libnet_context_init(event_ctx);
-
+ /*
+ ctx-libnet_evt_ctx = NULL;
+ ctx-libnet_ctx = libnet_context_init(ctx-libnet_evt_ctx);
+ if (ctx-libnet_ctx == NULL) {
+printf(libnet_context_init() failed, ctx-libnet_context libnet_ctx
not initialized.\n);
+ }
+ */
return ctx;
}
@@ -198,13 +205,13 @@
{
NTSTATUS status;
BOOL ret = True;
- struct event_context *event = NULL;
-
+
+ ctx-dcerpc_evt_ctx = NULL;
status = dcerpc_pipe_connect_b(ctx,
b-pipe, ctx-drsuapi_binding,
DCERPC_DRSUAPI_UUID,
DCERPC_DRSUAPI_VERSION,
- credentials, event);
+ credentials, ctx-dcerpc_evt_ctx);
if (!NT_STATUS_IS_OK(status)) {
printf(Failed to connect to server as a BDC: %s\n,
nt_errstr(status));
@@ -330,7 +337,8 @@
int rtn;
char *old_dn;
struct libnet_Join libnet_r;
-
+ struct event_context *evt_ctx = NULL;
+
rtn = ldb_connect(ctx-ldb_ctx,ctx-ldap_url,0,NULL);
if (rtn != 0) {
printf(test_CompleteJoin(): ldb_connect() failed: %s.\n,
@@ -728,6 +736,13 @@
libnet_r.in.domain_name is a netbios domain name.
*/
+ ctx-libnet_ctx = libnet_context_init(NULL);
+ if (ctx-libnet_ctx == NULL) {
+printf(libnet_context_init() failed, ctx-libnet_ctx not
initialized.\n);
+ }
+ if (ctx-libnet_ctx-event_ctx == NULL) {
+printf(event_ctx is probably not supposed to be null, but it
is.\n);
+ }
status = libnet_Join(ctx-libnet_ctx, ctx, libnet_r);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
svn commit: samba r9070 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: mimir
Date: 2005-08-04 19:59:57 + (Thu, 04 Aug 2005)
New Revision: 9070
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9070
Log:
More fields in ejs credentials object.
rafal
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:55 UTC (rev 9069)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:57 UTC (rev 9070)
@@ -48,6 +48,26 @@
}
+/*
+ set a domain
+*/
+static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, bad arguments to set_domain);
+ return -1;
+ }
+
+ cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get a username
+*/
static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar
**argv)
{
struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -56,6 +76,10 @@
return 0;
}
+
+/*
+ set a username
+*/
static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
{
struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -71,6 +95,35 @@
/*
+ get user password
+*/
+static int ejs_creds_get_password(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_password(creds)));
+ return 0;
+}
+
+
+/*
+ set user password
+*/
+static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, bad arguments to set_password);
+ return -1;
+ }
+
+ cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
@@ -91,8 +144,11 @@
/* setup our object methods */
mprSetCFunction(obj, get_domain, ejs_creds_get_domain);
+ mprSetStringCFunction(obj, set_domain, ejs_creds_set_domain);
mprSetCFunction(obj, get_username, ejs_creds_get_username);
mprSetStringCFunction(obj, set_username, ejs_creds_set_username);
+ mprSetCFunction(obj, get_password, ejs_creds_get_password);
+ mprSetStringCFunction(obj, set_password, ejs_creds_set_password);
return 0;
}
svn commit: samba r9071 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: mimir
Date: 2005-08-04 20:22:25 + (Thu, 04 Aug 2005)
New Revision: 9071
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9071
Log:
Set real and workstation fields in ejs credentials object.
rafal
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:57 UTC (rev 9070)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
20:22:25 UTC (rev 9071)
@@ -124,6 +124,64 @@
/*
+ set realm
+*/
+static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, bad arguments to set_realm);
+ return -1;
+ }
+
+ cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get realm
+*/
+static int ejs_creds_get_realm(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_realm(creds)));
+ return 0;
+}
+
+
+/*
+ set workstation
+*/
+static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, bad arguments to set_workstation);
+ return -1;
+ }
+
+ cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get workstation
+*/
+static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_workstation(creds)));
+ return 0;
+}
+
+
+/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
@@ -149,6 +207,10 @@
mprSetStringCFunction(obj, set_username, ejs_creds_set_username);
mprSetCFunction(obj, get_password, ejs_creds_get_password);
mprSetStringCFunction(obj, set_password, ejs_creds_set_password);
+ mprSetCFunction(obj, get_realm, ejs_creds_get_realm);
+ mprSetStringCFunction(obj, set_realm, ejs_creds_set_realm);
+ mprSetCFunction(obj, get_workstation, ejs_creds_get_workstation);
+ mprSetStringCFunction(obj, set_workstation,
ejs_creds_set_workstation);
return 0;
}
svn commit: samba r9072 - in trunk/source/include: .
Author: jra Date: 2005-08-04 21:00:13 + (Thu, 04 Aug 2005) New Revision: 9072 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9072 Log: Fixing up please-add-me typos in stupid, over-designed stackable vfs interface. Jeremy. Modified: trunk/source/include/vfs_macros.h Changeset: Modified: trunk/source/include/vfs_macros.h === --- trunk/source/include/vfs_macros.h 2005-08-04 20:22:25 UTC (rev 9071) +++ trunk/source/include/vfs_macros.h 2005-08-04 21:00:13 UTC (rev 9072) @@ -234,11 +234,11 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_read((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs_opaque.ops.aio_suspend((fsp)-conn-vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) /*** @@ -345,11 +345,11 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_read((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_write((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_return((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)-vfs_next.ops.aio_cancel((handle)-vfs_next.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_error((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)-vfs_next.ops.aio_fsync((handle)-vfs_next.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_write((handle)-vfs_next.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_return((handle)-vfs_next.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)-vfs_next.ops.aio_cancel((handle)-vfs_next.handles.aio_cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_error((handle)-vfs_next.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)-vfs_next.ops.aio_fsync((handle)-vfs_next.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_NEXT_AIO_SUSPEND(handle,fsp,aiocb,n,ts) ((handle)-vfs_next.ops.aio_suspend((handle)-vfs_next.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) #endif /* _VFS_MACROS_H */
svn commit: samba r9073 - in branches/SAMBA_3_0/source/include: .
Author: jra Date: 2005-08-04 21:00:15 + (Thu, 04 Aug 2005) New Revision: 9073 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9073 Log: Fixing up please-add-me typos in stupid, over-designed stackable vfs interface. Jeremy. Modified: branches/SAMBA_3_0/source/include/vfs_macros.h Changeset: Modified: branches/SAMBA_3_0/source/include/vfs_macros.h === --- branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-04 21:00:13 UTC (rev 9072) +++ branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-04 21:00:15 UTC (rev 9073) @@ -234,11 +234,11 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_read((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs_opaque.ops.aio_suspend((fsp)-conn-vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) /*** @@ -345,11 +345,11 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_read((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_write((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_return((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)-vfs_next.ops.aio_cancel((handle)-vfs_next.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_error((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)-vfs_next.ops.aio_fsync((handle)-vfs_next.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_write((handle)-vfs_next.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_return((handle)-vfs_next.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)-vfs_next.ops.aio_cancel((handle)-vfs_next.handles.aio_cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_error((handle)-vfs_next.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)-vfs_next.ops.aio_fsync((handle)-vfs_next.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_NEXT_AIO_SUSPEND(handle,fsp,aiocb,n,ts) ((handle)-vfs_next.ops.aio_suspend((handle)-vfs_next.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) #endif /* _VFS_MACROS_H */
svn commit: samba r9074 - in branches/SAMBA_4_0/source/ntvfs: .
Author: tridge
Date: 2005-08-04 21:00:38 + (Thu, 04 Aug 2005)
New Revision: 9074
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9074
Log:
cope with a null ntvfs context in disconnect, so the destructor that
runs on a failed ntvfs init works
Modified:
branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
===
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2005-08-04 21:00:15 UTC
(rev 9073)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2005-08-04 21:00:38 UTC
(rev 9074)
@@ -35,7 +35,11 @@
NTSTATUS ntvfs_disconnect(struct smbsrv_tcon *tcon)
{
- struct ntvfs_module_context *ntvfs = tcon-ntvfs_ctx-modules;
+ struct ntvfs_module_context *ntvfs;
+ if (tcon-ntvfs_ctx == NULL) {
+ return NT_STATUS_INVALID_CONNECTION;
+ }
+ ntvfs = tcon-ntvfs_ctx-modules;
if (!ntvfs-ops-disconnect) {
return NT_STATUS_NOT_IMPLEMENTED;
}
svn commit: samba r9075 - in branches/SOC/SAMBA_3_0/source: include libmsrpc
Author: skel Date: 2005-08-04 21:20:53 + (Thu, 04 Aug 2005) New Revision: 9075 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9075 Log: organized the CacServerHandle, added cac_GetServer function to get a SMBCSRV* and took it out of the server handle, fixed up info class constants Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/include/libmsrpc_internal.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c branches/SOC/SAMBA_3_0/source/libmsrpc/libmsrpc.c Changeset: Sorry, the patch is too large (647 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9075
svn commit: samba r9076 - branches/SAMBA_3_0/source/rpcclient branches/SAMBA_3_0/source/utils trunk/source/rpcclient trunk/source/utils
Author: gd
Date: 2005-08-04 23:20:48 + (Thu, 04 Aug 2005)
New Revision: 9076
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9076
Log:
fix two other issues invented along the
cli_spoolss_enumprinterkey-changes.
Guenther
Modified:
branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
branches/SAMBA_3_0/source/utils/net_rpc_printer.c
trunk/source/rpcclient/cmd_spoolss.c
trunk/source/utils/net_rpc_printer.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-04 21:20:53 UTC
(rev 9075)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-04 23:20:48 UTC
(rev 9076)
@@ -2296,7 +2296,7 @@
/* Enumerate subkeys */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result))
goto done;
Modified: branches/SAMBA_3_0/source/utils/net_rpc_printer.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc_printer.c 2005-08-04 21:20:53 UTC
(rev 9075)
+++ branches/SAMBA_3_0/source/utils/net_rpc_printer.c 2005-08-04 23:20:48 UTC
(rev 9076)
@@ -939,7 +939,7 @@
WERROR result;
/* enumprinterkey call */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result)) {
printf(enumprinterkey failed: %s\n, dos_errstr(result));
Modified: trunk/source/rpcclient/cmd_spoolss.c
===
--- trunk/source/rpcclient/cmd_spoolss.c2005-08-04 21:20:53 UTC (rev
9075)
+++ trunk/source/rpcclient/cmd_spoolss.c2005-08-04 23:20:48 UTC (rev
9076)
@@ -2296,7 +2296,7 @@
/* Enumerate subkeys */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result))
goto done;
Modified: trunk/source/utils/net_rpc_printer.c
===
--- trunk/source/utils/net_rpc_printer.c2005-08-04 21:20:53 UTC (rev
9075)
+++ trunk/source/utils/net_rpc_printer.c2005-08-04 23:20:48 UTC (rev
9076)
@@ -939,7 +939,7 @@
WERROR result;
/* enumprinterkey call */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result)) {
printf(enumprinterkey failed: %s\n, dos_errstr(result));
svn commit: samba r9077 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2005-08-04 23:43:05 + (Thu, 04 Aug 2005) New Revision: 9077 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9077 Log: HEIMDAL_ROKEN needs inet_aton and on solaris it's in -lsocket this should fix the build on sun1 metze Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk === --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 23:20:48 UTC (rev 9076) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 23:43:05 UTC (rev 9077) @@ -297,7 +297,7 @@ heimdal/lib/roken/strupr.o \ heimdal/lib/roken/strpool.o \ heimdal_build/replace.o -REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN_ADDRINFO +REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN_ADDRINFO EXT_LIB_SOCKET NOPROTO = YES # End SUBSYSTEM HEIMDAL_ROKEN ###
Build status as of Fri Aug 5 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-08-04 00:00:09.0 + +++ /home/build/master/cache/broken_results.txt 2005-08-05 00:00:09.0 + @@ -1,17 +1,17 @@ -Build status as of Thu Aug 4 00:00:02 2005 +Build status as of Fri Aug 5 00:00:01 2005 Build counts: Tree Total Broken Panic -ccache 35 6 0 -distcc 35 5 0 -lorikeet-heimdal 33 11 0 -ppp 21 2 0 -rsync34 2 0 +ccache 36 6 0 +distcc 36 5 0 +lorikeet-heimdal 34 12 0 +ppp 22 2 0 +rsync35 2 0 samba0 0 0 samba-docs 0 0 0 -samba4 38 22 0 -samba_3_035 5 0 -smb-build31 4 0 -talloc 34 12 0 -tdb 34 15 0 +samba4 39 13 0 +samba_3_036 4 0 +smb-build32 4 0 +talloc 35 12 0 +tdb 35 15 0
svn commit: samba r9080 - in branches/SAMBA_3_0/source/rpc_server: .
Author: jra
Date: 2005-08-05 00:25:52 + (Fri, 05 Aug 2005)
New Revision: 9080
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9080
Log:
If we don't understand the auth, bind nak not pdu fault.
Should fix usermgr on W2K3 SP1.
Jeremy.
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_pipe.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_pipe.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2005-08-05 00:07:08 UTC
(rev 9079)
+++ branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2005-08-05 00:25:52 UTC
(rev 9080)
@@ -666,7 +666,7 @@
if(!prs_uint16(reject code, outgoing_rpc, 0, zero)) {
prs_mem_free(outgoing_rpc);
-return False;
+ return False;
}
p-out_data.data_sent_length = 0;
@@ -896,11 +896,9 @@
if (i == rpc_lookup_size) {
if (NT_STATUS_IS_ERR(smb_probe_module(rpc, p-name))) {
- DEBUG(3,(api_pipe_bind_req: Unknown pipe name %s in
bind request.\n,
-p-name ));
- if(!setup_bind_nak(p))
- return False;
- return True;
+ DEBUG(3,(api_pipe_bind_req: Unknown pipe name %s in
bind request.\n,
+ p-name ));
+ return setup_bind_nak(p);
}
for (i = 0; i rpc_lookup_size; i++) {
@@ -921,7 +919,7 @@
/* decode the bind request */
if(!smb_io_rpc_hdr_rb(, hdr_rb, rpc_in_p, 0)) {
DEBUG(0,(api_pipe_bind_req: unable to unmarshall RPC_HDR_RB
struct.\n));
- return False;
+ return setup_bind_nak(p);
}
/*
@@ -938,7 +936,7 @@
if(!smb_io_rpc_hdr_auth(, auth_info, rpc_in_p, 0)) {
DEBUG(0,(api_pipe_bind_req: unable to unmarshall
RPC_HDR_AUTH struct.\n));
- return False;
+ return setup_bind_nak(p);
}
switch(auth_info.auth_type) {
@@ -947,26 +945,26 @@
if(!smb_io_rpc_auth_verifier(,
auth_verifier, rpc_in_p, 0)) {
DEBUG(0,(api_pipe_bind_req: unable to
unmarshall RPC_HDR_AUTH
struct.\n));
- return False;
+ return setup_bind_nak(p);
}
if(!strequal(auth_verifier.signature,
NTLMSSP)) {
DEBUG(0,(api_pipe_bind_req:
auth_verifier.signature !=
NTLMSSP\n));
- return False;
+ return setup_bind_nak(p);
}
if(auth_verifier.msg_type != NTLMSSP_NEGOTIATE)
{
DEBUG(0,(api_pipe_bind_req:
auth_verifier.msg_type (%d)
!= NTLMSSP_NEGOTIATE\n,
auth_verifier.msg_type));
- return False;
+ return setup_bind_nak(p);
}
if(!smb_io_rpc_auth_ntlmssp_neg(,
ntlmssp_neg, rpc_in_p, 0)) {
DEBUG(0,(api_pipe_bind_req:
Failed to unmarshall
RPC_AUTH_NTLMSSP_NEG.\n));
- return False;
+ return setup_bind_nak(p);
}
p-ntlmssp_chal_flags = SMBD_NTLMSSP_NEG_FLAGS;
@@ -981,13 +979,13 @@
if (!server_auth2_negotiated) {
DEBUG(0, (Attempt to bind using
schannel
without successful
serverauth2\n));
- return False;
+ return setup_bind_nak(p);
}
if (!smb_io_rpc_auth_netsec_neg(, neg,
rpc_in_p, 0)) {
DEBUG(0,(api_pipe_bind_req:
Could not unmarshal SCHANNEL
auth neg\n));
- return False;
+ return setup_bind_nak(p);
}
p-netsec_auth_validated = True;
@@ -1006,7 +1004,7 @@
default:
svn commit: samba r9082 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-05 00:31:06 + (Fri, 05 Aug 2005)
New Revision: 9082
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9082
Log:
added the ECMA functions encodeURIComponent() and
decodeURIComponent(), which I am using as part of my object
linearisation code
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c 2005-08-05
00:30:21 UTC (rev 9081)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c 2005-08-05
00:31:06 UTC (rev 9082)
@@ -336,7 +336,86 @@
return ret;
}
+
/*
+ encode a string, replacing all non-alpha with %02x form
+*/
+static int ejs_encodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+ int i, j, count=0;
+ const char *s;
+ char *ret;
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, encodeURIComponent invalid arguments);
+ return -1;
+ }
+
+ s = argv[0];
+
+ for (i=0;s[i];i++) {
+ if (!isalnum(s[i])) count++;
+ }
+
+ ret = talloc_size(mprMemCtx(), i + count*2 + 1);
+ if (ret == NULL) {
+ return -1;
+ }
+ for (i=j=0;s[i];i++,j++) {
+ if (!isalnum(s[i])) {
+ snprintf(ret+j, 4, %%%02X, (unsigned)s[i]);
+ j += 2;
+ } else {
+ ret[j] = s[i];
+ }
+ }
+ ret[j] = 0;
+ mpr_Return(eid, mprString(ret));
+ talloc_free(ret);
+ return 0;
+}
+
+/*
+ encode a string, replacing all non-alpha of %02x form
+*/
+static int ejs_decodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+ int i, j, count=0;
+ const char *s;
+ char *ret;
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, decodeURIComponent invalid arguments);
+ return -1;
+ }
+
+ s = argv[0];
+
+ ret = talloc_size(mprMemCtx(), strlen(s) + 1);
+ if (ret == NULL) {
+ return -1;
+ }
+
+ for (i=j=0;s[i];i++,j++) {
+ if (s[i] == '%') {
+ unsigned c;
+ if (sscanf(s+i+1, %02X, c) != 1) {
+ ejsSetErrorMsg(eid, decodeURIComponent bad
format);
+ return -1;
+ }
+ ret[j] = c;
+ i += 2;
+ } else {
+ ret[j] = s[i];
+ }
+ if (!isalnum(s[i])) count++;
+ }
+
+ ret[j] = 0;
+ mpr_Return(eid, mprString(ret));
+ talloc_free(ret);
+ return 0;
+}
+
+/*
initialise string ejs subsystem
*/
static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
@@ -351,6 +430,8 @@
mprSetCFunction(obj, join, ejs_join);
mprSetCFunction(obj, sprintf, ejs_sprintf);
mprSetCFunction(obj, vsprintf, ejs_vsprintf);
+ mprSetStringCFunction(obj, encodeURIComponent,
ejs_encodeURIComponent);
+ mprSetStringCFunction(obj, decodeURIComponent,
ejs_decodeURIComponent);
return 0;
}
svn commit: samba r9083 - in trunk/source/rpc_server: .
Author: jra
Date: 2005-08-05 00:35:51 + (Fri, 05 Aug 2005)
New Revision: 9083
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9083
Log:
Fix bind-nak issue in the HEAD way... code currently different from
3.0.
Jeremy.
Modified:
trunk/source/rpc_server/srv_pipe.c
Changeset:
Modified: trunk/source/rpc_server/srv_pipe.c
===
--- trunk/source/rpc_server/srv_pipe.c 2005-08-05 00:31:06 UTC (rev 9082)
+++ trunk/source/rpc_server/srv_pipe.c 2005-08-05 00:35:51 UTC (rev 9083)
@@ -672,13 +672,12 @@
prs_init( outgoing_rpc, 0, p-mem_ctx, MARSHALL);
prs_give_memory( outgoing_rpc, (char *)p-out_data.current_pdu,
sizeof(p-out_data.current_pdu), False);
-
/*
* Initialize a bind_nak header.
*/
init_rpc_hdr(nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-p-hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+ p-hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
/*
* Marshall the header into the outgoing PDU.
@@ -696,7 +695,7 @@
if(!prs_uint16(reject code, outgoing_rpc, 0, zero)) {
prs_mem_free(outgoing_rpc);
-return False;
+ return False;
}
p-out_data.data_sent_length = 0;
@@ -1238,10 +1237,7 @@
prs_mem_free(out_hdr_ba);
prs_mem_free(out_auth);
- if(!setup_bind_nak(p)) {
- return False;
- }
- return True;
+ return setup_bind_nak(p);
}
for (i = 0; i rpc_lookup_size; i++) {
@@ -1433,7 +1429,7 @@
prs_mem_free(outgoing_rpc);
prs_mem_free(out_hdr_ba);
prs_mem_free(out_auth);
- return False;
+ return setup_bind_nak(p);
}
/
svn commit: samba r9084 - in branches/SAMBA_4_0/source: auth/gensec auth/kerberos kdc torture/auth
Author: abartlet Date: 2005-08-05 00:41:53 + (Fri, 05 Aug 2005) New Revision: 9084 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9084 Log: 'resign' the sample PAC for the validation of the signature algorithms. If we ever get problems with the kerberos code, it should show up as a different signature in this PAC. This involved returning more data from the pac functions, so changed some callers and split up some functions. Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c branches/SAMBA_4_0/source/auth/kerberos/kerberos.h branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c branches/SAMBA_4_0/source/kdc/pac-glue.c branches/SAMBA_4_0/source/torture/auth/pac.c Changeset: Sorry, the patch is too large (581 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9084
svn commit: samba r9085 - in branches/SAMBA_4_0/source/include: .
Author: abartlet Date: 2005-08-05 00:56:21 + (Fri, 05 Aug 2005) New Revision: 9085 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9085 Log: Missing structs.h entry. Andrew Bartlett Modified: branches/SAMBA_4_0/source/include/structs.h Changeset: Modified: branches/SAMBA_4_0/source/include/structs.h === --- branches/SAMBA_4_0/source/include/structs.h 2005-08-05 00:41:53 UTC (rev 9084) +++ branches/SAMBA_4_0/source/include/structs.h 2005-08-05 00:56:21 UTC (rev 9085) @@ -90,6 +90,7 @@ struct drsuapi_DsCrackNames; struct PAC_BUFFER; +struct PAC_DATA; struct samr_ChangePasswordUser; struct samr_OemChangePasswordUser2;
svn commit: samba r9086 - branches/SAMBA_3_0/source/printing branches/SAMBA_3_0/source/registry branches/SAMBA_3_0/source/rpc_parse trunk/source/printing trunk/source/registry trunk/source/rpc_parse
Author: jerry Date: 2005-08-05 00:58:31 + (Fri, 05 Aug 2005) New Revision: 9086 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9086 Log: * fix invalid read in parse_spoolss when writing a devmode to the wire * fix dup_a_regval() when size is 0 * ensure we pass a pstring to unlink_internals (fixes delete_driver code) Modified: branches/SAMBA_3_0/source/printing/nt_printing.c branches/SAMBA_3_0/source/registry/reg_objects.c branches/SAMBA_3_0/source/rpc_parse/parse_spoolss.c trunk/source/printing/nt_printing.c trunk/source/registry/reg_objects.c trunk/source/rpc_parse/parse_spoolss.c Changeset: Sorry, the patch is too large (373 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9086
svn commit: samba r9087 - in branches/SAMBA_3_0/source: .
Author: jerry Date: 2005-08-05 00:59:23 + (Fri, 05 Aug 2005) New Revision: 9087 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9087 Log: change version to 3.0.21pre1 since I will start cherry picking patches for the final 3.0.20 Modified: branches/SAMBA_3_0/source/VERSION Changeset: Modified: branches/SAMBA_3_0/source/VERSION === --- branches/SAMBA_3_0/source/VERSION 2005-08-05 00:58:31 UTC (rev 9086) +++ branches/SAMBA_3_0/source/VERSION 2005-08-05 00:59:23 UTC (rev 9087) @@ -19,7 +19,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=20 +SAMBA_VERSION_RELEASE=21 # If a official release has a serious bug # @@ -41,7 +41,7 @@ # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 # For 'rc' releases the version will be# @@ -51,7 +51,7 @@ # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=1 +SAMBA_VERSION_RC_RELEASE= # To mark SVN snapshots this should be set to 'yes'#
svn commit: samba r9088 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal: .
Author: jelmer Date: 2005-08-05 00:59:24 + (Fri, 05 Aug 2005) New Revision: 9088 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9088 Log: More ethereal parser generator updates Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm Changeset: Sorry, the patch is too large (440 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9088
svn commit: samba r9089 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 01:04:45 + (Fri, 05 Aug 2005)
New Revision: 9089
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9089
Log:
Start generating module init and top level ejs functions for smb_interfaces.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
00:59:24 UTC (rev 9088)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:04:45 UTC (rev 9089)
@@ -46,13 +46,16 @@
print FILE NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n;
print FILE {\n;
- print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, name));\n;
+ print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, \output\));\n;
print FILE \n\treturn NT_STATUS_OK;\n;
print FILE }\n\n;
print FILE NTSTATUS ejs_pull_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n;
print FILE {\n;
+
+ print FILE \tNDR_CHECK(ejs_pull_struct_start(ejs, v, \input\));\n;
+
print FILE \treturn NT_STATUS_OK;\n;
print FILE }\n\n;
}
@@ -87,7 +90,30 @@
# Top level functions
foreach my $x (@{$header}) {
- pushpull_for($x);
+ next, if $x-{STRUCT_NAME} eq ;
+ print FILE static int ejs_$x-{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n;
+ print FILE {\n;
+ print FILE \tejsSetErrorMsg(eid, \Not implemented\);\n;
+ print FILE \treturn -1;\n;
+ print FILE }\n\n;
}
+# Module initialisation
+
+print FILE static int ejs_${basename}_init(int eid, int argc, struct MprVar
**argv)\n;
+print FILE {\n;
+print FILE \tstruct MprVar *obj = mprInitObject(eid, \${basename}\, argc,
argtv);\n\n;
+
+foreach my $x (@{$header}) {
+ next, if $x-{STRUCT_NAME} eq ;
+ print FILE \tmprSetCFunction(obj, \$x-{STRUCT_NAME}\,
ejs_$x-{STRUCT_NAME});\n;
+}
+
+print FILE }\n\n;
+
+print FILE NTSTATUS ejs_init_${basename}(void)\n;
+print FILE {\n;
+print FILE \treturn smbcalls_register_ejs(\${basename}_init\,
ejs_${basename}_init);\n;
+print FILE }\n;
+
close(FILE);
svn commit: samba r9090 - in branches/SAMBA_4_0/source: libnet torture/libnet
Author: mimir
Date: 2005-08-05 01:23:06 + (Fri, 05 Aug 2005)
New Revision: 9090
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9090
Log:
Another field in usermod function - account flags.
rafal
Modified:
branches/SAMBA_4_0/source/libnet/composite.h
branches/SAMBA_4_0/source/libnet/userman.c
branches/SAMBA_4_0/source/torture/libnet/userman.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/composite.h
===
--- branches/SAMBA_4_0/source/libnet/composite.h2005-08-05 01:04:45 UTC
(rev 9089)
+++ branches/SAMBA_4_0/source/libnet/composite.h2005-08-05 01:23:06 UTC
(rev 9090)
@@ -87,6 +87,7 @@
struct timeval *acct_expiry;
struct timeval *allow_password_change;
struct timeval *force_password_change;
+ uint32_t acct_flags;
} change;
} in;
};
Modified: branches/SAMBA_4_0/source/libnet/userman.c
===
--- branches/SAMBA_4_0/source/libnet/userman.c 2005-08-05 01:04:45 UTC (rev
9089)
+++ branches/SAMBA_4_0/source/libnet/userman.c 2005-08-05 01:23:06 UTC (rev
9090)
@@ -578,6 +578,12 @@
i-info17.acct_expiry =
timeval_to_nttime(s-change.acct_expiry);
s-change.fields ^= USERMOD_FIELD_ACCT_EXPIRY;
+
+ } else if (s-change.fields USERMOD_FIELD_ACCT_FLAGS) {
+ *level = 16;
+ i-info16.acct_flags = s-change.acct_flags;
+
+ s-change.fields ^= USERMOD_FIELD_ACCT_FLAGS;
}
}
Modified: branches/SAMBA_4_0/source/torture/libnet/userman.c
===
--- branches/SAMBA_4_0/source/torture/libnet/userman.c 2005-08-05 01:04:45 UTC
(rev 9089)
+++ branches/SAMBA_4_0/source/torture/libnet/userman.c 2005-08-05 01:23:06 UTC
(rev 9090)
@@ -422,15 +422,15 @@
struct timeval force = { 3, 55444 };
struct usermod_change changes[] = {
- { USERMOD_FIELD_ACCOUNT_NAME, changed, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_FULL_NAME, NULL, Testing full account
name, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_DESCRIPTION,NULL, NULL, Description of
tested account, NULL, NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_COMMENT,NULL, NULL, NULL, Comment for
the tested account, NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_LOGON_SCRIPT, NULL, NULL, NULL, NULL,
test_logon.cmd, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_PROFILE_PATH, NULL, NULL, NULL, NULL, NULL,
TESTSRV\\profiles\\test, NULL, NULL, NULL },
- { USERMOD_FIELD_ACCT_EXPIRY,NULL, NULL, NULL, NULL, NULL,
NULL, expiry, NULL, NULL },
- { USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, allow, NULL },
- { USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, force }
+ { USERMOD_FIELD_ACCOUNT_NAME, changed, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_FULL_NAME, NULL, Testing full account
name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_DESCRIPTION,NULL, NULL, Description of
tested account, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_COMMENT,NULL, NULL, NULL, Comment for
the tested account, NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_LOGON_SCRIPT, NULL, NULL, NULL, NULL,
test_logon.cmd, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_PROFILE_PATH, NULL, NULL, NULL, NULL, NULL,
TESTSRV\\profiles\\test, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_ACCT_EXPIRY,NULL, NULL, NULL, NULL, NULL,
NULL, expiry, NULL, NULL, 0 },
+ { USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, allow, NULL, 0 },
+ { USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, force, ACB_NORMAL }
};
mem_ctx = talloc_init(test_userdel);
svn commit: samba r9091 - in branches/SAMBA_3_0/source/include: .
Author: jmcd Date: 2005-08-05 01:23:33 + (Fri, 05 Aug 2005) New Revision: 9091 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9091 Log: Fix #2954, aix 5.1 compile. Stupid aix aio.h header defines aio_error and aio_return as macros... Modified: branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0/source/include/vfs_macros.h Changeset: Modified: branches/SAMBA_3_0/source/include/vfs.h === --- branches/SAMBA_3_0/source/include/vfs.h 2005-08-05 01:23:06 UTC (rev 9090) +++ branches/SAMBA_3_0/source/include/vfs.h 2005-08-05 01:23:33 UTC (rev 9091) @@ -316,9 +316,9 @@ /* aio operations */ int (*aio_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_write)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); - ssize_t (*aio_return)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_cancel)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb); - int (*aio_error)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb); int (*aio_suspend)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout); Modified: branches/SAMBA_3_0/source/include/vfs_macros.h === --- branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-05 01:23:06 UTC (rev 9090) +++ branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-05 01:23:33 UTC (rev 9091) @@ -125,9 +125,9 @@ /* AIO operations. */ #define SMB_VFS_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_read((fsp)-conn-vfs.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_write((fsp)-conn-vfs.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_return((fsp)-conn-vfs.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_return_fn((fsp)-conn-vfs.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs.ops.aio_cancel((fsp)-conn-vfs.handles.aio_cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_error((fsp)-conn-vfs.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_error_fn((fsp)-conn-vfs.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs.ops.aio_fsync((fsp)-conn-vfs.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs.ops.aio_suspend((fsp)-conn-vfs.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -235,9 +235,9 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_read((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return_fn((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error_fn((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs_opaque.ops.aio_suspend((fsp)-conn-vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -346,9 +346,9 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_read((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb)
svn commit: samba r9092 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 01:23:35 + (Fri, 05 Aug 2005)
New Revision: 9092
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9092
Log:
Generate some more stub functions.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:23:33 UTC (rev 9091)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:23:35 UTC (rev 9092)
@@ -87,12 +87,40 @@
print FILE /* EJS wrapper functions auto-generated by build_smb_interfaces.pl
*/\n\n;
-# Top level functions
+# Top level push/pull functions
foreach my $x (@{$header}) {
+
next, if $x-{STRUCT_NAME} eq ;
+
+ print FILE static NTSTATUS ejs_pull_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x-{STRUCT_NAME} *r)\n;
+ print FILE {\n;
+ print FILE \tNDR_CHECK(ejs_pull_struct_start(ejs, v, \input\));\n;
+ print FILE \treturn NT_STATUS_OK;\n;
+ print FILE }\n\n;
+
+ print FILE static NTSTATUS ejs_push_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x-{STRUCT_NAME} *r)\n\n;
+ print FILE {\n;
+ print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, \output\));\n;
+
+ print FILE \treturn NT_STATUS_OK;\n;
+ print FILE }\n\n;
+}
+
+# Top level call functions
+
+foreach my $x (@{$header}) {
+ next, if $x-{STRUCT_NAME} eq ;
+
+ $raw_name = $x-{STRUCT_NAME};
+ $raw_name =~ s/smb_/smb_raw_/;
+
print FILE static int ejs_$x-{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n;
print FILE {\n;
+ print FILE \tstruct $x-{STRUCT_NAME} parms;\n\n;
+
+ print FILE \t$raw_name(tree, params);\n;
+
print FILE \tejsSetErrorMsg(eid, \Not implemented\);\n;
print FILE \treturn -1;\n;
print FILE }\n\n;
svn commit: samba r9093 - in trunk/source/include: .
Author: jmcd Date: 2005-08-05 01:23:35 + (Fri, 05 Aug 2005) New Revision: 9093 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9093 Log: Fix #2954, aix 5.1 compile. Stupid aix aio.h header defines aio_error and aio_return as macros... Modified: trunk/source/include/vfs.h trunk/source/include/vfs_macros.h Changeset: Modified: trunk/source/include/vfs.h === --- trunk/source/include/vfs.h 2005-08-05 01:23:35 UTC (rev 9092) +++ trunk/source/include/vfs.h 2005-08-05 01:23:35 UTC (rev 9093) @@ -316,9 +316,9 @@ /* aio operations */ int (*aio_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_write)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); - ssize_t (*aio_return)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_cancel)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb); - int (*aio_error)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb); int (*aio_suspend)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout); Modified: trunk/source/include/vfs_macros.h === --- trunk/source/include/vfs_macros.h 2005-08-05 01:23:35 UTC (rev 9092) +++ trunk/source/include/vfs_macros.h 2005-08-05 01:23:35 UTC (rev 9093) @@ -125,9 +125,9 @@ /* AIO operations. */ #define SMB_VFS_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_read((fsp)-conn-vfs.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_write((fsp)-conn-vfs.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_return((fsp)-conn-vfs.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_return_fn((fsp)-conn-vfs.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs.ops.aio_cancel((fsp)-conn-vfs.handles.aio_cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_error((fsp)-conn-vfs.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs.ops.aio_error_fn((fsp)-conn-vfs.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs.ops.aio_fsync((fsp)-conn-vfs.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs.ops.aio_suspend((fsp)-conn-vfs.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -235,9 +235,9 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_read((fsp)-conn-vfs_opaque.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_write((fsp)-conn-vfs_opaque.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_return_fn((fsp)-conn-vfs_opaque.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_cancel((fsp)-conn-vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_error_fn((fsp)-conn-vfs_opaque.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)-conn-vfs_opaque.ops.aio_fsync((fsp)-conn-vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)-conn-vfs_opaque.ops.aio_suspend((fsp)-conn-vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -346,9 +346,9 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_read((handle)-vfs_next.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)-vfs_next.ops.aio_write((handle)-vfs_next.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb)
svn commit: samba r9094 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal: .
Author: jelmer
Date: 2005-08-05 01:57:45 + (Fri, 05 Aug 2005)
New Revision: 9094
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9094
Log:
More ethereal parser updates, only header fields left to fix + actual data call
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
Changeset:
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
2005-08-05 01:23:35 UTC (rev 9093)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
2005-08-05 01:57:45 UTC (rev 9094)
@@ -8,7 +8,7 @@
require Exporter;
@ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(EmitProhibited FindDissectorParam);
[EMAIL PROTECTED] = qw(EmitProhibited FindDissectorParam %hf_renames);
use strict;
@@ -25,7 +25,7 @@
#FIXME
}
-my %hf_renames = ();
+use vars qw(%hf_renames);
sub handle_hf_rename($$)
{
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
2005-08-05 01:23:35 UTC (rev 9093)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
2005-08-05 01:57:45 UTC (rev 9094)
@@ -12,9 +12,9 @@
use Parse::Pidl::Typelist;
use Parse::Pidl::Util qw(has_property ParseExpr);
use Parse::Pidl::NDR;
-use Parse::Pidl::Ethereal::Conformance qw(EmitProhibited FindDissectorParam);
+use Parse::Pidl::Ethereal::Conformance qw(EmitProhibited FindDissectorParam
%hf_renames);
-my %ptrtype_define_mappings = (
+my %ptrtype_mappings = (
unique = NDR_POINTER_UNIQUE,
ref = NDR_POINTER_REF,
ptr = NDR_POINTER_PTR
@@ -208,56 +208,79 @@
deindent;
pidl_code return offset;;
pidl_code }\n;
- register_new_type($name, $dissectorname, bitmap_ft($e), BASE_HEX,
0, NULL, $e-{ALIGN});
}
-sub FindType($)
+sub ElementLevel()
{
- my $foo = shift;
-#FIXME
- return {
- FT_TYPE = FIXME,
- BASE_TYPE = FIXME,
- VALS = VALS,
- MASK = 0,
- DISSECTOR = FOOBNA
- };
+ my ($e,$l,$hf,$myname) = @_;
+
+ if ($l-{TYPE} eq POINTER) {
+ pidl_code
offset=dissect_ndr_pointer(tvb,offset,pinfo,tree,drep,$myname\_,$ptrtype_mappings{$l-{POINTER_TYPE}},\\,$hf);;
+ } elsif ($l-{TYPE} eq ARRAY) {
+ my $af = ;
+
+ ($af = ucarray) if ($l-{IS_VARYING});
+ ($af = uvarray) if ($l-{IS_CONFORMANT});
+ ($af = ucvarray) if ($l-{IS_CONFORMANT} and
$l-{IS_VARYING});
+
+ pidl_code
offset=dissect_ndr_$af(tvb,offset,pinfo,tree,drep,$myname\_);;
+ } elsif ($l-{TYPE} eq DATA) {
+# pidl_code guint32 param= .
FindDissectorParam($dissectorname).;;
+# pidl_code offset=$type-{DISSECTOR}(tvb, offset, pinfo, tree,
drep, $hf, param);;
+ } elsif ($_-{TYPE} eq SUBCONTEXT) {
+ die(subcontext() not supported)
+ }
}
sub Element($$$)
{
my ($e,$pn,$ifname) = @_;
- my $hf_index = hf_$ifname\_$pn\_$e-{NAME};
my $dissectorname = $ifname\_dissect\_$ifname\_$pn\_$e-{NAME};
return if (EmitProhibited($dissectorname));
- my $type = FindType($e-{DATA_TYPE});
+ my $hf = ;
+ #FIXME my $hf = register_hf_field(hf_$ifname\_$pn\_$e-{NAME},
$e-{NAME}, $ifname.$pn.$e-{NAME}, $type-{FT_TYPE}, $type-{BASE_TYPE},
$type-{VALS}, $type-{MASK}, );
+ my $add = ;
- my $hf = register_hf_field($hf_index, $e-{NAME},
$ifname.$pn.$e-{NAME}, $type-{FT_TYPE}, $type-{BASE_TYPE}, $type-{VALS},
$type-{MASK}, );
-
- pidl_code static int;
- pidl_code $dissectorname(tvbuff_t *tvb, int offset, packet_info
*pinfo, proto_tree *tree, guint8 *drep);
- pidl_code {;
- indent;
- pidl_code guint32 param= . FindDissectorParam($dissectorname).;;
- pidl_code offset=$type-{DISSECTOR}(tvb, offset, pinfo, tree, drep,
$hf, param);;
- pidl_code return offset;;
- deindent;
- pidl_code }\n;
+ foreach (@{$e-{LEVELS}}) {
+ next if ($_-{TYPE} eq SWITCH);
+ pidl_code static int;
+ pidl_code $dissectorname$add(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, guint8 *drep);
+ pidl_code {;
+ indent;
+
+ ElementLevel($e,$_,$hf,$dissectorname.$add);
+
+ pidl_code return offset;;
+ deindent;
+ pidl_code }\n;
+ $add.=_;
+ }
+
+ return offset=$dissectorname(tvb,offset,pinfo,tree,drep);;
}
sub Function($$$)
{
my ($fn,$ifname) = @_;
+
+ my
svn commit: samba r9096 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tpot
Date: 2005-08-05 04:36:31 + (Fri, 05 Aug 2005)
New Revision: 9096
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9096
Log:
Spelling.
Modified:
branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-08-05 04:32:24 UTC
(rev 9095)
+++ branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-08-05 04:36:31 UTC
(rev 9096)
@@ -403,7 +403,7 @@
}
/*
- get a poiner in the current object
+ get a pointer in the current object
*/
void *mprGetThisPtr(int eid, const char *name)
{
svn commit: samba r9097 - in trunk/source/registry: .
Author: jerry
Date: 2005-08-05 04:46:33 + (Fri, 05 Aug 2005)
New Revision: 9097
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9097
Log:
fix perfount crashes
Modified:
trunk/source/registry/reg_perfcount.c
Changeset:
Modified: trunk/source/registry/reg_perfcount.c
===
--- trunk/source/registry/reg_perfcount.c 2005-08-05 04:36:31 UTC (rev
9096)
+++ trunk/source/registry/reg_perfcount.c 2005-08-05 04:46:33 UTC (rev
9097)
@@ -13,14 +13,17 @@
char key[] = 1;
uint32 retval = 0;
char buf[PERFCOUNT_MAX_LEN];
+ const char *counter_dir = lp_counters_dir();
+
- pstrcpy(fname, lp_counters_dir());
- pstrcat(fname, /names.tdb);
+ if ( !*counter_dir )
+ return 0;
+ pstr_sprintf( fname, %s/names.tdb, counter_dir );
+
names = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDONLY, 0444);
- if(names == NULL)
- {
+ if ( !names ) {
DEBUG(1, (reg_perfcount_get_base_index: unable to open
[%s].\n, fname));
return 0;
}
svn commit: samba r9098 - branches/SAMBA_3_0/source/rpc_server trunk/source/rpc_server
Author: jerry
Date: 2005-08-05 04:48:02 + (Fri, 05 Aug 2005)
New Revision: 9098
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9098
Log:
fix another usrmgr.exe crash when viewing user properties at debuglevel 10
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
trunk/source/rpc_server/srv_samr_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-08-05 04:46:33 UTC
(rev 9097)
+++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-08-05 04:48:02 UTC
(rev 9098)
@@ -1229,7 +1229,7 @@
}
for (i = 0; i num_names; i++) {
- DEBUG(10, (names[%d]:%s\n, i, *names[i] ? names[i] : ));
+ DEBUG(10, (names[%d]:%s\n, i, names[i] *names[i] ?
names[i] : ));
init_unistr2(uni_name[i], names[i], UNI_FLAGS_NONE);
init_uni_hdr(hdr_name[i], uni_name[i]);
}
Modified: trunk/source/rpc_server/srv_samr_nt.c
===
--- trunk/source/rpc_server/srv_samr_nt.c 2005-08-05 04:46:33 UTC (rev
9097)
+++ trunk/source/rpc_server/srv_samr_nt.c 2005-08-05 04:48:02 UTC (rev
9098)
@@ -1228,7 +1228,7 @@
}
for (i = 0; i num_names; i++) {
- DEBUG(10, (names[%d]:%s\n, i, *names[i] ? names[i] : ));
+ DEBUG(10, (names[%d]:%s\n, i, names[i] *names[i] ?
names[i] : ));
init_unistr2(uni_name[i], names[i], UNI_FLAGS_NONE);
init_uni_hdr(hdr_name[i], uni_name[i]);
}
svn commit: samba r9099 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 04:50:32 + (Fri, 05 Aug 2005)
New Revision: 9099
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9099
Log:
Start generating code to pull/push fields. Generate functions to call
the smb_raw_foo() calls.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
04:48:02 UTC (rev 9098)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
04:50:32 UTC (rev 9099)
@@ -4,6 +4,8 @@
#
use File::Basename;
+use Data::Dumper;
+
my $file = shift;
my $basename = basename($file, .h);
@@ -11,9 +13,6 @@
my $parser = new smb_interfaces;
$header = $parser-parse($file);
-use Data::Dumper;
-#print Dumper($header);
-
# Create header
open(FILE, ejs_${basename}.h);
@@ -38,28 +37,6 @@
print FILE NTSTATUS ejs_pull_$name(struct ejs_rpc *, struct MprVar *, const
char *, const uint32_t *);\n;
}
-sub pushpull_for($)
-{
- my $obj = shift;
- my $name = struct_name($obj);
-
- print FILE NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n;
- print FILE {\n;
-
- print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, \output\));\n;
-
- print FILE \n\treturn NT_STATUS_OK;\n;
- print FILE }\n\n;
-
- print FILE NTSTATUS ejs_pull_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n;
- print FILE {\n;
-
- print FILE \tNDR_CHECK(ejs_pull_struct_start(ejs, v, \input\));\n;
-
- print FILE \treturn NT_STATUS_OK;\n;
- print FILE }\n\n;
-}
-
foreach my $x (@{$header}) {
# Prototypes for top level structures and unions
@@ -89,21 +66,58 @@
# Top level push/pull functions
+sub print_field($$) {
+ my $f = shift;
+ my $suffix = shift;
+
+ if ($f-{TYPE} eq char and $f-{POINTERS} == 1) {
+$type = string;
+ }
+
+ if ($f-{TYPE} =~ /_t$/) {
+$type = $f-{TYPE};
+$type =~ s/_t$//;
+ }
+
+ foreach my $x (@{$f-{NAME}}) {
+print FILE \tNDR_CHECK(ejs_pull_$type(ejs, v, \$x\,
r-$suffix.$x));\n;
+ }
+}
+
foreach my $x (@{$header}) {
next, if $x-{STRUCT_NAME} eq ;
+ # Pull in to struct.in
+
print FILE static NTSTATUS ejs_pull_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x-{STRUCT_NAME} *r)\n;
print FILE {\n;
print FILE \tNDR_CHECK(ejs_pull_struct_start(ejs, v, \input\));\n;
- print FILE \treturn NT_STATUS_OK;\n;
+
+ foreach my $e (@{$x-{DATA}}) {
+next, if $e-{NAME}[0] ne 'in';
+foreach my $f (@{$e-{DATA}}) {
+ print_field($f, in);
+}
+ }
+
+ print FILE \n\treturn NT_STATUS_OK;\n;
print FILE }\n\n;
+ # Push from struct.out
+
print FILE static NTSTATUS ejs_push_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x-{STRUCT_NAME} *r)\n\n;
print FILE {\n;
print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, \output\));\n;
- print FILE \treturn NT_STATUS_OK;\n;
+ foreach my $e (@{$x-{DATA}}) {
+next, if $e-{NAME}[0] ne 'out';
+foreach my $f (@{$e-{DATA}}) {
+ print_field($f, out);
+}
+ }
+
+ print FILE \n\treturn NT_STATUS_OK;\n;
print FILE }\n\n;
}
@@ -117,12 +131,34 @@
print FILE static int ejs_$x-{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n;
print FILE {\n;
- print FILE \tstruct $x-{STRUCT_NAME} parms;\n\n;
+ print FILE \tstruct $x-{STRUCT_NAME} parms;\n;
+ print FILE \tstruct smbcli_tree *tree;\n;
+ print FILE \tNTSTATUS result;\n\n;
- print FILE \t$raw_name(tree, params);\n;
+ $output = __HERE__;
+ if (argc != 1 || argv[0]-type != MPR_TYPE_OBJECT) {
+ ejsSetErrorMsg(eid, invalid arguments);
+ return -1;
+ }
- print FILE \tejsSetErrorMsg(eid, \Not implemented\);\n;
- print FILE \treturn -1;\n;
+ tree = mprGetThisPtr(eid, tree);
+
+ if (!tree) {
+ ejsSetErrorMsg(eid, invalid tree);
+ return -1;
+ }
+
+__HERE__
+
+ print FILE $output;
+ print FILE \tresult = $raw_name(tree, params);\n\n;
+
+ print FILE \tmpr_Return(eid, mprNTSTATUS(status));\n;
+ print FILE \tif (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {\n;
+ print FILE \t\treturn -1;\n;
+ print FILE \t}\n\n;
+ print FILE \treturn 0;\n;
+
print FILE }\n\n;
}
svn commit: samba r9100 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-08-05 05:22:42 + (Fri, 05 Aug 2005)
New Revision: 9100
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9100
Log:
Experimental patch for jerry
Modified:
trunk/source/smbd/oplock.c
Changeset:
Modified: trunk/source/smbd/oplock.c
===
--- trunk/source/smbd/oplock.c 2005-08-05 04:50:32 UTC (rev 9099)
+++ trunk/source/smbd/oplock.c 2005-08-05 05:22:42 UTC (rev 9100)
@@ -110,8 +110,9 @@
BOOL set_file_oplock(files_struct *fsp, int oplock_type)
{
- if (koplocks !koplocks-set_oplock(fsp, oplock_type))
- return False;
+ if (koplocks) {
+ koplocks-set_oplock(fsp, oplock_type);
+ }
fsp-oplock_type = oplock_type;
fsp-sent_oplock_break = NO_BREAK_SENT;
svn commit: samba r9101 - in branches/SAMBA_4_0/source/build/pidl: .
Author: tpot Date: 2005-08-05 05:26:58 + (Fri, 05 Aug 2005) New Revision: 9101 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9101 Log: Check in file generated by Parse::YAPP. Modified: branches/SAMBA_4_0/source/build/pidl/smb_interfaces.pm Changeset: Sorry, the patch is too large (617 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9101
svn commit: samba r9102 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 05:32:39 + (Fri, 05 Aug 2005)
New Revision: 9102
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9102
Log:
Generate files in $srcdir/libcli/gen_raw instead of $srcdir.
Start fixing compile problems in generated output.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
05:26:58 UTC (rev 9101)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
05:32:39 UTC (rev 9102)
@@ -13,9 +13,11 @@
my $parser = new smb_interfaces;
$header = $parser-parse($file);
+stat libcli/gen_raw || mkdir(libcli/gen_raw) || die(mkdir);
+
# Create header
-open(FILE, ejs_${basename}.h);
+open(FILE, libcli/gen_raw/ejs_${basename}.h);
print FILE /* header auto-generated by build_smb_interfaces.pl */\n\n;
@@ -60,16 +62,23 @@
# Create file
-open(FILE, ejs_${basename}.c);
+open(FILE, libcli/gen_raw/ejs_${basename}.c);
print FILE /* EJS wrapper functions auto-generated by build_smb_interfaces.pl
*/\n\n;
+print FILE #include \includes.h\\n;
+print FILE #include \lib/appweb/ejs/ejs.h\\n;
+print FILE #include \scripting/ejs/ejsrpc.h\\n; # TODO: remove this
+print FILE \n;
+
# Top level push/pull functions
sub print_field($$) {
my $f = shift;
my $suffix = shift;
+ my $type = UNKNOWN;
+
if ($f-{TYPE} eq char and $f-{POINTERS} == 1) {
$type = string;
}
@@ -106,7 +115,7 @@
# Push from struct.out
- print FILE static NTSTATUS ejs_push_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x-{STRUCT_NAME} *r)\n\n;
+ print FILE static NTSTATUS ejs_push_$x-{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x-{STRUCT_NAME} *r)\n\n;
print FILE {\n;
print FILE \tNDR_CHECK(ejs_push_struct_start(ejs, v, \output\));\n;
svn commit: samba r9103 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-08-05 05:42:09 + (Fri, 05 Aug 2005)
New Revision: 9103
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9103
Log:
Hmm. It's too late :-)
Here's the real fix for the problem jerry sees.
Volker
Modified:
trunk/source/smbd/open.c
trunk/source/smbd/oplock.c
Changeset:
Modified: trunk/source/smbd/open.c
===
--- trunk/source/smbd/open.c2005-08-05 05:32:39 UTC (rev 9102)
+++ trunk/source/smbd/open.c2005-08-05 05:42:09 UTC (rev 9103)
@@ -1670,7 +1670,10 @@
set_share_mode(fsp, 0, fsp-oplock_type);
if ((fsp-oplock_type != NO_OPLOCK)
(fsp-oplock_type != FAKE_LEVEL_II_OPLOCK)) {
- set_file_oplock(fsp, fsp-oplock_type);
+ if (!set_file_oplock(fsp, fsp-oplock_type)) {
+ /* Could not get the kernel oplock */
+ fsp-oplock_type = NO_OPLOCK;
+ }
}
if (create_options FILE_DELETE_ON_CLOSE) {
Modified: trunk/source/smbd/oplock.c
===
--- trunk/source/smbd/oplock.c 2005-08-05 05:32:39 UTC (rev 9102)
+++ trunk/source/smbd/oplock.c 2005-08-05 05:42:09 UTC (rev 9103)
@@ -110,9 +110,8 @@
BOOL set_file_oplock(files_struct *fsp, int oplock_type)
{
- if (koplocks) {
- koplocks-set_oplock(fsp, oplock_type);
- }
+ if (koplocks !koplocks-set_oplock(fsp, oplock_type))
+ return False;
fsp-oplock_type = oplock_type;
fsp-sent_oplock_break = NO_BREAK_SENT;
