Re: [Samba] Getting Winbind IDMAP into LDAP?
Hi, The uidNumber and gidNumber are in already in LDAP - they're shown using ldapsearch but not slapcat. I think they automatically get added by samba. Thanks, Simon From: Sam [EMAIL PROTECTED] Newsgroups: linux.samba Date: Tue, 16 Aug 2005 11:16:10 +1000 To: Gibbs, Simon [EMAIL PROTECTED] Subject: Re: [Samba] Getting Winbind IDMAP into LDAP? snip idmap uid = 1-1000 idmap gid = 1-1000 snip [EMAIL PROTECTED] etc]# slapcat | grep -i IDMAP o: Samba Idmap Directory dn: ou=Idmap,dc=uk,dc=corplan,dc=net ou: idmap I've googled about a bit and haven't bee able to find to much except this in ur LDIF used to populate LDAP add gidNumber: 1 uidNumber: 1 this provides initial seed for IDMAP. Thats how it worked for me. YMMV. Lookfor LDAP debug logs for more clues about its failure wrt LDAP connection. regards Shirish [EMAIL PROTECTED] The information contained in this email message may be confidential. If you are not the intended recipient, any use, interference with, disclosure or copying of this material is unauthorised and prohibited. Although this message and any attachments are believed to be free of viruses, no responsibility is accepted by TF Informa for any loss or damage arising in any way from receipt or use thereof. Messages to and from the company are monitored for operational reasons and in accordance with lawful business practices. If you have received this message in error, please notify us by return and delete the message and any attachments. Further enquiries/returns can be sent to [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Getting Winbind IDMAP into LDAP?
Hi Gints, Changing nsswitch.conf from: passwd: files ldap group: files ldap to passwd: files winbind group: files winbind did the trick. Running getent passwd/group began populating LDAP and I can search all the records using ldapsearch and slapcat. Would this be an error in the documentation as (unless I was reading the wrong section) it uses the ldap entries in it's example? My one concern is that when winbind is stopped and restarted the winbindd_idmap.tdb and winbindd_cache.tdb files are recreated and entries are added. Would this be expected? I guess I can test this today when I begin configuring a second node. Thanks for your help. Simon From: gints neimanis [EMAIL PROTECTED] Date: Tue, 16 Aug 2005 11:57:48 +0300 To: Gibbs, Simon [EMAIL PROTECTED], samba@lists.samba.org Subject: Re: Getting Winbind IDMAP into LDAP? Hi, to use ldap as winbind idamp backend, you don't need the NSS_LDAP at all. All queries and updates to ldap is performed by winbind itself. Your smb.conf looks fine. You may check 2 things: * Have you stored the LDAP Manager password to LDAP database with command smbpasswd -w 'verysecretldapmanager password' ? * and look if you have added winbind to /etc/nsswitch.conf (and then command getent passwd should show all domain users with id from ldap)? like: === ... passwd: files winbind group: files winbind ... === Next - you may increase the loglevel (loglevel 256) for LDAP server and look in ldap messages what is wrong in connection. Gints Gibbs, Simon wrote: Hi, I?ve been trying to populate an LDAP directory with IDMAP information from Winbind using NSS_LDAP without much success over the last week. Can anybody tell me if I?ve done anything obviously wrong? I?ve followed the example shown in the Samba ?By Example? doc and am at the stage where the LDAP directory has been created and configured, NSS_LDAP config is amended, smb.conf contains entries to use LDAP as a backend and I have deleted /var/cache/samba/winbindd_cache.tdb and winbindd_idmap.tdb. Now wbinfo ?u and wbinfo ?g show users and groups on the domain but getent passwd/groups only displays local users. The winbindd_cache.tdb and winbindd_idmap.tdb files have been recreated but only winbindd_cache.tdb holds any information. When I attempt to access a Samba share I?m prompted to enter a username and password. As I understand it once the wbinfo commands have been run this process should automatically populate the Idmap ou with the ID mappings ? is this correct? If so there must be something wrong with my config. Here?s the current config and relevent info ? sorry it?s a bit long: /etc/samba/smb.conf [global] workgroup = UKCORPLAN netbios name = UKFS01 server string = UKFS01 Samba Server winbind separator = / ldap ssl = no idmap uid = 1-1000 idmap gid = 1-1000 ldap admin dn = cn=Manager,dc=uk,dc=corplan,dc=net ldap idmap suffix = ou=Idmap ldap suffix = dc=uk,dc=corplan,dc=net idmap backend = ldap:ldap://10.10.4.111/ winbind enum users = yes winbind enum groups = yes template homedir = /mnt/emcpowerb/user/%D/%U template shell = /bin/bash password server = ukdc01.uk.corplan.net security = ADS #encrypt passwords = yes realm = uk.corplan.net browseable = yes username map = /etc/samba/smbusers log level = 10 ads:10 auth:10 sam:10 rpc:10 idmap:10 syslog = 0 log file = /var/log/samba/%m max log size = 50 # Share Definitions == [homes] comment = Home Directories browseable = no writable = yes [public] comment = Public Stuff path = /home/samba public = yes read only = no [test] comment = test share path = /mnt/emcpowera/shared/test public = yes browseable = yes writeable = yes /etc/nsswitch.conf passwd: files ldap shadow: files ldap group: files ldap #hosts: db files nisplus nis dns hosts: files dns /etc/openldap/slapd.conf # # See slapd.conf(5) for details on configuration options. # This file should NOT be world readable. # ## schema files (core.schema is required by default) include /etc/openldap/schema/core.schema ## needed for sambaSamAccount include /etc/openldap/schema/cosine.schema include /etc/openldap/schema/inetorgperson.schema include /etc/openldap/schema/nis.schema include /etc/openldap/schema/samba.schema # Allow LDAPv2 client connections. This is NOT the default. allow bind_v2 # Do not enable referrals until AFTER you have a working directory # service AND an understanding of referrals. #referral ldap://root.openldap.org pidfile /var/run/slapd.pid argsfile/var/run/slapd.args # Load dynamic backend modules: # modulepath/usr/sbin/openldap # moduleloadback_bdb.la # moduleloadback_ldap.la # moduleloadback_ldbm.la # moduleloadback_passwd.la # moduleload
[Samba] Home directories on AD/Samba
I just set up our Samba-Server to athenticate over Active Directory (Win 2003). But there is one thing that bothers me: There are no home-directories for the domain users, that waere added to the linux passwd database (EXAMPLE.COM+user1 can be authenticated, but has no home on the Linux-box). If I create a share home, nobody can open it, because it cannot be found. Only if I set the path option, it works, but all users that log in on the AD get this directory as home. Is there any solution to this, or I have to live with making a special share for every new user that comes to the AD? Thank you very much! Best regards: Kalin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] automount problem [solved]
Found the reason why I cannot umount the share after accessing it. Maybe it is interessting for someone out there. On my Client runs Samba which shares /export In that folder there are some other subfolders. One is a folder which is controlled by automount (/export/usbstick) To access the Stick I have to access /export/usbstick/usbstick (the second one is the key, specified in auto.master). This all happens localy - so far no problem. Now comes Samba into play. On a remote session I mount the share into /media Now I have /media/usbstick The key usbstick is invisible, BUT samba seems to interpret the key and gives them a random name (for my stick it is allways the same). So Konquerer shows me /media/usbstick/_2X68P~X (which is the same as /media/usbstick/usbstick). Accessing that folder is no problem. When I browse the second time to the folder /media/usbstick, konquerer shows me sometimes usbstick too. Accessing now /media/usbstick/usbstick is also no problem. BUT, accessing the first time /media/usbstick/usbstick with a direct link brings the problem with umount as described above. Seems a problem with automount in association with smb. My solution at the moment is to access the stick by browsing its location - not accessing it with a direct link. Jan Jan Dworschak wrote: hi, I'm not sure if this is the right list. my client is sharing a folder via samba (/export) In that folder there is a automount-entry for my usbstick (/export/usbstick) On another host i can mount the export with mount.smbfs As soon as I access the stick (so automount gets active) i cannot umount the share. Get error: device is busy (automount timeout is set to 2sec.) When i never access the stick (automount is still waiting), a umount is no problem. any suggestions? Jan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 2.2.7 - 3.0.14a arabic file name dispaly
Hi, On 2005-08-10 at 11:45 +0400 Ahmed Mahmoud Ibnouf sent off: After migrating from 2.2.7 to 3.0.14a arabic file names were displayed in Japaneese charcters. I used convmv -f cp850 -t utf8 but still unreadable characters. cp850 is probably not the correct codepage. Try to find out the correct codepage for your region (might be cp1256 or cp864 ?). cp850 is the western european (ASCII+Umlauts etc.) codepage. Bjoern -- Björn Jacke, SerNet Service Network GmbH Phone: +49-(0)551-37-0, Fax: +49-(0)551-37-9 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] PDC Question: does tdbsam support logon hours
Hi, I have a setup, which runs on Samba 3.0.10, and the backend is tdbsam files. There is a new requirement to enforce logon hours. I can see the fields.. #pdbedit -v -u user Logon time: 0 Logoff time: Mon, 18 Jan 2038 20:14:07 GMT Kickoff time: Mon, 18 Jan 2038 20:14:07 GMT ... How can I edit it ? is it possible ? From searching through the lists, I came to know ldap backend supports this... http://lists.samba.org/archive/samba/2002-March/039590.html http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/passdb.html#id2572474 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
[Samba] Re: Getting Winbind IDMAP into LDAP?
Hi, to use ldap as winbind idamp backend, you don't need the NSS_LDAP at all. All queries and updates to ldap is performed by winbind itself. Your smb.conf looks fine. You may check 2 things: * Have you stored the LDAP Manager password to LDAP database with command smbpasswd -w 'verysecretldapmanager password' ? * and look if you have added winbind to /etc/nsswitch.conf (and then command getent passwd should show all domain users with id from ldap)? like: === ... passwd: files winbind group: files winbind ... === Next - you may increase the loglevel (loglevel 256) for LDAP server and look in ldap messages what is wrong in connection. Gints Gibbs, Simon wrote: Hi, I¹ve been trying to populate an LDAP directory with IDMAP information from Winbind using NSS_LDAP without much success over the last week. Can anybody tell me if I¹ve done anything obviously wrong? I¹ve followed the example shown in the Samba ³By Example² doc and am at the stage where the LDAP directory has been created and configured, NSS_LDAP config is amended, smb.conf contains entries to use LDAP as a backend and I have deleted /var/cache/samba/winbindd_cache.tdb and winbindd_idmap.tdb. Now wbinfo u and wbinfo g show users and groups on the domain but getent passwd/groups only displays local users. The winbindd_cache.tdb and winbindd_idmap.tdb files have been recreated but only winbindd_cache.tdb holds any information. When I attempt to access a Samba share I¹m prompted to enter a username and password. As I understand it once the wbinfo commands have been run this process should automatically populate the Idmap ou with the ID mappings is this correct? If so there must be something wrong with my config. Here¹s the current config and relevent info sorry it¹s a bit long: /etc/samba/smb.conf [global] workgroup = UKCORPLAN netbios name = UKFS01 server string = UKFS01 Samba Server winbind separator = / ldap ssl = no idmap uid = 1-1000 idmap gid = 1-1000 ldap admin dn = cn=Manager,dc=uk,dc=corplan,dc=net ldap idmap suffix = ou=Idmap ldap suffix = dc=uk,dc=corplan,dc=net idmap backend = ldap:ldap://10.10.4.111/ winbind enum users = yes winbind enum groups = yes template homedir = /mnt/emcpowerb/user/%D/%U template shell = /bin/bash password server = ukdc01.uk.corplan.net security = ADS #encrypt passwords = yes realm = uk.corplan.net browseable = yes username map = /etc/samba/smbusers log level = 10 ads:10 auth:10 sam:10 rpc:10 idmap:10 syslog = 0 log file = /var/log/samba/%m max log size = 50 # Share Definitions == [homes] comment = Home Directories browseable = no writable = yes [public] comment = Public Stuff path = /home/samba public = yes read only = no [test] comment = test share path = /mnt/emcpowera/shared/test public = yes browseable = yes writeable = yes /etc/nsswitch.conf passwd: files ldap shadow: files ldap group: files ldap #hosts: db files nisplus nis dns hosts: files dns /etc/openldap/slapd.conf # # See slapd.conf(5) for details on configuration options. # This file should NOT be world readable. # ## schema files (core.schema is required by default) include /etc/openldap/schema/core.schema ## needed for sambaSamAccount include /etc/openldap/schema/cosine.schema include /etc/openldap/schema/inetorgperson.schema include /etc/openldap/schema/nis.schema include /etc/openldap/schema/samba.schema # Allow LDAPv2 client connections. This is NOT the default. allow bind_v2 # Do not enable referrals until AFTER you have a working directory # service AND an understanding of referrals. #referral ldap://root.openldap.org pidfile /var/run/slapd.pid argsfile/var/run/slapd.args # Load dynamic backend modules: # modulepath/usr/sbin/openldap # moduleloadback_bdb.la # moduleloadback_ldap.la # moduleloadback_ldbm.la # moduleloadback_passwd.la # moduleloadback_shell.la # Sample access control policy: # Root DSE: allow anyone to read it # Subschema (sub)entry DSE: allow anyone to read it # Other DSEs: # Allow self write access # Allow authenticated users read access # Allow anonymous users to authenticate # Directives needed to implement policy: # access to dn.base= by * read # access to dn.base=cn=Subschema by * read #access to * # by self write # by users read # by anonymous auth # # if no access controls are present, the default policy # allows anyone and everyone to read anything but restricts # updates to rootdn. (e.g., access to * by * read) # # rootdn can always read and write EVERYTHING! ### # ldbm and/or bdb database definitions ### databasebdb suffix dc=uk,dc=corplan,dc=net rootdn
[Samba] Re: Getting Winbind IDMAP into LDAP?
Hi Simon, I thnik it is not the error in documentation (I don't know about which chapter we are talking :)). If you use winbdind authentication (+ idmap/ldap) only, you don't need the NSS_LDAP. But if you build a domain, where all user data is stored in LDAP, then you may authenticate users (from *nix) directly to LDAP database - and then you should use the NSS_LDAP (and Windows clients are using (SAMBA)Domain authentication. And the Samba guides are more explaining how to build the full Samba domain with LDAP backend. About winbind*tdb. I have too such files and I think it is expected (it speeds up resolving the id's). My setup with W2K as domain controller and SAMBA servers with winbind+idmap_ldap works fine for ~2 year without any trouble for 900 users (Thanks for Samba team!). Gints Gibbs, Simon wrote: Hi Gints, Changing nsswitch.conf from: passwd: files ldap group: files ldap to passwd: files winbind group: files winbind did the trick. Running getent passwd/group began populating LDAP and I can search all the records using ldapsearch and slapcat. Would this be an error in the documentation as (unless I was reading the wrong section) it uses the ldap entries in it's example? My one concern is that when winbind is stopped and restarted the winbindd_idmap.tdb and winbindd_cache.tdb files are recreated and entries are added. Would this be expected? I guess I can test this today when I begin configuring a second node. Thanks for your help. Simon -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Home directories on AD/Samba
Hi Kalin, Do you have template homedir = string in smb.conf ? If you whish to automaticaly create the home dir, then you may use the pam_mkhomdir (and add obey pam restrictions = yes to smb.conf) AND: If the SAMBA authenticates over Active Directory, then you don't need to add domain users to linux passwd database !!! Can you post your smb.conf file? Gints Neimanis Kalin Evtimov wrote: I just set up our Samba-Server to athenticate over Active Directory (Win 2003). But there is one thing that bothers me: There are no home-directories for the domain users, that waere added to the linux passwd database (EXAMPLE.COM+user1 can be authenticated, but has no home on the Linux-box). If I create a share home, nobody can open it, because it cannot be found. Only if I set the path option, it works, but all users that log in on the AD get this directory as home. Is there any solution to this, or I have to live with making a special share for every new user that comes to the AD? Thank you very much! Best regards: Kalin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] interdomain trust between windows 2003 server and samba
hello Is it possible to establish a trust between an windows 2003 server and samba 3.0.14a PDC? Samba as the trusted domain, windows 2003 as the trusting domain. werner -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
FW: [Samba] Error:The semaphore timeout period has expired
UPDATE: We found out that there was still an entry in /etc/rc.local to start up the old SAMBA after upgrading and setting up to run from inetd.conf. Once the /etc/rc.local entry was removed, we no longer receive the semaphore timeout period has expired messages and we are able to connect to the shares. Ben Burruel Sr. Systems Manager Metrics Mainframe Capacity Planning San Diego (858) 886-3363 -Original Message- From: BURRUEL, BENJAMIN D (SBCSI) Sent: Monday, August 15, 2005 7:44 AM To: 'samba@lists.samba.org' Subject: [Samba] Error:The semaphore timeout period has expired We are experiencing the semaphore timeout period has expired while attempting to connect to a Samba share on an AIX machine from W2k desktops. I saw some other posts in the archives about this error, but I did not see any about the resolution. Has anyone come up with a resolution for this? What is unusual is that we have 2 AIX servers running the same version of SAMBA and we can connect to one but not the other. Both AIX servers are physically identical. smb.conf on both systems are nearly identical except for the server string statement. Ben Burruel Sr. Systems Manager Metrics Mainframe Capacity Planning San Diego (858) 886-3363 PROPRIETARY INFORMATION Not for use or disclosure outside the SBC family of companies, except under written agreement. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] EFS crypted files and smbclient.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Olivier LAHAYE wrote: 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) ? Is smbclient failing? I've never looked into EFS but I assumed the client didi the decryption. So copying the file shoudl be no big deal. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAfp0IR7qMdg1EfYRAn6aAJ4511AXf17WaZgfYOOLy8SaXw2SMgCgv+eG bJLXhIH5CCtcVUBoLhlP4+0= =hIGb -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Getting Winbind IDMAP into LDAP?
On Tuesday 16 August 2005 03:35, Gibbs, Simon wrote: Hi Gints, Changing nsswitch.conf from: passwd: files ldap group: files ldap to passwd: files winbind group: files winbind did the trick. Running getent passwd/group began populating LDAP and I can search all the records using ldapsearch and slapcat. Correct - the use of LDAP to store the IDMAP data requires winbind support through NSS. Would this be an error in the documentation as (unless I was reading the wrong section) it uses the ldap entries in it's example? The documentation may not be clear enough. Please help me to fix this. What section (section number - not page number) and in which book? Have you used the on-line version? Or do you have a printed copy? Cheers, John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Getting Winbind IDMAP into LDAP?
On Tuesday 16 August 2005 04:27, gints neimanis wrote: Hi Simon, I thnik it is not the error in documentation (I don't know about which chapter we are talking :)). I have reviewed the documentation on IDMAP in LDAP and it looks to me like something got deleted from the documentation sources somewhere in the editing cycle. That is why I would like to know precisely what version and section of the documentation has been referred to. I will fix any weaknesses, or lack of clarity, that can be uncovered. If you use winbdind authentication (+ idmap/ldap) only, you don't need the NSS_LDAP. Correct. But if you build a domain, where all user data is stored in LDAP, then you may authenticate users (from *nix) directly to LDAP database - and then you should use the NSS_LDAP (and Windows clients are using (SAMBA)Domain authentication. And the Samba guides are more explaining how to build the full Samba domain with LDAP backend. Correct. Cheers, John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Getting Winbind IDMAP into LDAP?
Hi John, I was using the online By-Example documentation at: http://us3.samba.org/samba/docs/man/Samba-Guide/unixclients.html#id2579097 Starting at the sub heading IDMAP Storage in LDAP using Winbind. The example that appears to be incorrect is related to /etc/nsswitch.conf: ... passwd: files ldap shadow: files ldap group: files ldap ... hosts: files wins ... The correct entries (working for me now) are: ... passwd: files winbind shadow: files group: files winbind ... hosts: files dns (we don't use wins) From a personal point of view it would have been useful to have an additional entry in this section explaining how the the idmap ou is populated, but I guess you can figure it out in the end. Hope this helps, Simon From: John H Terpstra [EMAIL PROTECTED] Reply-To: [EMAIL PROTECTED] Date: Tue, 16 Aug 2005 08:46:45 -0600 To: samba@lists.samba.org Cc: gints neimanis [EMAIL PROTECTED], Gibbs, Simon [EMAIL PROTECTED] Subject: Re: [Samba] Re: Getting Winbind IDMAP into LDAP? On Tuesday 16 August 2005 04:27, gints neimanis wrote: Hi Simon, I thnik it is not the error in documentation (I don't know about which chapter we are talking :)). I have reviewed the documentation on IDMAP in LDAP and it looks to me like something got deleted from the documentation sources somewhere in the editing cycle. That is why I would like to know precisely what version and section of the documentation has been referred to. I will fix any weaknesses, or lack of clarity, that can be uncovered. If you use winbdind authentication (+ idmap/ldap) only, you don't need the NSS_LDAP. Correct. But if you build a domain, where all user data is stored in LDAP, then you may authenticate users (from *nix) directly to LDAP database - and then you should use the NSS_LDAP (and Windows clients are using (SAMBA)Domain authentication. And the Samba guides are more explaining how to build the full Samba domain with LDAP backend. Correct. Cheers, John T. The information contained in this email message may be confidential. If you are not the intended recipient, any use, interference with, disclosure or copying of this material is unauthorised and prohibited. Although this message and any attachments are believed to be free of viruses, no responsibility is accepted by TF Informa for any loss or damage arising in any way from receipt or use thereof. Messages to and from the company are monitored for operational reasons and in accordance with lawful business practices. If you have received this message in error, please notify us by return and delete the message and any attachments. Further enquiries/returns can be sent to [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Getting Winbind IDMAP into LDAP?
On Tuesday 16 August 2005 09:01, Gibbs, Simon wrote: Hi John, I was using the online By-Example documentation at: http://us3.samba.org/samba/docs/man/Samba-Guide/unixclients.html#id2579097 Starting at the sub heading IDMAP Storage in LDAP using Winbind. Thanks. I'll revise this chapter as soon as I can get to this. The example that appears to be incorrect is related to /etc/nsswitch.conf: ... passwd: files ldap shadow: files ldap group: files ldap ... hosts: files wins ... The correct entries (working for me now) are: ... passwd: files winbind shadow: files group: files winbind ... hosts: files dns (we don't use wins) From a personal point of view it would have been useful to have an additional entry in this section explaining how the the idmap ou is populated, but I guess you can figure it out in the end. Noted. Thanks for the feedback. - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] EFS crypted files and smbclient.
Unfortunately it's not that simple. The file is encrypted at FS level: using a share will not let the file to be read. Even on windows. (You get a permission denied). Having the erroro correctly handled would allow to continue my file readings (via backuppc) instead of a timeout error. Just right click on a file that is shared: click on properties / advanced and check crypt. Then try to read it remlotely. It will faile. You even cannot copy the crypted file. So 2 solutions: either correctly handle the error (perm denied (reported when trying to access via a real windows system)) Or if implemented by windows, being able to use the certificate to read the file (probably not possible though). Regards. Olivier. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Gerald (Jerry) Carter Sent: mardi 16 août 2005 16:39 To: Olivier LAHAYE Cc: samba@lists.samba.org Subject: Re: [Samba] EFS crypted files and smbclient. -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Olivier LAHAYE wrote: 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) ? Is smbclient failing? I've never looked into EFS but I assumed the client didi the decryption. So copying the file shoudl be no big deal. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAfp0IR7qMdg1EfYRAn6aAJ4511AXf17WaZgfYOOLy8SaXw2SMgCgv+eG bJLXhIH5CCtcVUBoLhlP4+0= =hIGb -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Error loading Samba pdb/mysql.so file
Hello All, Can some one please let me know what is happening here: - [2005/08/16 01:59:15, 0] passdb/pdb_interface.c:make_pdb_methods_name(721) No builtin nor plugin backend for plugin found [2005/08/16 01:59:15, 1] passdb/pdb_interface.c:make_pdb_context_list(825) Loading plugin:/usr/lib/samba/pdb/mysql.so:mysql failed! - I compiled the sources --with-expsam=mysql and everything compiled just fine into the RPM along with the mysql.so file in the /usr/lib/samba/pdb/ directory. Not sure why there is an error loading? -- Thanks, Lonnie -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] username map file to link Domain groups to user
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Rousak, Boris wrote: Question: is it possible to use the username map file to link a domain group - as supplied by wbinfo -u with a single local (/etc/passwd) user, so that only domain memebers of that group can access a particular share, but from the shares point of view it is accessed by the same user? Should be. Or if you need this for a single share, then just use 'force user' cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAhG9IR7qMdg1EfYRAh2zAKDmYjDliafphNsRUSw/lIJLNdb9OwCgoo5n KFvjRaflCZ8rBiH3Wcr8fI4= =2qW1 -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] Compiling smbtorture
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 overbored wrote: Is smbtorture a simple SMB client that is completely separate from Samba server? (I.e., can I use it to test, e.g., a regular Windows SMB server?) Or is it something that only tests Samba server? Anyway, I haven't had any luck compiling it. Any hints? Here is a transcript (this is on SUSE Linux Enterprise 9): You need to run 'make proto' before 'make torture' cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAhH6IR7qMdg1EfYRAomMAKDxKGrH7mEc/0lCHZrtPbWcqX99lQCfSBF0 ChTdajYQGuTqJCo6ZnZEnsA= =Opsx -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] Fw: your mail
Freebsd 5.4 smbstatus output #smbstatus Failed to open byte range locking database ERROR: Failed to initialise locking database Can't initialise locking module - exiting ??? - Original Message - From: Jeremy Allison [EMAIL PROTECTED] To: Konstantin Getman [EMAIL PROTECTED] Sent: Tuesday, August 16, 2005 8:06 PM Subject: Re: your mail On Tue, Aug 16, 2005 at 02:21:25PM +0300, Konstantin Getman wrote: Freebsd 5.4 smbstatus output #smbstatus Failed to open byte range locking database ERROR: Failed to initialise locking database Can't initialise locking module - exiting Please ask questions like this on the main [EMAIL PROTECTED] mailing list. Thanks, Jeremy. __ Èíôîðìàöèÿ NOD32 1.1194 (20050815) __ Ýòî ñîîáùåíèå ïðîâåðåíî Àíòèâèðóñíîé ñèñòåìîé NOD32. http://www.nod32.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Windows offline files synchronization failure for mounted Samba drive.
Windows offline files synchronization fails for mounted Samba drive unless files are owned by the user performing the synchronization. You can duplicate this problem by making a folder or file which is located on a samba mounted drive available offline. 1) From windows Explorer on a Windows XP SP2 Machine connected to the network samba drive, right click on a test file owned by someone else but which you have group rw permissions in Linux (-rwx rw- ---otheruser commongrouptestfilename) and select make available offline. a. You may need to enable offline file from the Tools - Folder options - Offline Files Tab in Windows Explorer 2) Disconnect from the network (unplug enet cable) 3) You should notice the offline files icon appear in your task bar (small computer icon). Verify you can still find and open the file using windows explorer. Open, change, and save the file. 4) Reconnect to the network. 5) Synchronize offline files by right clicking on the offline files icon in the task bar and selecting Synchronize. 6) Windows Synchronization will fail and will present a message that the system does not have permission to write the test file. Work around for single user synchronization: fource user = username will insure that all files created under the respective share are owned by username. Obviously does not work if more that one user need to synchronizae offline files. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compiling smbtorture
Is smbtorture on ftp.samba.org? (If so, where?) I've found dbench in the tridge directory. It mentions tbench and smbtorture in the README but I have not found those packages yet. Thanks, Don cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAhH6IR7qMdg1EfYRAomMAKDxKGrH7mEc/0lCHZrtPbWcqX99lQCfSBF0 ChTdajYQGuTqJCo6ZnZEnsA= =Opsx -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] question about EMC filer to join SAMBA domain
Hi I'm sorry if this question has been asked and answered. Does anyone know that EMC Celerra filer can join samba 3 domain? Thanks, -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba 3, AD, and roaming profiles
Greetings, I have been working on getting Samba 3.0.20rc2 on a Sun Solaris box to play nice with our institution's Active Directory (AD) environment. The AD set-up is pretty plain and I have no ability to make changes to its configuration - a different department runs that show. Should I be able to store the roaming profile information on my Samba server in an AD environment? The rest of the campus does not use roaming profiles so they provide no support or storage for them. We've been using them for years and do not want to give them up - but we are being forced onto the AD system. We will go, but I don't want my users to have to give up features to make the transition. I have my Samba server as a member server belonging to the AD domain, I can log onto the Solaris host as an AD user, and Samba provides resources to the Windows clients - so far, so good. What I need to be able to do for my group is store their roaming profiles on my samba server, and run our logon script from our samba server. I have access to User Manager for AD and have modified the profile entry for my test user to: profile path \\techops-test\profile login script \\techops-test\netlogon\mglcua.bat Home directory map h:\ to \\techops-test\homes\marteltest I have also tried: profile path \\techops-test\profile\marteltest When I try logging onto a windows machine it reports that it is unable to locate the server copy of your roaming profile and the detail says that The profile path cannot be found. When I looked at the smblog file I saw the following: [2005/08/16 13:52:48, 10] passdb/pdb_get_set.c:pdb_set_profile_path(752) pdb_set_profile_path: setting profile path \\techops-test\marteltest\profile, was Anyone know why the UNC was flipped to \\techops-test\marteltest\profile rather than \\techops-test\profile\marteltest? The login script does not run. The user's home directory *does* get mapped as the H:\ drive. Thanks! Bob Martel -- *** Bob Martel,System Administrator I met someone who looks a lot like you Levin College of Urban Affairs She does the things you do Cleveland State University But she is an IBM (216) 687-2214 [EMAIL PROTECTED]-Jeff Lynne *** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] problems with making Samba authenticate off of domain server
starting from here: http://us1.samba.org/samba/docs/man/Samba-Guide/unixclients.html#wdcsdm I follow all the instructions including using the samba configuration found in: http://us1.samba.org/samba/docs/man/Samba-Guide/unixclients.html#ch0-NT4DSDM making obvious changes for workgroup, domain etc. The join succeeds but the wbinfo -u test fails. yes, I verified that all the demons are running and logs show nothing except the startup messages. Any ideas? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] kerberos_kinit_password: Decrypt integrity check failed
Thank you Ken.
I ran kinit with users in DOMAIN, and something
like host/[EMAIL PROTECTED] and all worked fine, not
errors.
This is my krb5.conf file. Would you help me?
Thank you very much.
--
[libdefaults]
ticket_lifetime = 24000
default_realm = DOMAIN.COM.MX
default_tgs_enctypes = des-cbc-crc des-cbc-md5
default_tkt_enctypes = des-cbc-crc des-cbc-md5
forwardable = true
proxiable = true
dns_lookup_realm = true
dns_lookup_kdc = true
[realms]
DOMAIN.COM.MX = {
kdc = hostdc.domain.com.mx:88
kdc = hostdc2.domain.com.mx:88
admin_server = hostdc.domain.com.mx
default_domain = domain.com.mx
}
[domain_realm]
.domain.com.mx = DOMAIN.COM.MX
domain.com.mx = DOMAIN.COM.MX
.netbiosdomain_name = DOMAIN.COM.MX
netbiosdomain_name = DOMAIN.COM.MX
host = host.domain.com.mx
HOST = host.domain.com.mx
[logging]
default = FILE:/var/krb5/kdc.log
kdc = FILE:/var/krb5/kdc.log
admin_server = FILE:/var/krb5/kdc.log
kdc_rotate = {
period = 1d
versions = 10
}
[kdc]
profile = /var/kerberos/krb5kdc/kdc.conf
[appdefaults]
pam = {
debug = false
ticket_lifetime = 36000
renew_lifetime = 36000
forwardable = true
krb4_convert = false
}
# kinit = {
# renewable = true
# forwardable= true
# }
--- Ken Nakamura [EMAIL PROTECTED] wrote:
sounds like you need kerberos 5 installed and
configured properly. check
your /etc/krb5.conf, or post it.
also, here is a great howto:
http://gentoo-wiki.com/HOWTO_Adding_a_Samba_Server_into_an_existing_AD_Domai
n
hope this helps,
-k
On 8/16/05 2:42 PM, P V
[EMAIL PROTECTED] wrote:
Please, somebody can help me?
When I start samba I get this error en
log.smbd:
[2005/08/16 16:30:01, 0] smbd/server.c:main(802)
smbd version 3.0.20rc1 started.
Copyright Andrew Tridgell and the Samba Team
1992-2004
[2005/08/16 16:30:01, 0]
libads/kerberos.c:ads_kinit_password(146)
kerberos_kinit_password host/[EMAIL PROTECTED]
failed: Decrypt integrity che
ck failed
-
In log.wb-WORKGROUP
-
[2005/08/16 16:30:09, 0]
libsmb/cliconnect.c:cli_session_setup_spnego(762)
Kinit failed: Client not found in Kerberos
database
[2005/08/16 16:30:09, 1]
nsswitch/winbindd_cm.c:cm_prepare_connection(331)
failed tcon_X with NT_STATUS_ACCESS_DENIED
[2005/08/16 16:30:09, 0]
lib/fault.c:fault_report(36)
==
[2005/08/16 16:30:09, 0]
lib/fault.c:fault_report(37)
INTERNAL ERROR: Signal 11 in pid 699 (3.0.20rc1)
Please read the appendix Bugs of the Samba HOWTO
collection
[2005/08/16 16:30:09, 0]
lib/fault.c:fault_report(39)
==[2005/08/16
16:30:09, 0] lib/util.c:smb_panic2(1548)
PANIC: internal error
[2005/08/16 16:30:12, 0] libsmb/cliconnect.c:
-
My smb.conf:
-
workgroup = WORKGROUP
netbios name = HOST
idmap uid = 1-2
idmap gid = 1-2
winbind enum users = yes
winbind enum groups = yes
template homedir = /home/%D/%U
template shell = /bin/bash
security = ads
encrypt passwords = yes
realm = DOMAIN.COM.MX
-
Any idea will be appreciated.
Start your day with Yahoo! - make it your home
page
http://www.yahoo.com/r/hs
__
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] Missing 'HAVE_SYS_ACL_H'
You got it - I needed both libacl1-devel and libattr1-devel packages, which strangely were not included with development packages on 10.2 but were on 9.2 Mandrake. I'm pleased to also report that my ACL recursion issue from 3.0.13 appears to be fixed in 3.0.14a, at least in initial testing. Thanks! On 15 Aug 2005 at 21:08, Shawn Wright wrote: On 15 Aug 2005 at 20:51, Doug VanLeuven wrote: Shawn Wright wrote: I have the libacl and acl rpms installed, which has been enough for previous installs on Mandrake 9.2... Check for libacl-devel Need that for the include files. Thanks, Doug. That's it. Something must have changed in the package options for 10.2 from 9.2. I'll add that and try again. Maybe I can resolve my ACL recursion problem now... -- Shawn Wright I.T. Manager Shawnigan Lake School -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Shawn Wright, I.T. Manager Shawnigan Lake School http://www.sls.bc.ca [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: problems with making Samba authenticate off of domain server
Eric S. Johansson wrote: starting from here: The join succeeds but the wbinfo -u test fails. yes, I verified that all the demons are running and logs show nothing except the startup messages. ugh. long day. sorry about the missing information ubutntu 5.0.4 samba 3.0.10 (I believe) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba with NIS Authentication
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Saurabh Jain wrote: I have a huge UNIX network. I want to deploy a Samba server using NIS Authentication mechanism for the growing number of windows machines. What are the pros and cons of using NIS authentication with Samba? Pros: you can use existing unfix passwords Cons: (a) no modern windows client supports this without local client changes to the registry, (b) clients cannot automatically reconnect to shares since they only cache the password hash, (c) you can't run a Samba domain without 'encrypt passwords = yes', (d) clear test passwords are do '90's :-) cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAqnYIR7qMdg1EfYRApqIAJ9BcziFAKfQYDgErWx1eNlyD0VJUgCgusQt Gr0oN6stSQJ6mRbkwAdu1Js= =PoVo -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] kerberos_kinit_password: Decrypt integrity check failed
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 P V wrote: - [2005/08/16 16:30:09, 0] libsmb/cliconnect.c:cli_session_setup_spnego(762) Kinit failed: Client not found in Kerberos database [2005/08/16 16:30:09, 1] nsswitch/winbindd_cm.c:cm_prepare_connection(331) failed tcon_X with NT_STATUS_ACCESS_DENIED [2005/08/16 16:30:09, 0] lib/fault.c:fault_report(36) == [2005/08/16 16:30:09, 0] lib/fault.c:fault_report(37) INTERNAL ERROR: Signal 11 in pid 699 (3.0.20rc1) Please read the appendix Bugs of the Samba HOWTO collection [2005/08/16 16:30:09, 0] lib/fault.c:fault_report(39) ==[2005/08/16 16:30:09, 0] lib/util.c:smb_panic2(1548) PANIC: internal error [2005/08/16 16:30:12, 0] libsmb/cliconnect.c: - You've got kerberos problems for one thing? Are you on Fedora Core 4 by chance? There's been some problems reported with the krb5-1.4.1 rpms in that distro (actually its in e2fsprogs apparently but the crash looks like it is in the krb5 libs). cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAqxrIR7qMdg1EfYRAsVJAJ4twwWLY4zJ8poKZaUGVz8SBoSvfACeO9zr h8HpEKwawjq6hIMGH0hPgoM= =P+f2 -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] question about EMC filer to join SAMBA domain
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 George Liu wrote: Hi I'm sorry if this question has been asked and answered. Does anyone know that EMC Celerra filer can join samba 3 domain? Thanks, Dunno. I'll check with some folks and EMC and see if we can get some help testing things out. cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAq1NIR7qMdg1EfYRAjdhAJ494mJDco2ODfV0U9yEb1RoV/FR2gCghGu3 uOZgsdRJ9p+Gm1iaYfGYaYE= =HWDd -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] Compiling smbtorture
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Don wrote: Is smbtorture on ftp.samba.org? (If so, where?) I've found dbench in the tridge directory. It mentions tbench and smbtorture in the README but I have not found those packages yet. smbtorture is distributed as part of the Samba tarballs. There's a newer version in the SAMBA_4_0 tree (depending on your needs). ciao, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAq4QIR7qMdg1EfYRAtIYAKCe0y8Iw7T1LAC7g2vLLeuJKoO25gCcDCY3 8ghQq/fmYr+fQjmM8s5Aqe8= =f8rD -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3, AD, and roaming profiles
I have been working on getting Samba 3.0.20rc2 on a Sun Solaris box to play nice with our institution's Active Directory (AD) environment. The AD set-up is pretty plain and I have no ability to make changes to its configuration - a different department runs that show. Should I be able to store the roaming profile information on my Samba server in an AD environment? The rest of the campus does not use roaming profiles so they provide no support or storage for them. We've been using them for years and do not want to give them up - but we are being forced onto the AD system. We will go, but I don't want my users to have to give up features to make the transition. I have my Samba server as a member server belonging to the AD domain, I can log onto the Solaris host as an AD user, and Samba provides resources to the Windows clients - so far, so good. What I need to be able to do for my group is store their roaming profiles on my samba server, and run our logon script from our samba server. I have access to User Manager for AD and have modified the profile entry for my test user to: profile path \\techops-test\profile login script \\techops-test\netlogon\mglcua.bat Home directory map h:\ to \\techops-test\homes\marteltest I have also tried: profile path \\techops-test\profile\marteltest logon path ? logon home ? (depending on windows version) not profile path :-) logon path doesn't have to point to PDC (which is AD in your case), so You can specify samba UNC for that. just remember win2ksp4 and later are picky on profile ACLs, You should either use samba with ACL support or enable profile acls = yes on that share (believe me, You don't want that option enabled globally). logon script is relative to \\PDC\netlogon, so You can just specify s.bat and it will look for \\PDC\netlogon\s.bat When I try logging onto a windows machine it reports that it is unable to locate the server copy of your roaming profile and the detail says that The profile path cannot be found. When I looked at the smblog file I saw the following: [2005/08/16 13:52:48, 10] passdb/pdb_get_set.c:pdb_set_profile_path(752) pdb_set_profile_path: setting profile path \\techops-test\marteltest\profile, was Anyone know why the UNC was flipped to \\techops-test\marteltest\profile rather than \\techops-test\profile\marteltest? The login script does not run. The user's home directory *does* get mapped as the H:\ drive. Thanks! Bob Martel -- *** Bob Martel,System Administrator I met someone who looks a lot like you Levin College of Urban Affairs She does the things you do Cleveland State University But she is an IBM (216) 687-2214 [EMAIL PROTECTED]-Jeff Lynne *** -- 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 2.2.8 (JYC 31-Mar-05 version) problem with records longer than 1022 bytes
Just wondering if there is a Known Issues List for the current JYC release(s). ...and/or if anyone knows of anymore such holes in the road that may jump out and bite us. D.J.D. At 04:02 PM 08/16/2005 +0200, COLLOT Jean-Yves wrote: You are completely right. This is due from a limitation in the size of the buffer used for temporarily reading the records from a variable-size file, which is (as you may guess) 1024 bytes long (which limits to an actual 122, because of the CRLF). Why is it 1024 bytes long? I have no idea. It should have been 32769, obviously, because RMS does not accept records bigger than 32767 anyway. I can post a fixed version of Samba/VMS (which I'll do eventually anyway), or you can fix it yourself if you can compile, by changing the size of the onerec element of the struct fd_entry from 1024 to 32769. I did it, and it works... JYC -Message d'origine- De : [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] De la part de Rodney Kimber Envoyé : mardi 16 août 2005 05:19 À : samba-vms@lists.samba.org Objet : Samba 2.2.8 (JYC 31-Mar-05 version) problem with records longer than 1022 bytes I have been using the JYC version of Samba for a couple of months now and think it is great. I have just come across a problem and wonder if there is a fix for it or if anyone else has come across a similar situation. If I produce a file with lines longer than 1022 bytes then Samba will display this file as an empty file. For example, This file will be displayed as an empty file. TEST1.TXT;1 File ID: (27730,7,0) Size: 35/112Owner:[SYSTEM] File organization: Sequential Shelved state: Online Caching attribute: Writethrough File attributes:Allocation: 112, Extend: 100, Global buffer count: 0 No version limit Record format: Variable length, maximum 2048 bytes, longest 1248 bytes Record attributes: Carriage return carriage control This file will be displayed correctly (other than the data that is now missing because I had to shorten the lines!!!) TEST2.TXT;1 File ID: (37305,33,0) Size: 28/32 Owner:[SYSTEM] File organization: Sequential Shelved state: Online Caching attribute: Writethrough File attributes:Allocation: 32, Extend: 0, Global buffer count: 0 No version limit Record format: Variable length, maximum 0 bytes, longest 1022 bytes Record attributes: Carriage return carriage control Thanks for your help, Rodney Kimber PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
svn commit: samba r9318 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Author: metze
Date: 2005-08-16 06:55:40 + (Tue, 16 Aug 2005)
New Revision: 9318
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9318
Log:
fix searches with scope ONE and SUB,
the problem was that ldb_dn_compare_base() just looked at if
both dn's mtach some how, and the following happens:
basedn: CN=bar,DC=foo,DC=com
dn: DC=foo,DC=com
and dn: DC=foo,DC=com was return as result of a sub and base search
and also the ONE search with
basedn: DC=foo,DC=com
returned this
dn: CN=bla,CN=bar,DC=foo,DC=com
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c 2005-08-16 05:34:01 UTC
(rev 9317)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c 2005-08-16 06:55:40 UTC
(rev 9318)
@@ -415,6 +415,10 @@
int ret;
int n0, n1;
+ if (base-comp_num dn-comp_num) {
+ return (dn-comp_num - base-comp_num);
+ }
+
/* if the number of components doesn't match they differ */
n0 = base-comp_num - 1;
n1 = dn-comp_num - 1;
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c2005-08-16
05:34:01 UTC (rev 9317)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c2005-08-16
06:55:40 UTC (rev 9318)
@@ -71,7 +71,7 @@
break;
case LDB_SCOPE_ONELEVEL:
- if (dn-comp_num != base-comp_num) {
+ if (dn-comp_num == (base-comp_num + 1)) {
if (ldb_dn_compare_base(ldb, base, dn) == 0) {
ret = 1;
}
Re: svn commit: samba r9318 - in branches/SAMBA_4_0/source/lib/ldb/common: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: metze Date: 2005-08-16 06:55:40 + (Tue, 16 Aug 2005) New Revision: 9318 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9318 Log: fix searches with scope ONE and SUB, the problem was that ldb_dn_compare_base() just looked at if both dn's mtach some how, and the following happens: basedn: CN=bar,DC=foo,DC=com dn: DC=foo,DC=com and dn: DC=foo,DC=com was return as result of a sub and base search and also the ONE search with basedn: DC=foo,DC=com returned this dn: CN=bla,CN=bar,DC=foo,DC=com metze Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c BTW: many thanks to Holger Schmieder [EMAIL PROTECTED] for the bug report:-) - -- metze Stefan Metzmacher metze at samba.org www.samba.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3-nr1 (Windows XP) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDAY/8m70gjA5TCD8RAs/7AJ9N2/vr31i4qG37Ke/DmGpIBe6b4gCdHg9X Jspnt4z1Gfp7Paa281GbX04= =btje -END PGP SIGNATURE-
svn commit: samba r9319 - in branches/SAMBA_4_0/source/setup: .
Author: tridge
Date: 2005-08-16 10:52:02 + (Tue, 16 Aug 2005)
New Revision: 9319
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9319
Log:
updated newuser script for new OO style for nss object
thanks to Hotarut for spotting this
Modified:
branches/SAMBA_4_0/source/setup/newuser
Changeset:
Modified: branches/SAMBA_4_0/source/setup/newuser
===
--- branches/SAMBA_4_0/source/setup/newuser 2005-08-16 06:55:40 UTC (rev
9318)
+++ branches/SAMBA_4_0/source/setup/newuser 2005-08-16 10:52:02 UTC (rev
9319)
@@ -63,7 +63,8 @@
options.unixname = options.username;
}
-if (getpwnam(options.unixname) == undefined) {
+var nss = nss_init();
+if (nss.getpwnam(options.unixname) == undefined) {
printf(ERROR: Unix user '%s' does not exist\n, options.unixname);
exit(1);
}
svn commit: samba r9320 - in branches/SAMBA_4_0/source/ntvfs/unixuid: .
Author: ab
Date: 2005-08-16 10:57:21 + (Tue, 16 Aug 2005)
New Revision: 9320
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9320
Log:
Fix premature dereference bug found by Coverty and also get rid of non-used
memory context
Modified:
branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
===
--- branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2005-08-16
10:52:02 UTC (rev 9319)
+++ branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2005-08-16
10:57:21 UTC (rev 9320)
@@ -146,8 +146,7 @@
struct smbsrv_request *req, struct
unix_sec_ctx **sec)
{
struct unixuid_private *private = ntvfs-private_data;
- struct security_token *token =
req-session-session_info-security_token;
- void *ctx = talloc_new(req);
+ struct security_token *token;
struct unix_sec_ctx *newsec;
NTSTATUS status;
@@ -155,6 +154,8 @@
return NT_STATUS_ACCESS_DENIED;
}
+ token = req-session-session_info-security_token;
+
*sec = save_unix_security(req);
if (*sec == NULL) {
return NT_STATUS_NO_MEMORY;
@@ -165,7 +166,6 @@
} else {
status = nt_token_to_unix_security(ntvfs, req, token, newsec);
if (!NT_STATUS_IS_OK(status)) {
- talloc_free(ctx);
return status;
}
if (private-last_sec_ctx) {
@@ -178,12 +178,9 @@
status = set_unix_security(newsec);
if (!NT_STATUS_IS_OK(status)) {
- talloc_free(ctx);
return status;
}
- talloc_free(ctx);
-
return NT_STATUS_OK;
}
svn commit: samba r9321 - in branches/SAMBA_4_0/source/smb_server: .
Author: ab
Date: 2005-08-16 13:22:01 + (Tue, 16 Aug 2005)
New Revision: 9321
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9321
Log:
Fix potential bug found by Coverity. src_len has to be int but later we do pass
it as size_t. In case src_len is negative, we need to register a failure and
return to the caller
Modified:
branches/SAMBA_4_0/source/smb_server/request.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/request.c
===
--- branches/SAMBA_4_0/source/smb_server/request.c 2005-08-16 10:57:21 UTC
(rev 9320)
+++ branches/SAMBA_4_0/source/smb_server/request.c 2005-08-16 13:22:01 UTC
(rev 9321)
@@ -491,16 +491,16 @@
src_len = byte_len;
} else {
src_len = req-in.data_size - PTR_DIFF(src, req-in.data);
- if (src_len 0) {
- *dest = NULL;
- return 0;
- }
-
if (byte_len != -1 src_len byte_len) {
src_len = byte_len;
}
}
+ if (src_len 0) {
+ *dest = NULL;
+ return 0;
+ }
+
src_len2 = utf16_len_n(src, src_len);
if (src_len2 == 0) {
*dest = talloc_strdup(req, );
svn commit: samba r9322 - branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0_RELEASE/source/nsswitch trunk/source/nsswitch
Author: jerry
Date: 2005-08-16 15:47:52 + (Tue, 16 Aug 2005)
New Revision: 9322
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9322
Log:
fixing debug log and ensuring that we set the right winbind_methods
pointer in get_cache() by requiring that all domain structure be
initialized with the set_dc_type_and_flags().
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c
trunk/source/nsswitch/winbindd.c
trunk/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c 2005-08-16 13:22:01 UTC
(rev 9321)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c 2005-08-16 15:47:52 UTC
(rev 9322)
@@ -569,7 +569,7 @@
}
if (*(uint32 *)(state-request) != sizeof(state-request)) {
- DEBUG(0,(process_loop: Invalid request size received: %d\n,
+ DEBUG(0,(request_len_recv: Invalid request size received:
%d\n,
*(uint32 *)(state-request)));
state-finished = True;
return;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2005-08-16 13:22:01 UTC
(rev 9321)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2005-08-16 15:47:52 UTC
(rev 9322)
@@ -101,6 +101,11 @@
{
struct winbind_cache *ret = wcache;
+ /* we have to know what type of domain we are dealing with first */
+
+ if ( !domain-initialized )
+ set_dc_type_and_flags( domain );
+
if (!domain-backend) {
extern struct winbindd_methods reconnect_methods;
switch (lp_security()) {
@@ -365,9 +370,6 @@
/* important! make sure that we know if this is a native
mode domain or not */
- if ( !domain-initialized )
- set_dc_type_and_flags( domain );
-
status = domain-backend-sequence_number(domain,
domain-sequence_number);
if (!NT_STATUS_IS_OK(status)) {
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c 2005-08-16
13:22:01 UTC (rev 9321)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c 2005-08-16
15:47:52 UTC (rev 9322)
@@ -569,7 +569,7 @@
}
if (*(uint32 *)(state-request) != sizeof(state-request)) {
- DEBUG(0,(process_loop: Invalid request size received: %d\n,
+ DEBUG(0,(request_len_recv: Invalid request size received:
%d\n,
*(uint32 *)(state-request)));
state-finished = True;
return;
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c 2005-08-16
13:22:01 UTC (rev 9321)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c 2005-08-16
15:47:52 UTC (rev 9322)
@@ -101,6 +101,11 @@
{
struct winbind_cache *ret = wcache;
+ /* we have to know what type of domain we are dealing with first */
+
+ if ( !domain-initialized )
+ set_dc_type_and_flags( domain );
+
if (!domain-backend) {
extern struct winbindd_methods reconnect_methods;
switch (lp_security()) {
@@ -365,9 +370,6 @@
/* important! make sure that we know if this is a native
mode domain or not */
- if ( !domain-initialized )
- set_dc_type_and_flags( domain );
-
status = domain-backend-sequence_number(domain,
domain-sequence_number);
if (!NT_STATUS_IS_OK(status)) {
Modified: trunk/source/nsswitch/winbindd.c
===
--- trunk/source/nsswitch/winbindd.c2005-08-16 13:22:01 UTC (rev 9321)
+++ trunk/source/nsswitch/winbindd.c2005-08-16 15:47:52 UTC (rev 9322)
@@ -556,7 +556,7 @@
}
if (*(uint32 *)(state-request) != sizeof(state-request)) {
- DEBUG(0,(process_loop: Invalid request size received: %d\n,
+ DEBUG(0,(request_len_recv: Invalid request size received:
%d\n,
*(uint32 *)(state-request)));
state-finished = True;
return;
Modified: trunk/source/nsswitch/winbindd_cache.c
===
--- trunk/source/nsswitch/winbindd_cache.c 2005-08-16 13:22:01 UTC (rev
9321)
+++
svn commit: samba r9323 - in trunk/source: include lib libsmb
Author: jra Date: 2005-08-16 17:31:51 + (Tue, 16 Aug 2005) New Revision: 9323 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9323 Log: More merging of functions into arc4. One more to go... Jeremy. Modified: trunk/source/include/ntlmssp.h trunk/source/lib/genrand.c trunk/source/libsmb/ntlmssp_sign.c Changeset: Sorry, the patch is too large (347 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9323
svn commit: samba r9324 - in trunk/source: include rpc_server
Author: jra
Date: 2005-08-16 19:39:27 + (Tue, 16 Aug 2005)
New Revision: 9324
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9324
Log:
Final function moved to standard arc4 implementation.
Jeremy.
Modified:
trunk/source/include/ntdomain.h
trunk/source/rpc_server/srv_pipe.c
Changeset:
Modified: trunk/source/include/ntdomain.h
===
--- trunk/source/include/ntdomain.h 2005-08-16 17:31:51 UTC (rev 9323)
+++ trunk/source/include/ntdomain.h 2005-08-16 19:39:27 UTC (rev 9324)
@@ -181,7 +181,7 @@
BOOL ntlmssp_auth_requested; /* If the client wanted authenticated rpc.
*/
BOOL ntlmssp_auth_validated; /* If the client *got* authenticated rpc.
*/
unsigned char challenge[8];
- unsigned char ntlmssp_hash[258];
+ unsigned char ntlmssp_arc4_state[258];
uint32 ntlmssp_seq_num;
};
Modified: trunk/source/rpc_server/srv_pipe.c
===
--- trunk/source/rpc_server/srv_pipe.c 2005-08-16 17:31:51 UTC (rev 9323)
+++ trunk/source/rpc_server/srv_pipe.c 2005-08-16 19:39:27 UTC (rev 9324)
@@ -55,30 +55,10 @@
struct dcinfo last_dcinfo;
BOOL server_auth2_negotiated = False;
-static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, int len)
+static void NTLMSSPcalc_p( pipes_struct *p, unsigned char *data, size_t len)
{
- unsigned char *hash = p-auth.a_u.ntlmssp_auth-ntlmssp_hash;
- unsigned char index_i = hash[256];
- unsigned char index_j = hash[257];
- int ind;
-
- for( ind = 0; ind len; ind++) {
- unsigned char tc;
- unsigned char t;
-
- index_i++;
- index_j += hash[index_i];
-
- tc = hash[index_i];
- hash[index_i] = hash[index_j];
- hash[index_j] = tc;
-
- t = hash[index_i] + hash[index_j];
- data[ind] = data[ind] ^ hash[t];
- }
-
- hash[256] = index_i;
- hash[257] = index_j;
+ unsigned char *a4state = p-auth.a_u.ntlmssp_auth-ntlmssp_arc4_state;
+ smb_arc4_crypt(a4state, data, len);
}
/***
@@ -495,39 +475,20 @@
return False;
} else {
uchar p24[24];
+ unsigned char k2[8];
NTLMSSPOWFencrypt(server_info-lm_session_key.data, lm_owf,
p24);
- {
- unsigned char j = 0;
- int ind;
- unsigned char k2[8];
+ memcpy(k2, p24, 5);
+ k2[5] = 0xe5;
+ k2[6] = 0x38;
+ k2[7] = 0xb0;
- memcpy(k2, p24, 5);
- k2[5] = 0xe5;
- k2[6] = 0x38;
- k2[7] = 0xb0;
+ smb_arc4_init(pa-ntlmssp_arc4_state, k2, 8);
- for (ind = 0; ind 256; ind++)
- pa-ntlmssp_hash[ind] = (unsigned char)ind;
+ dump_data_pw(NTLMSSP hash (v1)\n, pa-ntlmssp_arc4_state,
+sizeof(pa-ntlmssp_arc4_state));
- for( ind = 0; ind 256; ind++) {
- unsigned char tc;
-
- j += (pa-ntlmssp_hash[ind] + k2[ind%8]);
-
- tc = pa-ntlmssp_hash[ind];
- pa-ntlmssp_hash[ind] = pa-ntlmssp_hash[j];
- pa-ntlmssp_hash[j] = tc;
- }
-
- pa-ntlmssp_hash[256] = 0;
- pa-ntlmssp_hash[257] = 0;
- }
-
- dump_data_pw(NTLMSSP hash (v1)\n, pa-ntlmssp_hash,
-sizeof(pa-ntlmssp_hash));
-
-/* NTLMSSPhash(p-ntlmssp_hash, p24); */
+/* NTLMSSPhash(p-ntlmssp_arc4_state, p24); */
pa-ntlmssp_seq_num = 0;
}
@@ -1789,8 +1750,8 @@
* has already been consumed.
*/
char *data = prs_data_p(rpc_in) + RPC_HDR_REQ_LEN;
- dump_data_pw(NTLMSSP hash (v1)\n,
p-auth.a_u.ntlmssp_auth-ntlmssp_hash,
-sizeof(p-auth.a_u.ntlmssp_auth-ntlmssp_hash));
+ dump_data_pw(NTLMSSP hash (v1)\n,
p-auth.a_u.ntlmssp_auth-ntlmssp_arc4_state,
+
sizeof(p-auth.a_u.ntlmssp_auth-ntlmssp_arc4_state));
dump_data_pw(Incoming RPC PDU (NTLMSSP sealed)\n,
(const unsigned char *)data, data_len);
svn commit: samba r9325 - in branches/SAMBA_3_0/source/lib: .
Author: jra
Date: 2005-08-16 19:40:13 + (Tue, 16 Aug 2005)
New Revision: 9325
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9325
Log:
Remember to ignore FILE_SHARE_DELETE when mapping to old share
modes for display.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/util.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util.c
===
--- branches/SAMBA_3_0/source/lib/util.c2005-08-16 19:39:27 UTC (rev
9324)
+++ branches/SAMBA_3_0/source/lib/util.c2005-08-16 19:40:13 UTC (rev
9325)
@@ -2738,7 +2738,7 @@
uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
{
- switch (share_access) {
+ switch (share_access ~FILE_SHARE_DELETE) {
case FILE_SHARE_NONE:
return DENY_ALL;
case FILE_SHARE_READ:
@@ -2746,7 +2746,6 @@
case FILE_SHARE_WRITE:
return DENY_READ;
case FILE_SHARE_READ|FILE_SHARE_WRITE:
- case FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE:
return DENY_NONE;
}
if (private_options NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) {
svn commit: samba r9326 - in trunk/source/lib: .
Author: jra
Date: 2005-08-16 19:40:17 + (Tue, 16 Aug 2005)
New Revision: 9326
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9326
Log:
Remember to ignore FILE_SHARE_DELETE when mapping to old share
modes for display.
Jeremy.
Modified:
trunk/source/lib/util.c
Changeset:
Modified: trunk/source/lib/util.c
===
--- trunk/source/lib/util.c 2005-08-16 19:40:13 UTC (rev 9325)
+++ trunk/source/lib/util.c 2005-08-16 19:40:17 UTC (rev 9326)
@@ -2738,7 +2738,7 @@
uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
{
- switch (share_access) {
+ switch (share_access ~FILE_SHARE_DELETE) {
case FILE_SHARE_NONE:
return DENY_ALL;
case FILE_SHARE_READ:
@@ -2746,7 +2746,6 @@
case FILE_SHARE_WRITE:
return DENY_READ;
case FILE_SHARE_READ|FILE_SHARE_WRITE:
- case FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE:
return DENY_NONE;
}
if (private_options NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) {
svn commit: samba r9327 - in branches/SAMBA_4_0/swat/esptest: .
Author: deryck
Date: 2005-08-16 19:47:27 + (Tue, 16 Aug 2005)
New Revision: 9327
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9327
Log:
Rename parent to fParent to prevent confusion with window.parent object.
(Thanks, Derrell, for the reminder.)
Rename child to fChild, to be consistent and maintain readability.
deryck
Modified:
branches/SAMBA_4_0/swat/esptest/registry.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/registry.esp
===
--- branches/SAMBA_4_0/swat/esptest/registry.esp2005-08-16 19:40:17 UTC
(rev 9326)
+++ branches/SAMBA_4_0/swat/esptest/registry.esp2005-08-16 19:47:27 UTC
(rev 9327)
@@ -43,25 +43,25 @@
script type=text/javascript
-function folder_list(parent, list) {
+function folder_list(fParent, list) {
var i;
- parent.populated = true;
- parent.removeAll();
+ fParent.populated = true;
+ fParent.removeAll();
for (i=0;ilist.length;i++) {
- var child;
- child = new QxTreeFolder(list[i]);
- parent.add(child);
- child.binding = parent.binding;
- if (parent.reg_path == '') {
- child.reg_path = list[i];
+ var fChild;
+ fChild = new QxTreeFolder(list[i]);
+ fParent.add(fChild);
+ fChild.binding = fParent.binding;
+ if (fParent.reg_path == '') {
+ fChild.reg_path = list[i];
} else {
- child.reg_path = parent.reg_path + '' + list[i];
+ fChild.reg_path = fParent.reg_path + '' + list[i];
}
- child.add(new QxTreeFolder('Working ...'));
- child.addEventListener(click, function() {
+ fChild.add(new QxTreeFolder('Working ...'));
+ fChild.addEventListener(click, function() {
var el = this; folder_click(el);
});
- parent.setOpen(1);
+ fParent.setOpen(1);
}
}
svn commit: samba r9328 - in branches/SAMBA_4_0/swat/style/qooxdoo: .
Author: deryck
Date: 2005-08-16 20:00:24 + (Tue, 16 Aug 2005)
New Revision: 9328
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9328
Log:
Remove background:ThreeDFace from qooxdoo styles to
get our samba.org background bacl.
deryck
Modified:
branches/SAMBA_4_0/swat/style/qooxdoo/core.css
Changeset:
Modified: branches/SAMBA_4_0/swat/style/qooxdoo/core.css
===
--- branches/SAMBA_4_0/swat/style/qooxdoo/core.css 2005-08-16 19:47:27 UTC
(rev 9327)
+++ branches/SAMBA_4_0/swat/style/qooxdoo/core.css 2005-08-16 20:00:24 UTC
(rev 9328)
@@ -1,2 +1,2 @@
/* Copyright (c): 2002-2005 (Germany): United Internet, 11, GMX,
Schlund+Partner, Alturo */
-*{box-sizing:border-box;-moz-box-sizing:border-box;margin:0;padding:0;}
body,html{border:0 none;background:ThreeDFace;color:#000;font:11px
Tahoma,Lucida Sans Unicode,Lucida Grande,Verdana,Bitstream Vera
Sans,Arial,sans-serif;} body{padding-top:1px;} * html body,:root
body{padding-top:0;} td,th{font:11px Tahoma,Lucida Sans Unicode,Lucida
Grande,Verdana,Bitstream Vera Sans,Arial,sans-serif;} a{color:#094C81;}
p{margin:0;padding:0;margin-bottom:6px;} hr{border:0 none;border-top:1px solid
ThreeDShadow;border-bottom:1px solid ThreeDHighlight;height:2px;margin:0
!important;padding:0 !important;margin-bottom:4px !important;}
img{box-sizing:content-box;-moz-box-sizing:content-box;border:0 none;}
ul,ol{list-style:none;}
.clearfix:after{content:.;display:block;height:0;clear:both;visibility:hidden;}
* html .clearfix{height:1%;}
\ No newline at end of file
+*{box-sizing:border-box;-moz-box-sizing:border-box;margin:0;padding:0;}
body,html{border:0 none;color:#000;font:11px Tahoma,Lucida Sans
Unicode,Lucida Grande,Verdana,Bitstream Vera Sans,Arial,sans-serif;}
body{padding-top:1px;} * html body,:root body{padding-top:0;} td,th{font:11px
Tahoma,Lucida Sans Unicode,Lucida Grande,Verdana,Bitstream Vera
Sans,Arial,sans-serif;} a{color:#094C81;}
p{margin:0;padding:0;margin-bottom:6px;} hr{border:0 none;border-top:1px solid
ThreeDShadow;border-bottom:1px solid ThreeDHighlight;height:2px;margin:0
!important;padding:0 !important;margin-bottom:4px !important;}
img{box-sizing:content-box;-moz-box-sizing:content-box;border:0 none;}
ul,ol{list-style:none;}
.clearfix:after{content:.;display:block;height:0;clear:both;visibility:hidden;}
* html .clearfix{height:1%;}
svn commit: samba r9330 - in branches/SAMBA_3_0/source/nsswitch: .
Author: jerry Date: 2005-08-16 21:15:41 + (Tue, 16 Aug 2005) New Revision: 9330 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9330 Log: Remove the classic dual daemon since it was not being used. It was already gone in trunk anyways. working on fixing BUG 3000 which does work now but we are flying without a cache. Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c Changeset: Sorry, the patch is too large (335 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9330
svn commit: samba r9331 - in trunk/source/nsswitch: .
Author: jerry
Date: 2005-08-16 21:16:13 + (Tue, 16 Aug 2005)
New Revision: 9331
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9331
Log:
trying to syncronize a litle with SAMBA_3_0
Modified:
trunk/source/nsswitch/winbindd.c
Changeset:
Modified: trunk/source/nsswitch/winbindd.c
===
--- trunk/source/nsswitch/winbindd.c2005-08-16 21:15:41 UTC (rev 9330)
+++ trunk/source/nsswitch/winbindd.c2005-08-16 21:16:13 UTC (rev 9331)
@@ -733,25 +733,6 @@
return False;
}
-/* Process a complete received packet from a client */
-
-void winbind_process_packet(struct winbindd_cli_state *state)
-{
- /* Process request */
-
- /* Ensure null termination of entire request */
- state-request.null_term = '\0';
-
- state-pid = state-request.pid;
-
- process_request(state);
-
- /* Update client state */
-
- state-read_buf_len = 0;
- state-write_buf_len = sizeof(struct winbindd_response);
-}
-
/* Process incoming clients on listen_sock. We use a tricky non-blocking,
non-forking, non-threaded model which allows us to handle many
simultaneous connections while remaining impervious to many denial of
@@ -843,8 +824,6 @@
exit(1);
}
- /* Create a new connection if listen_sock readable */
-
ev = fd_events;
while (ev != NULL) {
struct fd_event *next = ev-next;
svn commit: samba r9332 - in branches/SAMBA_3_0_RELEASE: . source/lib
Author: jerry
Date: 2005-08-16 21:19:19 + (Tue, 16 Aug 2005)
New Revision: 9332
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9332
Log:
merge jeremy's smbstatus error message fix from 3.0 tree
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/lib/util.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-08-16 21:16:13 UTC (rev
9331)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-08-16 21:19:19 UTC (rev
9332)
@@ -49,6 +49,7 @@
* Merge new DOS error code from SAMBA_4.
* Fix issue when non-English characters in filenames and
directories.
+* Fix bogus error message in smbstatus about unknown share modes.
o Gerald (Jerry) Carter [EMAIL PROTECTED]
Modified: branches/SAMBA_3_0_RELEASE/source/lib/util.c
===
--- branches/SAMBA_3_0_RELEASE/source/lib/util.c2005-08-16 21:16:13 UTC
(rev 9331)
+++ branches/SAMBA_3_0_RELEASE/source/lib/util.c2005-08-16 21:19:19 UTC
(rev 9332)
@@ -2738,7 +2738,7 @@
uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
{
- switch (share_access) {
+ switch (share_access ~FILE_SHARE_DELETE) {
case FILE_SHARE_NONE:
return DENY_ALL;
case FILE_SHARE_READ:
@@ -2746,7 +2746,6 @@
case FILE_SHARE_WRITE:
return DENY_READ;
case FILE_SHARE_READ|FILE_SHARE_WRITE:
- case FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE:
return DENY_NONE;
}
if (private_options NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) {
svn commit: samba r9333 - in branches/SOC/SAMBA_3_0/source: include libmsrpc libmsrpc/test/sam
Author: skel Date: 2005-08-16 22:22:29 + (Tue, 16 Aug 2005) New Revision: 9333 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9333 Log: modified cac_SamGetNamesFromRids() to use a struct cac_LookupRidsRecord instead of 3 arrays. added cac_SamGetRidsFromNames() Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/sam/samgroup.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/sam/samlookup.c Changeset: Sorry, the patch is too large (377 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9333
svn commit: samba r9334 - in branches/SAMBA_3_0_RELEASE: . source/nsswitch
Author: jerry Date: 2005-08-16 22:29:46 + (Tue, 16 Aug 2005) New Revision: 9334 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9334 Log: merge fix for BUG 3000. we should be ready to ship now Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_dual.c Changeset: Sorry, the patch is too large (351 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9334
svn commit: samba r9335 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR: .
Author: tridge
Date: 2005-08-16 23:19:17 + (Tue, 16 Aug 2005)
New Revision: 9335
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9335
Log:
only copy the in side of an array to the out side of an array when the
array is a [ref] pointer. For non-ref arrays it is quite valid for a
server to return a larger response array then the client gave (as can
happen with winreg) in which case this memcpy() will fault.
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-16 22:29:46 UTC (rev 9334)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-16 23:19:17 UTC (rev 9335)
@@ -1812,7 +1812,8 @@
}
if (grep(/in/,@{$e-{DIRECTION}}) and
- grep(/out/,@{$e-{DIRECTION}})) {
+ grep(/out/,@{$e-{DIRECTION}}) and
+ $pl-{POINTER_TYPE} eq ref) {
pidl memcpy(r-out.$e-{NAME},r-in.$e-{NAME},$size *
sizeof(*r-in.$e-{NAME}));;
}
}
Build status as of Wed Aug 17 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-08-16 00:00:12.0 + +++ /home/build/master/cache/broken_results.txt 2005-08-17 00:00:28.0 + @@ -1,17 +1,17 @@ -Build status as of Tue Aug 16 00:00:01 2005 +Build status as of Wed Aug 17 00:00:02 2005 Build counts: Tree Total Broken Panic ccache 37 6 0 distcc 37 5 0 -lorikeet-heimdal 35 22 0 +lorikeet-heimdal 35 23 0 ppp 24 2 0 rsync36 2 0 samba0 0 0 samba-docs 0 0 0 -samba4 42 15 0 +samba4 41 15 0 samba_3_037 3 0 -smb-build34 4 0 +smb-build33 4 0 talloc 36 11 0 tdb 36 15 0
svn commit: lorikeet r423 - in trunk/sangria/src: . LatestDesign/cgi
Author: amit Date: 2005-08-17 00:50:57 + (Wed, 17 Aug 2005) New Revision: 423 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=423 Log: HOW-TO.TXT added and few CGI scripts modified to include Server Restart and Refresh functionality Added: trunk/sangria/src/HOW-TO.TXT Modified: trunk/sangria/src/LatestDesign/cgi/cgi_lib.py trunk/sangria/src/LatestDesign/cgi/index.cgi trunk/sangria/src/LatestDesign/cgi/manager.cgi Changeset: Added: trunk/sangria/src/HOW-TO.TXT === --- trunk/sangria/src/HOW-TO.TXT2005-08-15 23:39:22 UTC (rev 422) +++ trunk/sangria/src/HOW-TO.TXT2005-08-17 00:50:57 UTC (rev 423) @@ -0,0 +1,111 @@ +CGI HOW-TO + + +Steps For the classes Fix Up + +1 create directory ( /home/amit/test ) +2 Have a smb.conf (for testing) on the directory ( /home/amit/test ) +3 create directory ( /home/amit/test/new ) +4 Put the folders and their contents ( classes , parser , test which are the folders within ../sangria/src/LatestDesign/ ) from the repository to ( /home/amit/test/new ) +5 Check if ( /home/amit/test/new/test/test.py ) works fine It should + + +Steps For the CGI setup + + +Have'nt tried with a different account +I have used Root to execute all scripts so far ... because much of the wrapped up commands need root permissions + +1 put the (cgi) folder within the cgi-bin location in the system. +2 dos2unix ./cgi/* +3 chmod 777 ./cgi/* +4 start off with ( ./cgi/index.cgi ) and there you are. ( you need to login as ROOT ) + +I had a different case. +As apache was very sensitive to file formats and I was using IDLE in windows for editing the files and It was rather difficult to hack apache to make it able to run CGIs as root I had this ( webmin webserver ) + +so I would put all my cgi scripts to + + /home/amit/webmin-1.220/samba/pythong/ + +and I would start with + + http://192.168.177.133:1/samba/pythong/index.cgi + +this was where and I would log in to the webmin using ( root ) account and then start off with + + + + +Regarding the CGI - Scripts + +index.cgi would have the following options + + +(A) Server Management + +1 server manager + + SetServerType + Add Global Params + Change Global Params + +2 fileshare manager + + Add file share + Remove file Share + Add Prameters to a file share + Modify a file share + +3 printshare manager + + Set Print Style + Add Print Share + Remove Print Share + Modify Print Share + +4 start from scratch (erases out all the settings to start with a new smb.conf file) +5 view smb.conf +6 test smb.conf +7 Restart Server +8 Refresh Server + + + +(B) User Management + +1 Unix Users + + Add / Remove + +2 Samba Users + + Add Samba User + Enable Samba User + Disable Samba User + Remove Samba User + Change Samba Password + + +(C) Group Management + +1 Unix Groups + + Add Unix Group + Remove Unix Group + List All Users in a Unix Group + Add a User To Unix Group + Remove User From Unix Group + +2 Samba Groups + + Add Samba Group + Remove Samba Group + Modify Samba Group + Map Widows Group To Unix Group + Modify Windows Group mapping + Remove Windows Group mapping + + +Hope this Helps. +Amit Modified: trunk/sangria/src/LatestDesign/cgi/cgi_lib.py === --- trunk/sangria/src/LatestDesign/cgi/cgi_lib.py 2005-08-15 23:39:22 UTC (rev 422) +++ trunk/sangria/src/LatestDesign/cgi/cgi_lib.py 2005-08-17 00:50:57 UTC (rev 423) @@ -45,7 +45,7 @@ trtd a href=manager.cgi?from=filesharemanagerfilesharemanager /a /td/tr trtd a href=manager.cgi?from=printsharemanager printsharemanager/a /td/tr trtd a href=manager.cgi?from=testsmbconf Test Config /a /td/tr - + /table Modified: trunk/sangria/src/LatestDesign/cgi/index.cgi === --- trunk/sangria/src/LatestDesign/cgi/index.cgi2005-08-15 23:39:22 UTC (rev 422) +++ trunk/sangria/src/LatestDesign/cgi/index.cgi2005-08-17 00:50:57 UTC (rev 423) @@ -23,11 +23,15 @@ td width=18%a href=manager.cgi?from=filesharemanagerFileShare Manager/a/td td width=18%a href=manager.cgi?from=printsharemanagerPrint Share Manager/a/td td width=18%a href=manager.cgi?from=startfromscratchStart From Scratch/a/td + + /tr + tr td width=18%a href=manager.cgi?from=showsmbconfShow smb.conf/a/td td width=24%a
svn commit: samba r9336 - in trunk/source: . lib libsmb
Author: jra
Date: 2005-08-17 01:16:47 + (Wed, 17 Aug 2005)
New Revision: 9336
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9336
Log:
Move arc4 into a separate file and add it to the makefile to
fix dependencies.
Jeremy.
Added:
trunk/source/lib/arc4.c
Modified:
trunk/source/Makefile.in
trunk/source/libsmb/smbdes.c
Changeset:
Modified: trunk/source/Makefile.in
===
--- trunk/source/Makefile.in2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/Makefile.in2005-08-17 01:16:47 UTC (rev 9336)
@@ -199,7 +199,7 @@
lib/talloc.o lib/substitute.o lib/fsusage.o \
lib/ms_fnmatch.o lib/select.o lib/messages.o \
lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
- lib/md5.o lib/hmacmd5.o lib/iconv.o \
+ lib/md5.o lib/hmacmd5.o lib/arc4.o lib/iconv.o \
nsswitch/wb_client.o $(WBCOMMON_OBJ) \
lib/pam_errors.o intl/lang_tdb.o \
lib/adt_tree.o lib/gencache.o $(TDB_OBJ) \
Added: trunk/source/lib/arc4.c
===
--- trunk/source/lib/arc4.c 2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/lib/arc4.c 2005-08-17 01:16:47 UTC (rev 9336)
@@ -0,0 +1,80 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ An implementation of arc4.
+
+ Copyright (C) Jeremy Allison 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
+
+/*
+ Initialize state for an arc4 crypt/decrpyt.
+ arc4 state is 258 bytes - last 2 bytes are the index bytes.
+*/
+
+void smb_arc4_init(unsigned char arc4_state_out[258], const unsigned char
*key, size_t keylen)
+{
+ size_t ind;
+ unsigned char j = 0;
+
+ for (ind = 0; ind 256; ind++) {
+ arc4_state_out[ind] = (unsigned char)ind;
+ }
+
+ for( ind = 0; ind 256; ind++) {
+ unsigned char tc;
+
+ j += (arc4_state_out[ind] + key[ind%keylen]);
+
+ tc = arc4_state_out[ind];
+ arc4_state_out[ind] = arc4_state_out[j];
+ arc4_state_out[j] = tc;
+ }
+ arc4_state_out[256] = 0;
+ arc4_state_out[257] = 0;
+}
+
+/*
+ Do the arc4 crypt/decrpyt.
+ arc4 state is 258 bytes - last 2 bytes are the index bytes.
+*/
+
+void smb_arc4_crypt(unsigned char arc4_state_inout[258], unsigned char *data,
size_t len)
+{
+ unsigned char index_i = arc4_state_inout[256];
+ unsigned char index_j = arc4_state_inout[257];
+size_t ind;
+
+ for( ind = 0; ind len; ind++) {
+ unsigned char tc;
+ unsigned char t;
+
+ index_i++;
+ index_j += arc4_state_inout[index_i];
+
+ tc = arc4_state_inout[index_i];
+ arc4_state_inout[index_i] = arc4_state_inout[index_j];
+ arc4_state_inout[index_j] = tc;
+
+ t = arc4_state_inout[index_i] + arc4_state_inout[index_j];
+ data[ind] = data[ind] ^ arc4_state_inout[t];
+ }
+
+ arc4_state_inout[256] = index_i;
+ arc4_state_inout[257] = index_j;
+}
Modified: trunk/source/libsmb/smbdes.c
===
--- trunk/source/libsmb/smbdes.c2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/libsmb/smbdes.c2005-08-17 01:16:47 UTC (rev 9336)
@@ -358,63 +358,6 @@
}
/*
- Initialize state for an arc4 crypt/decrpyt.
- arc4 state is 258 bytes - last 2 bytes are the index bytes.
-*/
-
-void smb_arc4_init(unsigned char arc4_state_out[258], const unsigned char
*key, size_t keylen)
-{
- size_t ind;
- unsigned char j = 0;
-
- for (ind = 0; ind 256; ind++) {
- arc4_state_out[ind] = (unsigned char)ind;
- }
-
- for( ind = 0; ind 256; ind++) {
- unsigned char tc;
-
- j +=
svn commit: samba r9337 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR: .
Author: tridge
Date: 2005-08-17 01:20:22 + (Wed, 17 Aug 2005)
New Revision: 9337
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9337
Log:
defer the checking of array sizes until the end of the
function/structure, as the checks might involve variables that have
not yet been unmarshalled. This is needed to cope with the correct IDL
for the winreg pipe.
Jelmer, can you look at this when you get a chance and see if you
think this is a reasonable approach? Sorry its wrecks the nice
indentation in the generated code.
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-17 01:16:47 UTC (rev 9336)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-17 01:20:22 UTC (rev 9337)
@@ -86,7 +86,11 @@
}
my $res = ;
+my $deferred = ;
my $tabs = ;
+
+
+# pidl() is our basic output routine
sub pidl($)
{
my $d = shift;
@@ -97,6 +101,31 @@
$res .=\n;
}
+
+# defer() is like pidl(), but adds to
+# a deferred buffer which is then added to the
+# output buffer at the end of the structure/union/function
+# This is needed to cope with code that must be pushed back
+# to the end of a block of elements
+sub defer($)
+{
+ my $d = shift;
+ if ($d) {
+ $deferred .= $tabs;
+ $deferred .= $d;
+ }
+ $deferred .=\n;
+}
+
+
+# add the deferred content to the current
+# output
+sub add_deferred()
+{
+ $res .= $deferred;
+ $deferred = ;
+}
+
sub indent()
{
$tabs .= \t;
@@ -119,6 +148,18 @@
}
#
+# check that a variable we get from ParseExpr isn't a null pointer,
+# putting the check at the end of the structure/function
+sub check_null_pointer_deferred($)
+{
+ my $size = shift;
+ if ($size =~ /^\*/) {
+ my $size2 = substr($size, 1);
+ defer if ($size2 == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;;
+ }
+}
+
+#
# check that a variable we get from ParseExpr isn't a null pointer
# void return varient
sub check_null_pointer_void($)
@@ -278,14 +319,14 @@
if ($l-{IS_CONFORMANT} and not $l-{IS_ZERO_TERMINATED}) {
my $size = ParseExpr($l-{SIZE_IS}, $env);
- check_null_pointer($size);
- pidl NDR_CHECK(ndr_check_array_size(ndr, (void*) .
get_pointer_to($var_name) . , $size));;
+ check_null_pointer_deferred($size);
+ defer NDR_CHECK(ndr_check_array_size(ndr, (void*) .
get_pointer_to($var_name) . , $size));;
}
if ($l-{IS_VARYING} and not $l-{IS_ZERO_TERMINATED}) {
my $length = ParseExpr($l-{LENGTH_IS}, $env);
- check_null_pointer($length);
- pidl NDR_CHECK(ndr_check_array_length(ndr, (void*) .
get_pointer_to($var_name) . , $length));;
+ check_null_pointer_deferred($length);
+ defer NDR_CHECK(ndr_check_array_length(ndr, (void*) .
get_pointer_to($var_name) . , $length));;
}
if (!$l-{IS_FIXED}) {
@@ -1305,6 +1346,8 @@
deindent;
pidl };
+ add_deferred();
+
end_flags($struct);
# restore the old relative_base_offset
pidl ndr_pull_restore_relative_base_offset(ndr,
_save_relative_base_offset); if defined($struct-{PROPERTIES}{relative_base});
@@ -1577,6 +1620,9 @@
deindent;
pidl };
+
+ add_deferred();
+
end_flags($e);
# restore the old relative_base_offset
pidl ndr_pull_restore_relative_base_offset(ndr,
_save_relative_base_offset); if defined($e-{PROPERTIES}{relative_base});
@@ -1892,6 +1938,7 @@
}
}
+ add_deferred();
deindent;
pidl };
@@ -1908,8 +1955,10 @@
pidl NDR_CHECK(ndr_pull_$fn-{RETURN_TYPE}(ndr, NDR_SCALARS,
r-out.result));;
}
+ add_deferred();
deindent;
pidl };
+
pidl return NT_STATUS_OK;;
deindent;
pidl };
svn commit: samba r9338 - in branches/SAMBA_4_0/source: lib/registry librpc/idl rpc_server/winreg scripting/libjs torture/rpc
Author: tridge Date: 2005-08-17 01:25:58 + (Wed, 17 Aug 2005) New Revision: 9338 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9338 Log: fixed the winreg IDL to be correct for the EnumKey and EnumValue calls. The previous IDL was just a workaround for the limitations of our older rpc infrastructure. Now that Jelmer has added much improved string support using the charset keyword we can correctly implemenent the unusual winreg string buffers. Jelmer, note the little comment I put on winreg_StringBuf() about why I couldn't use [value()] for the length field. This also fixes EnumKey() and EnumValue() to use NTTIME fields for the last_changed_time. I don't know why we were using a pair of uint32's, as it is just a NTTIME. Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc.c branches/SAMBA_4_0/source/librpc/idl/winreg.idl branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c branches/SAMBA_4_0/source/scripting/libjs/winreg.js branches/SAMBA_4_0/source/torture/rpc/winreg.c Changeset: Sorry, the patch is too large (511 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9338
svn commit: samba r9339 - in branches/SAMBA_4_0/source: build/pidl/Parse/Pidl/Samba scripting/ejs
Author: tridge
Date: 2005-08-17 01:29:35 + (Wed, 17 Aug 2005)
New Revision: 9339
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9339
Log:
treat arrays of uint8 values as a special DATA_BLOB type in the ejs
interfaces to RPC. This makes large blobs of data much saner. Tim, you
will probably want to do the same for the smb_interfaces.h generated
code.
Next we will need ways of extracting different data types from these
blobs, for example asking for the blob to be interpreted as a utf16
string, or as a little-endian integer. That will allow for registry
scripting to be quite sane.
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJS.pm
branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h
branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJS.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJS.pm
2005-08-17 01:25:58 UTC (rev 9338)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJS.pm
2005-08-17 01:29:35 UTC (rev 9339)
@@ -165,22 +165,32 @@
sub EjsPullArray($)
{
my ($e, $l, $var, $name, $env) = @_;
+ my $nl = Parse::Pidl::NDR::GetNextLevel($e, $l);
my $length = Parse::Pidl::Util::ParseExpr($l-{LENGTH_IS}, $env);
+ my $size = Parse::Pidl::Util::ParseExpr($l-{SIZE_IS}, $env);
my $pl = Parse::Pidl::NDR::GetPrevLevel($e, $l);
if ($pl $pl-{TYPE} eq POINTER) {
$var = get_pointer_to($var);
}
+ # uint8 arrays are treated as data blobs
+ if ($nl-{TYPE} eq 'DATA' $e-{TYPE} eq 'uint8') {
+ if (!$l-{IS_FIXED}) {
+ pidl EJS_ALLOC_N(ejs, $var, $size);;
+ }
+ pidl ejs_pull_array_uint8(ejs, v, $name, $var, $length);;
+ return;
+ }
my $avar = $var . [i];
pidl {;
indent;
pidl uint32_t i;;
if (!$l-{IS_FIXED}) {
- pidl EJS_ALLOC_N(ejs, $var, $length);;
+ pidl EJS_ALLOC_N(ejs, $var, $size);;
}
pidl for (i=0;i$length;i++) {;
indent;
pidl char *id = talloc_asprintf(ejs, \%s.%u\, $name, i);;
- EjsPullElement($e, Parse::Pidl::NDR::GetNextLevel($e, $l), $avar, id,
$env);
+ EjsPullElement($e, $nl, $avar, id, $env);
pidl talloc_free(id);;
deindent;
pidl };
@@ -451,11 +461,17 @@
sub EjsPushArray($)
{
my ($e, $l, $var, $name, $env) = @_;
+ my $nl = Parse::Pidl::NDR::GetNextLevel($e, $l);
my $length = Parse::Pidl::Util::ParseExpr($l-{LENGTH_IS}, $env);
my $pl = Parse::Pidl::NDR::GetPrevLevel($e, $l);
if ($pl $pl-{TYPE} eq POINTER) {
$var = get_pointer_to($var);
}
+ # uint8 arrays are treated as data blobs
+ if ($nl-{TYPE} eq 'DATA' $e-{TYPE} eq 'uint8') {
+ pidl ejs_push_array_uint8(ejs, v, $name, $var, $length);;
+ return;
+ }
my $avar = $var . [i];
pidl {;
indent;
@@ -463,7 +479,7 @@
pidl for (i=0;i$length;i++) {;
indent;
pidl const char *id = talloc_asprintf(ejs, \%s.%u\, $name, i);;
- EjsPushElement($e, Parse::Pidl::NDR::GetNextLevel($e, $l), $avar, id,
$env);
+ EjsPushElement($e, $nl, $avar, id, $env);
deindent;
pidl };
pidl ejs_push_uint32(ejs, v, $name \.length\, i);;
Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c2005-08-17 01:25:58 UTC
(rev 9338)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c2005-08-17 01:29:35 UTC
(rev 9339)
@@ -349,3 +349,40 @@
{
return mprSetVar(v, name, mprCreateBoolVar(*r));
}
+
+
+/*
+ pull a uint8 array from a mpr variable to a C element - treating as a data
blob
+*/
+NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name,
+ uint8_t *r, uint32_t length)
+{
+ NTSTATUS status;
+ DATA_BLOB *blob;
+
+ status = mprGetVar(v, name);
+ NT_STATUS_NOT_OK_RETURN(status);
+
+ blob = mprToDataBlob(v);
+ if (blob == NULL) {
+ return NT_STATUS_OBJECT_NAME_INVALID;
+ }
+ if (blob-length != length) {
+ return NT_STATUS_INFO_LENGTH_MISMATCH;
+ }
+ memcpy(r, blob-data, length);
+ return NT_STATUS_OK;
+
+}
+
+NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name,
+ const uint8_t *r, uint32_t length)
+{
+ DATA_BLOB blob;
+ blob.data = discard_const(r);
+ blob.length = length;
+
svn commit: samba r9340 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-17 01:30:47 + (Wed, 17 Aug 2005)
New Revision: 9340
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9340
Log:
print the [in] contents when debugging even if the marshalling
failed. This makes it easier to track down marshalling bugs.
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2005-08-17
01:29:35 UTC (rev 9339)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2005-08-17
01:30:47 UTC (rev 9340)
@@ -329,17 +329,19 @@
goto done;
}
+ /* make the actual call */
+ req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
+
/* if requested, print the structure */
if (p-conn-flags DCERPC_DEBUG_PRINT_IN) {
ndr_print_function_debug(call-ndr_print, call-name, NDR_IN,
ptr);
}
- /* make the actual call */
- req = dcerpc_ndr_request_send(p, NULL, iface, callnum, ptr, ptr);
if (req == NULL) {
status = NT_STATUS_NO_MEMORY;
goto done;
}
+
status = dcerpc_ndr_request_recv(req);
if (!NT_STATUS_IS_OK(status)) {
goto done;
svn commit: samba r9341 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: tridge
Date: 2005-08-17 01:40:14 + (Wed, 17 Aug 2005)
New Revision: 9341
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9341
Log:
updated the winreg test program to take advantage of the new EnumValue
functionality. It now completely enumerates a winreg tree.
This would make a good basis for a js version of regshell if someone
felt like taking that on.
Modified:
branches/SAMBA_4_0/testprogs/ejs/winreg.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/winreg.js
===
--- branches/SAMBA_4_0/testprogs/ejs/winreg.js 2005-08-17 01:30:47 UTC (rev
9340)
+++ branches/SAMBA_4_0/testprogs/ejs/winreg.js 2005-08-17 01:40:14 UTC (rev
9341)
@@ -34,13 +34,22 @@
return -1;
}
-function list_path(path) {
- var list = winreg_enum_path(reg, path);
+function list_values(path) {
+ var list = winreg_enum_values(reg, path);
var i;
if (list == undefined) {
return;
}
for (i=0;ilist.length;i++) {
+ printf(\ttype=%2d size=%4d '%s'\n, list[i].type,
list[i].size, list[i].name);
+ }
+}
+
+function list_path(path) {
+ var list = winreg_enum_path(reg, path);
+ var i;
+ list_values(path);
+ for (i=0;ilist.length;i++) {
var npath;
if (path) {
npath = path + \\ + list[i];
svn commit: samba r9342 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: tridge
Date: 2005-08-17 02:21:40 + (Wed, 17 Aug 2005)
New Revision: 9342
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9342
Log:
removed extra libinclude of base.js
Modified:
branches/SAMBA_4_0/testprogs/ejs/winreg.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/winreg.js
===
--- branches/SAMBA_4_0/testprogs/ejs/winreg.js 2005-08-17 01:40:14 UTC (rev
9341)
+++ branches/SAMBA_4_0/testprogs/ejs/winreg.js 2005-08-17 02:21:40 UTC (rev
9342)
@@ -17,8 +17,6 @@
return -1;
}
-libinclude(base.js);
-
if (options.ARGV.length 1) {
println(Usage: winreg.js BINDING);
return -1;
svn commit: samba r9343 - in branches/SOC/SAMBA_3_0/source: include libmsrpc libmsrpc/test/sam
Author: skel Date: 2005-08-17 02:46:10 + (Wed, 17 Aug 2005) New Revision: 9343 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9343 Log: added EnumAliases() and some tests Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/sam/samenum.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/sam/samgroup.c Changeset: Sorry, the patch is too large (359 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9343
svn commit: samba r9344 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-17 02:55:31 + (Wed, 17 Aug 2005)
New Revision: 9344
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9344
Log:
started adding calls for manipulation of data blobs in ejs
added:
blobToArray()
blobFromArray()
blobCompare()
Added:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c
Modified:
branches/SAMBA_4_0/source/scripting/ejs/config.mk
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-17 02:46:10 UTC
(rev 9343)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-17 02:55:31 UTC
(rev 9344)
@@ -22,6 +22,7 @@
scripting/ejs/smbcalls_options.o \
scripting/ejs/smbcalls_nss.o \
scripting/ejs/smbcalls_string.o \
+ scripting/ejs/smbcalls_data.o \
scripting/ejs/smbcalls_rand.o \
scripting/ejs/smbcalls_sys.o \
scripting/ejs/smbcalls_creds.o \
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-17 02:46:10 UTC
(rev 9343)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-17 02:55:31 UTC
(rev 9344)
@@ -128,6 +128,7 @@
smb_setup_ejs_random();
smb_setup_ejs_system();
smb_setup_ejs_credentials();
+ smb_setup_ejs_datablob();
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_data.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c 2005-08-17
02:46:10 UTC (rev 9343)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c 2005-08-17
02:55:31 UTC (rev 9344)
@@ -0,0 +1,165 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ provide access to data blobs
+
+ 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
+
+/*
+ create a data blob object from a ejs array of integers
+*/
+static int ejs_blobFromArray(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ struct MprVar *array, *v;
+ unsigned length, i;
+ DATA_BLOB blob;
+
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, blobFromArray invalid arguments);
+ return -1;
+ }
+ array = argv[0];
+
+ v = mprGetProperty(array, length, NULL);
+ if (v == NULL) {
+ goto failed;
+ }
+ length = mprToInt(v);
+
+ blob = data_blob_talloc(mprMemCtx(), NULL, length);
+ if (length != 0 blob.data == NULL) {
+ goto failed;
+ }
+
+ for (i=0;ilength;i++) {
+ struct MprVar *vs;
+ char idx[16];
+ mprItoa(i, idx, sizeof(idx));
+ vs = mprGetProperty(array, idx, NULL);
+ if (vs == NULL) {
+ goto failed;
+ }
+ blob.data[i] = mprVarToNumber(vs);
+ }
+
+ mpr_Return(eid, mprDataBlob(blob));
+ return 0;
+
+failed:
+ mpr_Return(eid, mprCreateUndefinedVar());
+ return 0;
+}
+
+/*
+ create a ejs array of integers from a data blob
+*/
+static int ejs_blobToArray(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ DATA_BLOB *blob;
+ struct MprVar array;
+ int i;
+
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, blobToArray invalid arguments);
+ return -1;
+ }
+ blob = mprToDataBlob(argv[0]);
+ if (blob == NULL) {
+ goto failed;
+ }
+
+ array = mprObject(array);
+
+ for (i=0;iblob-length;i++) {
+ mprAddArray(array, i, mprCreateNumberVar(blob-data[i]));
+ }
+
svn commit: samba r9345 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: tridge
Date: 2005-08-17 02:56:07 + (Wed, 17 Aug 2005)
New Revision: 9345
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9345
Log:
used the data blob functions in the echo.js test code
Modified:
branches/SAMBA_4_0/testprogs/ejs/echo.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/echo.js
===
--- branches/SAMBA_4_0/testprogs/ejs/echo.js2005-08-17 02:55:31 UTC (rev
9344)
+++ branches/SAMBA_4_0/testprogs/ejs/echo.js2005-08-17 02:56:07 UTC (rev
9345)
@@ -22,10 +22,11 @@
function ramp_array(N)
{
var a = new Array(N);
+ var data = datablob_init();
for (i=0;iN;i++) {
a[i] = i;
}
- return a;
+ return data.blobFromArray(a);
}
@@ -60,7 +61,7 @@
io.input.in_data = ramp_array(i);
status = echo.echo_EchoData(io);
check_status_ok(status);
- check_array_equal(io.input.in_data, io.output.out_data);
+ assert(true == echo.blobCompare(io.input.in_data,
io.output.out_data));
}
}
@@ -97,7 +98,7 @@
status = echo.echo_SourceData(io);
check_status_ok(status);
correct = ramp_array(i);
- check_array_equal(correct, io.output.data);
+ assert(true == echo.blobCompare(correct, io.output.data));
}
}
@@ -181,7 +182,7 @@
io.input.data = new Object();
io.input.data.x = 10;
- io.input.data.surrounding = ramp_array(10);
+ io.input.data.surrounding = new Array(10);
status = echo.echo_TestSurrounding(io);
check_status_ok(status);
assert(io.output.data.surrounding.length == 20);
@@ -210,6 +211,7 @@
}
var binding = options.ARGV[0];
var echo = rpcecho_init();
+datablob_init(echo);
print(Connecting to + binding + \n);
status = echo.connect(binding);
svn commit: samba r9346 - in branches/SAMBA_4_0/source/script/tests: .
Author: tridge Date: 2005-08-17 02:56:39 + (Wed, 17 Aug 2005) New Revision: 9346 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9346 Log: allow test_ldap.sh to be called when $CONFFILE is not set Modified: branches/SAMBA_4_0/source/script/tests/test_ldap.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_ldap.sh === --- branches/SAMBA_4_0/source/script/tests/test_ldap.sh 2005-08-17 02:56:07 UTC (rev 9345) +++ branches/SAMBA_4_0/source/script/tests/test_ldap.sh 2005-08-17 02:56:39 UTC (rev 9346) @@ -10,7 +10,7 @@ # see if we support ldaps if grep HAVE_LIBGNUTLS.1 include/config.h /dev/null -grep tls.enabled.=yes $CONFFILE /dev/null; then +test -n $CONFFILE grep tls.enabled.=yes $CONFFILE /dev/null; then PROTOCOLS=ldap ldaps else PROTOCOLS=ldap
svn commit: samba r9347 - in branches/SAMBA_4_0/source: build/pidl/Parse/Pidl/Samba/NDR librpc/ndr
Author: tridge
Date: 2005-08-17 03:30:45 + (Wed, 17 Aug 2005)
New Revision: 9347
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9347
Log:
this array bounds checking is harder than it looks ...
this copes with 2 more situations:
1) where the array is NULL, which would previously be coped with by a
if (ptr) check, but now in the deferred array bounds checking needs
to look at the array variable in the ndr code. Not nice.
2) nest the array checking along with the SCALARS vs BUFFERS checks, ensuring
we don't
do array bounds checking for a buffer when in scalars only mode
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-17 02:56:39 UTC (rev 9346)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
2005-08-17 03:30:45 UTC (rev 9347)
@@ -1330,6 +1330,8 @@
ParseElementPull($e, ndr, r-, $env, 1, 0);
}
+ add_deferred();
+
deindent;
pidl };
pidl if (ndr_flags NDR_BUFFERS) {;
@@ -1343,11 +1345,11 @@
ParseElementPull($e, ndr, r-, $env, 0, 1);
}
+ add_deferred();
+
deindent;
pidl };
- add_deferred();
-
end_flags($struct);
# restore the old relative_base_offset
pidl ndr_pull_restore_relative_base_offset(ndr,
_save_relative_base_offset); if defined($struct-{PROPERTIES}{relative_base});
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-08-17 02:56:39 UTC (rev
9346)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-08-17 03:30:45 UTC (rev
9347)
@@ -493,6 +493,10 @@
NTSTATUS ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size)
{
uint32_t stored;
+ /* a NULL array is OK */
+ if (*(void **)p == NULL) {
+ return NT_STATUS_OK;
+ }
stored = ndr_token_peek(ndr-array_size_list, p);
if (stored != size) {
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
@@ -531,6 +535,10 @@
NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length)
{
uint32_t stored;
+ /* a NULL array is OK */
+ if (*(void **)p == NULL) {
+ return NT_STATUS_OK;
+ }
stored = ndr_token_peek(ndr-array_length_list, p);
if (stored != length) {
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
svn commit: samba r9348 - in branches/SOC/SAMBA_3_0/source: include libmsrpc
Author: skel
Date: 2005-08-17 03:48:41 + (Wed, 17 Aug 2005)
New Revision: 9348
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9348
Log:
added cac_SamCreateAlias(), cac_SamOpenAlias(), cac_SamDeleteAlias(),
cac_SamAddAliasMember()
Modified:
branches/SOC/SAMBA_3_0/source/include/libmsrpc.h
branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c
Changeset:
Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h
===
--- branches/SOC/SAMBA_3_0/source/include/libmsrpc.h2005-08-17 03:30:45 UTC
(rev 9347)
+++ branches/SOC/SAMBA_3_0/source/include/libmsrpc.h2005-08-17 03:48:41 UTC
(rev 9348)
@@ -1463,7 +1463,59 @@
int cac_SamEnumAliases(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamEnumAliases *op);
+struct SamCreateAlias {
+ struct {
+ /**Open handle to the domain SAM*/
+ POLICY_HND *domain;
+ /**The name of the alias*/
+ char *name;
+ } in;
+
+ struct {
+ /**Handle to the group*/
+ POLICY_HND *alias_hnd;
+ } out;
+};
+
+/** @ingroup SAM_Functions
+ * Creates an alias. If the alias already exists it will not be opened*/
+int cac_SamCreateAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamCreateAlias *op);
+
+struct SamOpenAlias {
+ struct {
+ /**Open handle to the domain SAM*/
+ POLICY_HND *domain;
+
+ /**Desired access to open the group with. See Generic access masks in
include/smb.h*/
+ uint32 access;
+
+ /**rid of the alias*/
+ uint32 alias_rid;
+ } in;
+
+ struct {
+ /**Handle to the alias*/
+ POLICY_HND *alias_hnd;
+ } out;
+};
+
+int cac_SamOpenAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamOpenAlias *op);
+
+int cac_SamDeleteAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, POLICY_HND
*alias_hnd);
+
+struct SamAddAliasMember {
+ struct {
+ /**Open handle to a alias*/
+ POLICY_HND *alias_hnd;
+
+ /**SID of new member*/
+ DOM_SID *sid;
+ } in;
+};
+
+int cac_SamAddAliasMember(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamAddAliasMember *op);
+
void cac_GetAuthDataFn(const char * pServer,
const char * pShare,
char * pWorkgroup,
Modified: branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c
===
--- branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c 2005-08-17 03:30:45 UTC
(rev 9347)
+++ branches/SOC/SAMBA_3_0/source/libmsrpc/cac_samr.c 2005-08-17 03:48:41 UTC
(rev 9348)
@@ -1124,3 +1124,153 @@
return CAC_SUCCESS;
}
+int cac_SamCreateAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamCreateAlias *op) {
+ SMBCSRV *srv = NULL;
+
+ POLICY_HND *als_hnd_out = NULL;
+
+ if(!hnd)
+ return CAC_FAILURE;
+
+ if(!hnd-_internal.ctx || !hnd-_internal.pipes[PI_SAMR]) {
+ hnd-status = NT_STATUS_INVALID_HANDLE;
+ return CAC_FAILURE;
+ }
+
+ if(!op || !op-in.name || op-in.name[0] == '\0' || !mem_ctx) {
+ hnd-status = NT_STATUS_INVALID_PARAMETER;
+ return CAC_FAILURE;
+ }
+
+ srv = cac_GetServer(hnd);
+ if(!srv) {
+ hnd-status = NT_STATUS_UNSUCCESSFUL;
+ return CAC_FAILURE;
+ }
+
+ srv-cli.pipe_idx = PI_SAMR;
+
+ als_hnd_out = talloc(mem_ctx, POLICY_HND);
+ if(!als_hnd_out) {
+ hnd-status = NT_STATUS_NO_MEMORY;
+ return CAC_FAILURE;
+ }
+
+ hnd-status = cli_samr_create_dom_alias( (srv-cli), mem_ctx,
op-in.domain, op-in.name, als_hnd_out);
+
+ if(!NT_STATUS_IS_OK(hnd-status))
+ return CAC_FAILURE;
+
+ op-out.alias_hnd = als_hnd_out;
+
+ return CAC_SUCCESS;
+
+}
+
+int cac_SamOpenAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct
SamOpenAlias *op) {
+ SMBCSRV *srv = NULL;
+
+ POLICY_HND *als_hnd_out = NULL;
+
+ if(!hnd)
+ return CAC_FAILURE;
+
+ if(!hnd-_internal.ctx || !hnd-_internal.pipes[PI_SAMR]) {
+ hnd-status = NT_STATUS_INVALID_HANDLE;
+ return CAC_FAILURE;
+ }
+
+ if(!op || op-in.access == 0 || op-in.alias_rid == 0 || !mem_ctx) {
+ hnd-status = NT_STATUS_INVALID_PARAMETER;
+ return CAC_FAILURE;
+ }
+
+ srv = cac_GetServer(hnd);
+ if(!srv) {
+ hnd-status = NT_STATUS_UNSUCCESSFUL;
+ return CAC_FAILURE;
+ }
+
+ srv-cli.pipe_idx = PI_SAMR;
+
+ als_hnd_out = talloc(mem_ctx, POLICY_HND);
+ if(!als_hnd_out) {
+ hnd-status = NT_STATUS_NO_MEMORY;
+ return CAC_FAILURE;
+ }
+
+ hnd-status = cli_samr_open_alias( (srv-cli), mem_ctx, op-in.domain,
op-in.access, op-in.alias_rid, als_hnd_out);
+
+ if(!NT_STATUS_IS_OK(hnd-status))
+ return CAC_FAILURE;
+
+ op-out.alias_hnd = als_hnd_out;
+
+ return CAC_SUCCESS;
+}
+
+int cac_SamDeleteAlias(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, POLICY_HND
*alias_hnd) {
+ SMBCSRV *srv = NULL;
+
+ if(!hnd)
+ return CAC_FAILURE;
+
+ if(!hnd-_internal.ctx || !hnd-_internal.pipes[PI_SAMR]) {
+ hnd-status =
svn commit: samba r9349 - in trunk/source/smbwrapper: .
Author: jra
Date: 2005-08-17 05:08:35 + (Wed, 17 Aug 2005)
New Revision: 9349
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9349
Log:
Fix direct malloc calls made by smbwrapper.
Jeremy.
Modified:
trunk/source/smbwrapper/smbw_dir.c
Changeset:
Modified: trunk/source/smbwrapper/smbw_dir.c
===
--- trunk/source/smbwrapper/smbw_dir.c 2005-08-17 03:48:41 UTC (rev 9348)
+++ trunk/source/smbwrapper/smbw_dir.c 2005-08-17 05:08:35 UTC (rev 9349)
@@ -188,7 +188,7 @@
goto failed;
}
- dir = (struct smbw_dir *)malloc(sizeof(*dir));
+ dir = SMB_MALLOC_P(struct smbw_dir);
if (!dir) {
errno = ENOMEM;
goto failed;
@@ -265,7 +265,7 @@
dir-fd = fd;
dir-srv = srv;
- dir-path = strdup(s);
+ dir-path = SMB_STRDUP(s);
DEBUG(4,( - %d\n, dir-count));
@@ -578,7 +578,7 @@
if (!buf) {
if (size = 0) size = strlen(smbw_cwd)+1;
- buf = (char *)malloc(size);
+ buf = SMB_MALLOC_ARRAY(char, size);
if (!buf) {
errno = ENOMEM;
smbw_busy--;
svn commit: samba r9350 - in branches/SAMBA_3_0/source/smbwrapper: .
Author: jra
Date: 2005-08-17 05:09:32 + (Wed, 17 Aug 2005)
New Revision: 9350
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9350
Log:
Fix direct malloc calls made by smbwrapper.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c
===
--- branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c 2005-08-17 05:08:35 UTC
(rev 9349)
+++ branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c 2005-08-17 05:09:32 UTC
(rev 9350)
@@ -188,7 +188,7 @@
goto failed;
}
- dir = (struct smbw_dir *)malloc(sizeof(*dir));
+ dir = SMB_MALLOC_P(struct smbw_dir);
if (!dir) {
errno = ENOMEM;
goto failed;
@@ -265,7 +265,7 @@
dir-fd = fd;
dir-srv = srv;
- dir-path = strdup(s);
+ dir-path = SMB_STRDUP(s);
DEBUG(4,( - %d\n, dir-count));
@@ -578,7 +578,7 @@
if (!buf) {
if (size = 0) size = strlen(smbw_cwd)+1;
- buf = (char *)malloc(size);
+ buf = SMB_MALLOC_ARRAY(char, size);
if (!buf) {
errno = ENOMEM;
smbw_busy--;
svn commit: samba r9351 - in branches/SOC/SAMBA_4_0: . source/libnet source/torture/rpc
Author: brad
Date: 2005-08-17 05:15:31 + (Wed, 17 Aug 2005)
New Revision: 9351
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9351
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-16 23:23:58 -0600
Removed LIBNET_JOIN_TORTURE level, as it became unnecessary once
libnet_Join_primary_domain() handled netbios names better.
Corrected libnet_JoinDomain() and libnet_JoinADSDomain().
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c
branches/SOC/SAMBA_4_0/source/libnet/libnet_join.h
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9311
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5436
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5433
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9311
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5438
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5433
Modified: branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c
===
--- branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-17 05:09:32 UTC
(rev 9350)
+++ branches/SOC/SAMBA_4_0/source/libnet/libnet_join.c 2005-08-17 05:15:31 UTC
(rev 9351)
@@ -420,9 +420,9 @@
return status;
}
}
- r-out.samr_pipe = samr_pipe;
- r-out.samr_binding = samr_binding;
-
+ r-out.samr_pipe = talloc_steal(mem_ctx, samr_pipe);
+ r-out.samr_binding = talloc_steal(mem_ctx, samr_binding);
+ r-out.user_handle = u_handle;
/* Now, if it was AD, then we want to start looking changing a
* few more things. Otherwise, we are done. */
if (realm) {
@@ -432,10 +432,7 @@
r-out.realm = NULL;
r-out.kvno = 0;
- if (r-in.level != LIBNET_JOIN_TORTURE) {
- /* This is probably not the best way to keep the connection
from closing */
- talloc_free(tmp_ctx);
- }
+ talloc_free(tmp_ctx);
return NT_STATUS_OK;
}
@@ -641,11 +638,9 @@
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
}
+
+ talloc_free(tmp_ctx);
- if (r-in.level != LIBNET_JOIN_TORTURE) {
- /* This is probably not the best way to keep the connection
from closing */
- talloc_free(tmp_ctx);
- }
return NT_STATUS_OK;
}
@@ -677,12 +672,12 @@
}
r2.in.domain_name = r-in.domain_name;
- if ((r-in.level == LIBNET_JOIN_SPECIFIED)
- || (r-in.level == LIBNET_JOIN_TORTURE)) {
- r2.in.netbios_name = r-in.netbios_name;
+ if ((r2.in.netbios_name != NULL) (r2.in.level !=
LIBNET_JOIN_AUTOMATIC)) {
+ r2.in.netbios_name = r-in.netbios_name;
} else {
r2.in.netbios_name = talloc_asprintf(mem_ctx, %s,
lp_netbios_name());
}
+
r2.in.account_name = talloc_asprintf(mem_ctx, %s$,
r2.in.netbios_name);
/* Local secrets are stored in secrets.ldb */
@@ -703,10 +698,10 @@
return status;
}
- if (r-in.level == LIBNET_JOIN_TORTURE) {
- /* get the SAMR pipe we left open in libnet_JoinDomain() */
- r-out.samr_pipe = r2.out.samr_pipe;
- }
+ r-out.samr_pipe = r2.out.samr_pipe;
+ r-out.user_handle = r2.out.user_handle;
+ r-out.domain_sid = r2.out.domain_sid;
+ r-out.join_password = r2.out.join_password;
sct = talloc_asprintf(mem_ctx, %d, r-in.secure_channel_type);
msg = ldb_msg_new(mem_ctx);
@@ -776,8 +771,8 @@
msg-dn);
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
+
return NT_STATUS_OK;
-
}
NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct
libnet_Join *r)
@@ -800,7 +795,13 @@
r-in.secure_channel_type,
r-in.domain_name);
return NT_STATUS_INVALID_PARAMETER;
}
+
r-out.error_string = r2.out.error_string;
+ r-out.join_password = r2.out.join_password;
+ r-out.domain_sid = r2.out.domain_sid;
+ r-out.samr_pipe = r2.out.samr_pipe;
+ r-out.user_handle = r2.out.user_handle;
+
return nt_status;
}
Modified: branches/SOC/SAMBA_4_0/source/libnet/libnet_join.h
===
--- branches/SOC/SAMBA_4_0/source/libnet/libnet_join.h 2005-08-17 05:09:32 UTC
(rev 9350)
+++ branches/SOC/SAMBA_4_0/source/libnet/libnet_join.h 2005-08-17 05:15:31 UTC
(rev 9351)
@@ -24,7 +24,6 @@
enum
svn commit: samba r9352 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-17 05:24:49 + (Wed, 17 Aug 2005)
New Revision: 9352
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9352
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-16 23:33:25 -0600
Fixed a typo.
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:9311
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5438
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5433
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9311
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5440
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5433
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-17 05:15:31 UTC
(rev 9351)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-17 05:24:49 UTC
(rev 9352)
@@ -219,8 +219,9 @@
if (ctx-new_dc.join) {
torture_leave_domain(ctx-new_dc.join);
}
+ */
talloc_free(ctx);
- */
+
}
static BOOL test_DsBind(struct DsSyncTest *ctx,struct cli_credentials
*credentials, struct DsSyncBindInfo *b)
