Re: [Samba] smb-ldap or not to smb-ldap
[Sorry for my previous empty post, lost it for a second.] Craig White wrote: On Fri, 2006-03-31 at 16:30 +0100, Antony Gelberg wrote: Hi all, We are deploying a Linux server and desktops for a customer. We will have the users and groups in LDAP on the server, and files shared via NFS. However, one never knows if Windows desktops will be needed in the future. Is it a good idea to add users with smb-ldap even if samba is not initially used, as adding the samba attributes to an existing LDAP database is painful, and the smb-ldap created users will have the relevant POSIX credentials to be able to login anyway? It would seem to me that a successful LDAP implementation is going to have an administrator who can script changes to the users attributes when necessary, otherwise, it's not just a down the road implementation of samba that will make things difficult. My thinking is that time spent now to acquire skill sets is better than spending time to configure an imagined samba implementation which may happen down the road. You're right, but time is not always that easy to come by and smbldap-tools is a real time-saver, being so powerful. That being said, it probably won't hurt anything to implement smbldap-tools but consider that the real issue is the tool sets you use to create/modify existing users outside of the samba realm must all anticipate the samba schema because the smbldap-tools are for samba based tools. There is no requirement to have users who aren't part of the samba realm i.e. with POSIX login only, so we can always use the smbldap-tools toolset. Or did I misunderstand your point? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smb-ldap or not to smb-ldap
Craig White wrote: On Fri, 2006-03-31 at 16:30 +0100, Antony Gelberg wrote: Hi all, We are deploying a Linux server and desktops for a customer. We will have the users and groups in LDAP on the server, and files shared via NFS. However, one never knows if Windows desktops will be needed in the future. Is it a good idea to add users with smb-ldap even if samba is not initially used, as adding the samba attributes to an existing LDAP database is painful, and the smb-ldap created users will have the relevant POSIX credentials to be able to login anyway? It would seem to me that a successful LDAP implementation is going to have an administrator who can script changes to the users attributes when necessary, otherwise, it's not just a down the road implementation of samba that will make things difficult. My thinking is that time spent now to acquire skill sets is better than spending time to configure an imagined samba implementation which may happen down the road. That being said, it probably won't hurt anything to implement smbldap-tools but consider that the real issue is the tool sets you use to create/modify existing users outside of the samba realm must all anticipate the samba schema because the smbldap-tools are for samba based tools. Craig -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.21c and big wmv or mpg files
Tom Peters wrote: Tell me, do you get this problem when you drag/n/drop a file into a folder on the samba share? And can you prevent this problem from occurring by the following procedure? I cannot see the problem here but heared from 2 users of 3.0.21c with this problem. Downloaded a file with 843 MB which reproducable triggered the error by one of the users - but not on my system. We are using the _same_ samba version (built by me) on the same distribution: http://www.eisfair.org/ http://www.pack-eis.de/index.php?p=samba I'm the maintainer of this samba package and therefore interested in to correct this. Click in the target window on the samba machine (this is on the XP desktop). Press F5 to refresh the view. Wait about a second. Immediately start your copy. When I do this, the errors, previously reported to the desktop and to my server log, don't occur. The user copies the file with: - right click to the local file and 'copy' - right click in the share and 'insert' I've been told that it's a WinXP only issue, that it attempts to connect on ports 445 and 139 nearly simultaneously, and then proceeds to talk over whichever one answers first. I'm told that Win2k clients won't have this problem, and Win98 clients don't use port 445 so it doesn't arise there. How did you adjusted your clients? On tab 'WINS'/Netbios properties (all translated from german): TCP/IP properties/Default or TCP/IP properties/Enable Netbios over TCP/IP ? While copying the wmv test file a have a cpu utilization of 95! percent (top) of smbd at the time, samba creates the sparse (?) file in the size needed for the test file. Maybe this is problematical on smaller systems. Samba is running here on an VMWARE on top of XP (the test client) with P4 3,2 GHz: deveis # cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Intel(R) Pentium(R) 4 CPU 3.20GHz stepping: 8 cpu MHz : 3193.393 cache size : 0 KB fdiv_bug: no hlt_bug : no f00f_bug: no coma_bug: no fpu : yes fpu_exception : yes cpuid level : 5 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss pni ds_cpl bogomips: 6370.09 By the user of the test file the sparse file with the correct size will be created but is complete empty... der tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smb-ldap or not to smb-ldap
On Sat, 2006-04-01 at 12:56 +0100, Antony Gelberg wrote: [Sorry for my previous empty post, lost it for a second.] Craig White wrote: On Fri, 2006-03-31 at 16:30 +0100, Antony Gelberg wrote: Hi all, We are deploying a Linux server and desktops for a customer. We will have the users and groups in LDAP on the server, and files shared via NFS. However, one never knows if Windows desktops will be needed in the future. Is it a good idea to add users with smb-ldap even if samba is not initially used, as adding the samba attributes to an existing LDAP database is painful, and the smb-ldap created users will have the relevant POSIX credentials to be able to login anyway? It would seem to me that a successful LDAP implementation is going to have an administrator who can script changes to the users attributes when necessary, otherwise, it's not just a down the road implementation of samba that will make things difficult. My thinking is that time spent now to acquire skill sets is better than spending time to configure an imagined samba implementation which may happen down the road. You're right, but time is not always that easy to come by and smbldap-tools is a real time-saver, being so powerful. That being said, it probably won't hurt anything to implement smbldap-tools but consider that the real issue is the tool sets you use to create/modify existing users outside of the samba realm must all anticipate the samba schema because the smbldap-tools are for samba based tools. There is no requirement to have users who aren't part of the samba realm i.e. with POSIX login only, so we can always use the smbldap-tools toolset. Or did I misunderstand your point? yeah, I think you did miss the point - not that it was very important. He's asking about pre-configuring smbldap-tools without an intention or a plan to implement for the near future as a just in case proposition because he doesn't know how to go back in add attributes/objectclasses to his existing DSA. I'm suggesting that learning to do that would likely be a better investment in time than trying to calculate what an unneeded samba setup would look like so he can configure it now in anticipation. I'm suggesting that the problem down the road won't be because he didn't configure smbldap-tools out now, but more likely to be not knowing how to manipulate the entries in LDAP on a mass scale. Craig -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] File versioning with Samba (on a Linux filesystem)?
Thanks very much to everyone for all the input on this question. Terry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba perms vs. fs perms
The subject's a little misleading really, but I was looking for some clarification of my thoughts... In Windows, one can use both share permissions and NTFS permissions to control access to files. I would normally use share permissions to control a connection (allow/deny), and use NTFS to control access. I would never use share permissions to control access whilst NTFS was capable of doing it. Is this relationship the same for Samba permissions and file system permissions? Would you ideally use Samba for connection control, and the file system for access control? If I can sneak a related question in here... I want a 'public' share, with only the owner able to modify their own files, do I just use the sticky bit filesystem attribute on the public shared directory? Many thanks, Steve :) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba perms vs. fs perms
Steve, My comments are included within your original message. On 4/1/06 5:01 PM, Steve A [EMAIL PROTECTED] wrote: The subject's a little misleading really, but I was looking for some clarification of my thoughts... In Windows, one can use both share permissions and NTFS permissions to control access to files. I would normally use share permissions to control a connection (allow/deny), and use NTFS to control access. I would never use share permissions to control access whilst NTFS was capable of doing it. Is this relationship the same for Samba permissions and file system permissions? Would you ideally use Samba for connection control, and the file system for access control? It is certainly possible to do things this way, using the valid users and invalid users parameters in smb.conf. It can get rather cumbersome to use this method though, particularly if the amount of access control necessary gets rather fine-grained. In addition, a lot of UNIX/Linux file systems do not support ACLs as NTFS does. I know ext2/ext3 and XFS on Linux support ACLs, but I'm not sure if others do as well. It's something that has been coming for a while on various *NIX platforms, but it's still a fairly new thing for most systems. Samba supports underlying ACL file system support on almost all UNIX file systems that support ACLs themselves, offering great integration with Windows clients. If I can sneak a related question in here... I want a 'public' share, with only the owner able to modify their own files, do I just use the sticky bit filesystem attribute on the public shared directory? I'd imagine it would be this simple, with something like permissions of 755 or 655. I'm hoping someone else can post to verify this. :-) Many thanks, Steve :) -- +-+ | Sean Elble | | Virginia Tech | | Computer Engineering, Class of 2008| | Vice President, VTLUUG | | E-Mail: [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] SAMBA install on IRIX 6.5
You should remove your symlink and install the openldap subsystem from the CD 3. You will need at least openldap.sw.lib32 and openldap.sw.hdr. Thanks, that fixed it. The SGI is running 3.0.21c with ADS now if I only had permissions to: net ads join grin I am trying to compile now on a SUN_SPARC_5.10 box and I am getting similar errors :( this OpenLDAP is being difficult. ./configure --with-acl-support --with-quotas --with-included-popt --localstatedir=/var/lib/samba --with-piddir=/var/run --with-logfilebase=/var/log/samba -with-privatedir=/usr/local/etc/samba --with-configdir=/usr/local/etc/samba --with-ldap=yes --with-ads=yes checking for LDAP support... yes checking ldap.h usability... yes checking ldap.h presence... yes checking for ldap.h... yes checking lber.h usability... yes checking lber.h presence... yes checking for lber.h... yes checking for ber_scanf in -llber... no checking for ldap_init in -lldap... yes checking for ldap_set_rebind_proc... yes checking whether ldap_set_rebind_proc takes 3 arguments... 3 checking whether LDAP support is used... yes checking for Active Directory and krb5 support... yes checking for ldap_initialize... no configure: error: Active Directory Support requires ldap_initialize Any thoughts on this one? Darrin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Russian CHARS
Hello samba, How can mount (smbmount) MSWIN2003 resource from Linux client (RHEL4U2) to see russian. I am using following command: # smbmount //srv2/v$ /mnt/backup/srv2 -o 'credentials=userpass,iocharset=KOI8-R,codepage=koi8r' What I should use env. variables or additional parameters from this command (smbmount) ? I see only that (but need russian and eng): What Women Want -=БЮ¬Ф= -=БЮ¬Ф=_¦гЮг¬=ёЮЦ¬L= -=Ю=-Б¬-- -- Best regards, Vladimir mailto:[EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] upgrade 3.0.11 to 3.022
3.0.11 cames with my Linux system (OpenSlug). I installed 3.0.22, but smb -V still returns 3.0.11. How can I fix that. Thank you. JBScott -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] add machine script problem with Fedora core 5
I am having some trouble with Samba 3.0.21b-2 as a PDC running on Fedora core 5. In particular, on-the-fly creation of machine accounts using the add machine script parameter does not seem to work. In smb.conf, I have the following line: add machine script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u When I try to join a new WinXP machine to the domain, it fails to create the machine account. The error log for the client host reports: [2006/03/31 15:19:31, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2404) _samr_create_user: Running the command `/usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M embera$' gave 82 According to the man pages for 'useradd', there is no error code 82. If I try to manually run the useradd command myself, it works fine, and the machine is subsequently able to join the domain. Furthermore, no matter what I specify for the 'add machine script' parameter, it ALWAYS fails with gave 82. For example, I tried: add machine script = /usr/sbin/addMachine.sh addMachine.sh: echo this is a test /usr/sbin/test.txt This script never gets called (test.txt is not created), and the error log STILL reports gave 82: [2006/03/31 15:19:31, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2404) _samr_create_user: Running the command `/usr/bin/addMachine.sh' gave 82 Any help is greatly appreciated. Below is my smb.conf for reference. Thanks, James smb.conf [global] # workgroup = NT-Domain-Name or Workgroup-Name netbios name = kuna workgroup = PANAMA domain logons = yes domain master = yes security = user add machine script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u domain admin users = root # server string is the equivalent of the NT Description field server string = Samba Server # This option is important for security. It allows you to restrict # connections to machines which are on your local network. The # following example restricts access to two C class networks and # the loopback interface. For more examples of the syntax see # the smb.conf man page ; hosts allow = 192.168.1. 192.168.2. 127. # if you want to automatically load your printer list rather # than setting them up individually then you'll need this printcap name = /etc/printcap load printers = yes # It should not be necessary to spell out the print system type unless # yours is non-standard. Currently supported print systems include: # bsd, sysv, plp, lprng, aix, hpux, qnx ; printing = cups # This option tells cups that the data has already been rasterized cups options = raw # Uncomment this if you want a guest account, you must add this to /etc/passwd # otherwise the user nobody is used ; guest account = pcguest # this tells Samba to use a separate log file for each machine # that connects log file = /var/log/samba/%m.log # all log information in one file # log file = /var/log/samba/log.smbd # Put a capping on the size of the log files (in Kb). max log size = 50 # Security mode. Most people will want user level security. See # security_level.txt for details. ; security = user # Use password server option only with security = server ; password server = NT-Server-Name # Password Level allows matching of _n_ characters of the password for # all combinations of upper and lower case. ; password level = 8 ; username level = 8 # You may wish to use password encryption. Please read # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. # Do not enable this option unless you have read those documents encrypt passwords = yes smb passwd file = /etc/samba/smbpasswd # The following are needed to allow password changing from Windows to # update the Linux system password also. # NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above. # NOTE2: You do NOT need these to allow workstations to change only #the encrypted SMB passwords. They allow the Unix password #to be kept in sync with the SMB password. ; unix password sync = Yes ; passwd program = /usr/bin/passwd %u ; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passw d:*all*authentication*tokens*updated*successfully* # Unix users can map to different SMB User names ; username map = /etc/samba/smbusers # Using the following line enables you to customise your configuration # on a per machine basis. The %m gets replaced with the netbios name # of the machine that is connecting ; include = /etc/samba/smb.conf.%m # Most people will find that this option gives better performance. # See speed.txt and the manual pages for details socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them # here. See the man page for details. ; interfaces = 192.168.12.2/24 192.168.13.2/24 # Configure remote browse list synchronisation here # request announcement
[Samba] problem with showing title of the share
Hello I have the following problem: I mapped my share on linux (with samba) with a letter Z: . how can I change title when accessing this share from My computer in WinXP. This title is : share_name on Samba 3.0.4-SUSE (address ip) (Z:) Smb.conf server string = Server announce as = linux announce version = 5.1 Samba was installed from rpm. Is there anything I can do to change this title? I would like this title to appear like: share_name on linux (ip_addres) (Z: ) Thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] SAMBA install on IRIX 6.5
On 3/31/06, McDougald, James D. (Contr) [EMAIL PROTECTED] wrote: You should remove your symlink and install the openldap subsystem from the CD 3. You will need at least openldap.sw.lib32 and openldap.sw.hdr. Thanks, that fixed it. The SGI is running 3.0.21c with ADS now if I only had permissions to: net ads join grin I am trying to compile now on a SUN_SPARC_5.10 box and I am getting similar errors :( this OpenLDAP is being difficult. ./configure --with-acl-support --with-quotas --with-included-popt --localstatedir=/var/lib/samba --with-piddir=/var/run --with-logfilebase=/var/log/samba -with-privatedir=/usr/local/etc/samba --with-configdir=/usr/local/etc/samba --with-ldap=yes --with-ads=yes checking for LDAP support... yes checking ldap.h usability... yes checking ldap.h presence... yes checking for ldap.h... yes checking lber.h usability... yes checking lber.h presence... yes checking for lber.h... yes checking for ber_scanf in -llber... no checking for ldap_init in -lldap... yes checking for ldap_set_rebind_proc... yes checking whether ldap_set_rebind_proc takes 3 arguments... 3 checking whether LDAP support is used... yes checking for Active Directory and krb5 support... yes checking for ldap_initialize... no configure: error: Active Directory Support requires ldap_initialize Any thoughts on this one? Sorry, no. I have a vague idea that there have been others having fun with the Solaris LDAP libraries. There might be something useful in the list archves. -- James Peach | [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r14848 - in branches/SAMBA_4_0/source/lib/compression: .
Author: metze Date: 2006-04-01 08:12:49 + (Sat, 01 Apr 2006) New Revision: 14848 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14848 Log: use the constant instead of the interger value metze Modified: branches/SAMBA_4_0/source/lib/compression/mszip.c Changeset: Modified: branches/SAMBA_4_0/source/lib/compression/mszip.c === --- branches/SAMBA_4_0/source/lib/compression/mszip.c 2006-04-01 05:41:34 UTC (rev 14847) +++ branches/SAMBA_4_0/source/lib/compression/mszip.c 2006-04-01 08:12:49 UTC (rev 14848) @@ -341,7 +341,7 @@ ZIPNEEDBITS(e) } while ((e = (t = t-v.t + ((uint32_t)b Zipmask[e]))-e) 16); ZIPDUMPBITS(t-b) -if (w = 32768) break; +if (w = CAB_BLOCKMAX) break; if (e == 16)/* then it's a literal */ CAB(outbuf)[w++] = (uint8_t)t-v.n; else/* it's an EOB or a length */
svn commit: samba r14849 - in branches/SAMBA_3_0/source/smbd: .
Author: jra Date: 2006-04-01 18:22:31 + (Sat, 01 Apr 2006) New Revision: 14849 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14849 Log: Fix = that should be . Too strict condition checked by Volker. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/ipc.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/ipc.c === --- branches/SAMBA_3_0/source/smbd/ipc.c2006-04-01 08:12:49 UTC (rev 14848) +++ branches/SAMBA_3_0/source/smbd/ipc.c2006-04-01 18:22:31 UTC (rev 14849) @@ -509,7 +509,7 @@ goto bad_param; if (pdisp tpscnt) goto bad_param; - if ((smb_base(inbuf) + poff + pcnt = inbuf + bufsize) || + if ((smb_base(inbuf) + poff + pcnt inbuf + bufsize) || (smb_base(inbuf) + poff + pcnt smb_base(inbuf))) goto bad_param; if (params + pdisp params) @@ -525,7 +525,7 @@ goto bad_param; if (ddisp tdscnt) goto bad_param; - if ((smb_base(inbuf) + doff + dcnt = inbuf + bufsize) || + if ((smb_base(inbuf) + doff + dcnt inbuf + bufsize) || (smb_base(inbuf) + doff + dcnt smb_base(inbuf))) goto bad_param; if (data + ddisp data)
svn commit: samba r14850 - in branches/SAMBA_4_0/source/param: .
Author: jelmer
Date: 2006-04-01 18:25:07 + (Sat, 01 Apr 2006)
New Revision: 14850
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14850
Log:
Don't assume that sizeof(BOOL) == sizeof(int)
Modified:
branches/SAMBA_4_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c 2006-04-01 18:22:31 UTC (rev
14849)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2006-04-01 18:25:07 UTC (rev
14850)
@@ -128,9 +128,9 @@
char *ntptr_providor;
char *szWinbindSeparator;
char *szWinbinddSocketDirectory;
- BOOL bWinbindSealedPipes;
+ int bWinbindSealedPipes;
char *swat_directory;
- BOOL tls_enabled;
+ int tls_enabled;
char *tls_keyfile;
char *tls_certfile;
char *tls_cafile;
@@ -142,7 +142,7 @@
int minprotocol;
int security;
char **AuthMethods;
- BOOL paranoid_server_security;
+ int paranoid_server_security;
int max_wins_ttl;
int min_wins_ttl;
int announce_as;/* This is initialised in init_globals */
@@ -153,35 +153,35 @@
int kpasswd_port;
int web_port;
char *socket_options;
- BOOL bWINSsupport;
- BOOL bWINSdnsProxy;
+ int bWINSsupport;
+ int bWINSdnsProxy;
char *szWINSHook;
- BOOL bLocalMaster;
- BOOL bPreferredMaster;
- BOOL bEncryptPasswords;
- BOOL bNullPasswords;
- BOOL bObeyPamRestrictions;
- BOOL bLargeReadwrite;
- BOOL bReadRaw;
- BOOL bWriteRaw;
- BOOL bTimeServer;
- BOOL bBindInterfacesOnly;
- BOOL bNTSmbSupport;
- BOOL bNTStatusSupport;
- BOOL bLanmanAuth;
- BOOL bNTLMAuth;
- BOOL bUseSpnego;
+ int bLocalMaster;
+ int bPreferredMaster;
+ int bEncryptPasswords;
+ int bNullPasswords;
+ int bObeyPamRestrictions;
+ int bLargeReadwrite;
+ int bReadRaw;
+ int bWriteRaw;
+ int bTimeServer;
+ int bBindInterfacesOnly;
+ int bNTSmbSupport;
+ int bNTStatusSupport;
+ int bLanmanAuth;
+ int bNTLMAuth;
+ int bUseSpnego;
int server_signing;
int client_signing;
- BOOL bClientPlaintextAuth;
- BOOL bClientLanManAuth;
- BOOL bClientNTLMv2Auth;
- BOOL client_use_spnego_principal;
- BOOL bHostMSDfs;
- BOOL bUnicode;
- BOOL bUnixExtensions;
- BOOL bDisableNetbios;
- BOOL bRpcBigEndian;
+ int bClientPlaintextAuth;
+ int bClientLanManAuth;
+ int bClientNTLMv2Auth;
+ int client_use_spnego_principal;
+ int bHostMSDfs;
+ int bUnicode;
+ int bUnixExtensions;
+ int bDisableNetbios;
+ int bRpcBigEndian;
struct param_opt *param_opt;
}
global;
@@ -193,7 +193,7 @@
*/
typedef struct
{
- BOOL valid;
+ int valid;
char *szService;
char *szPath;
char *szCopy;
@@ -208,18 +208,18 @@
int iMaxPrintJobs;
int iMaxConnections;
int iCSCPolicy;
- BOOL bAvailable;
- BOOL bBrowseable;
- BOOL bRead_only;
- BOOL bPrint_ok;
- BOOL bMap_system;
- BOOL bMap_hidden;
- BOOL bMap_archive;
- BOOL bStrictLocking;
- BOOL *copymap;
- BOOL bMSDfsRoot;
- BOOL bStrictSync;
- BOOL bCIFileSystem;
+ int bAvailable;
+ int bBrowseable;
+ int bRead_only;
+ int bPrint_ok;
+ int bMap_system;
+ int bMap_hidden;
+ int bMap_archive;
+ int bStrictLocking;
+ int *copymap;
+ int bMSDfsRoot;
+ int bStrictSync;
+ int bCIFileSystem;
struct param_opt *param_opt;
char dummy[3]; /* for alignment */
@@ -918,7 +918,7 @@
static int getservicebyname(const char *pszServiceName,
service * pserviceDest);
static void copy_service(service * pserviceDest,
-service * pserviceSource, BOOL *pcopymapDest);
+service * pserviceSource, int *pcopymapDest);
static BOOL service_ok(int iService);
static BOOL do_section(const char *pszSectionName, void *);
static void init_copymap(service * pservice);
@@ -1399,7 +1399,7 @@
If pcopymapDest is NULL then copy all fields
***/
-static void copy_service(service * pserviceDest, service * pserviceSource,
BOOL *pcopymapDest)
+static void copy_service(service * pserviceDest, service * pserviceSource, int
*pcopymapDest)
{
int i;
BOOL bcopyall = (pcopymapDest == NULL);
@@ -1451,7 +1451,7 @@
if (pserviceSource-copymap)
memcpy((void *)pserviceDest-copymap,
(void *)pserviceSource-copymap,
-
svn commit: samba r14851 - in branches/SAMBA_4_0/source/include: .
Author: jelmer
Date: 2006-04-01 18:26:30 + (Sat, 01 Apr 2006)
New Revision: 14851
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14851
Log:
Make BOOL, False and True simple aliases to the POSIX-defined
bool, false and true (guaranteed to be defined by lib/replace)
Modified:
branches/SAMBA_4_0/source/include/core.h
Changeset:
Modified: branches/SAMBA_4_0/source/include/core.h
===
--- branches/SAMBA_4_0/source/include/core.h2006-04-01 18:25:07 UTC (rev
14850)
+++ branches/SAMBA_4_0/source/include/core.h2006-04-01 18:26:30 UTC (rev
14851)
@@ -26,10 +26,10 @@
#include libcli/util/nt_status.h
-typedef int BOOL;
+typedef bool BOOL;
-#define False (0)
-#define True (1)
+#define False false
+#define True true
/* used to hold an arbitrary blob of data */
typedef struct datablob {
svn commit: samba r14852 - in branches/SAMBA_4_0/source: . heimdal_build
Author: jelmer Date: 2006-04-01 18:41:07 + (Sat, 01 Apr 2006) New Revision: 14852 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14852 Log: See if all target platforms support multiple .SUFFIXES lines. Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk === --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-01 18:26:30 UTC (rev 14851) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-01 18:41:07 UTC (rev 14852) @@ -428,6 +428,10 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et| include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et| +.SUFFIXES: .hin +.hin.h: + @cp $ $@ + $(patsubst heimdal/lib/des/%.h,heimdal/lib/des/hcrypto/%.h,$(wildcard heimdal/lib/des/*.h)): heimdal/lib/des/hcrypto heimdal/lib/des/hcrypto: Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2006-04-01 18:26:30 UTC (rev 14851) +++ branches/SAMBA_4_0/source/main.mk 2006-04-01 18:41:07 UTC (rev 14852) @@ -308,11 +308,8 @@ # File types ### -.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .hin .idl .hd +.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .idl .hd -.hin.h: - @cp $ $@ - .c.ho: @echo Compiling $ with host compiler @$(HOSTCC) `script/cflags.pl [EMAIL PROTECTED] $(CFLAGS) -c $ -o $@
svn commit: samba r14853 - in trunk/source/smbd: .
Author: vlendec Date: 2006-04-01 19:17:07 + (Sat, 01 Apr 2006) New Revision: 14853 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14853 Log: When going through ipc, trans2 and nttrans I had started from the 3_0 ipc.c. Fix the bug in the 3 new implementations that Jeremy just fixed in 3_0/smbd/ipc.c. Thanks again to G?\195?\188nther Kukkukk ! Volker Modified: trunk/source/smbd/ipc.c trunk/source/smbd/nttrans.c trunk/source/smbd/trans2.c Changeset: Modified: trunk/source/smbd/ipc.c === --- trunk/source/smbd/ipc.c 2006-04-01 18:41:07 UTC (rev 14852) +++ trunk/source/smbd/ipc.c 2006-04-01 19:17:07 UTC (rev 14853) @@ -638,7 +638,7 @@ goto bad_param; if (pdisp state-total_param) goto bad_param; - if ((smb_base(inbuf) + poff + pcnt = inbuf + size) || + if ((smb_base(inbuf) + poff + pcnt inbuf + size) || (smb_base(inbuf) + poff + pcnt smb_base(inbuf))) goto bad_param; if (state-param + pdisp state-param) @@ -655,7 +655,7 @@ goto bad_param; if (ddisp state-total_data) goto bad_param; - if ((smb_base(inbuf) + doff + dcnt = inbuf + size) || + if ((smb_base(inbuf) + doff + dcnt inbuf + size) || (smb_base(inbuf) + doff + dcnt smb_base(inbuf))) goto bad_param; if (state-data + ddisp state-data) Modified: trunk/source/smbd/nttrans.c === --- trunk/source/smbd/nttrans.c 2006-04-01 18:41:07 UTC (rev 14852) +++ trunk/source/smbd/nttrans.c 2006-04-01 19:17:07 UTC (rev 14853) @@ -3029,7 +3029,7 @@ goto bad_param; if (pdisp state-total_param) goto bad_param; - if ((smb_base(inbuf) + poff + pcnt = inbuf + size) || + if ((smb_base(inbuf) + poff + pcnt inbuf + size) || (smb_base(inbuf) + poff + pcnt smb_base(inbuf))) goto bad_param; if (state-param + pdisp state-param) @@ -3046,7 +3046,7 @@ goto bad_param; if (ddisp state-total_data) goto bad_param; - if ((smb_base(inbuf) + doff + dcnt = inbuf + size) || + if ((smb_base(inbuf) + doff + dcnt inbuf + size) || (smb_base(inbuf) + doff + dcnt smb_base(inbuf))) goto bad_param; if (state-data + ddisp state-data) Modified: trunk/source/smbd/trans2.c === --- trunk/source/smbd/trans2.c 2006-04-01 18:41:07 UTC (rev 14852) +++ trunk/source/smbd/trans2.c 2006-04-01 19:17:07 UTC (rev 14853) @@ -5332,7 +5332,7 @@ goto bad_param; if (pdisp state-total_param) goto bad_param; - if ((smb_base(inbuf) + poff + pcnt = inbuf + size) || + if ((smb_base(inbuf) + poff + pcnt inbuf + size) || (smb_base(inbuf) + poff + pcnt smb_base(inbuf))) goto bad_param; if (state-param + pdisp state-param) @@ -5349,7 +5349,7 @@ goto bad_param; if (ddisp state-total_data) goto bad_param; - if ((smb_base(inbuf) + doff + dcnt = inbuf + size) || + if ((smb_base(inbuf) + doff + dcnt inbuf + size) || (smb_base(inbuf) + doff + dcnt smb_base(inbuf))) goto bad_param; if (state-data + ddisp state-data)
Build status as of Sun Apr 2 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-04-01 00:00:09.0 + +++ /home/build/master/cache/broken_results.txt 2006-04-02 00:00:04.0 + @@ -1,17 +1,17 @@ -Build status as of Sat Apr 1 00:00:02 2006 +Build status as of Sun Apr 2 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 9 1 0 -distcc 11 2 0 -lorikeet-heimdal 15 15 0 +ccache 8 1 0 +distcc 10 2 0 +lorikeet-heimdal 12 12 0 ppp 17 0 0 -rsync33 2 0 +rsync31 2 0 samba3 0 0 samba-docs 0 0 0 -samba4 34 27 0 -samba_3_033 8 0 -smb-build22 0 0 +samba4 35 30 1 +samba_3_033 7 0 +smb-build23 0 0 talloc 9 7 0 tdb 29 3 0
svn commit: samba r14854 - in branches/SAMBA_4_0/source/scripting/swig: . torture
Author: tpot
Date: 2006-04-02 01:56:22 + (Sun, 02 Apr 2006)
New Revision: 14854
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14854
Log:
Finish off swig wrapper and torture tests for tdb.
Modified:
branches/SAMBA_4_0/source/scripting/swig/Tdb.py
branches/SAMBA_4_0/source/scripting/swig/torture/torture_tdb.py
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/Tdb.py
===
--- branches/SAMBA_4_0/source/scripting/swig/Tdb.py 2006-04-01 19:17:07 UTC
(rev 14853)
+++ branches/SAMBA_4_0/source/scripting/swig/Tdb.py 2006-04-02 01:56:22 UTC
(rev 14854)
@@ -22,24 +22,86 @@
import tdb, os, UserDict
+# Open flags
+
+DEFAULT= tdb.TDB_DEFAULT
+CLEAR_IF_FIRST = tdb.TDB_CLEAR_IF_FIRST
+INTERNAL = tdb.TDB_INTERNAL
+NOLOCK = tdb.TDB_NOLOCK
+NOMMAP = tdb.TDB_NOMMAP
+
+# Class representing a TDB file
+
class Tdb:
-def __init__(self, name, hash_size = 0, tdb_flags = tdb.TDB_DEFAULT,
+# Create and destroy Tdb objects
+
+def __init__(self, name, hash_size = 0, flags = tdb.TDB_DEFAULT,
open_flags = os.O_RDWR | os.O_CREAT, mode = 0600):
+self.tdb = tdb.open(name, hash_size, flags, open_flags, mode)
-self.tdb = tdb.open(name, hash_size, tdb_flags, open_flags, mode)
-
def __del__(self):
-tdb.close(self.tdb)
+if hasattr(self, 'tdb'):
+tdb.close(self.tdb)
+# Random access to keys, values
+
def __getitem__(self, key):
-pass
+result = tdb.fetch(self.tdb, key)
+if result is None:
+raise KeyError, key
+return result
def __setitem__(self, key, item):
-pass
+tdb.store(self.tdb, key, item)
def __delitem__(self, key):
-pass
+if not tdb.exists(self.tdb, key):
+raise KeyError, key
+tdb.delete(self.tdb, key)
+def has_key(self, key):
+return tdb.exists(self.tdb, key)
+
+# Tdb iterator
+
+class TdbIterator:
+def __init__(self, tdb):
+self.tdb = tdb
+self.key = None
+
+def __iter__(self):
+return self
+
+def next(self):
+if self.key is None:
+self.key = tdb.firstkey(self.tdb)
+if self.key is None:
+raise StopIteration
+return self.key
+else:
+self.key = tdb.nextkey(self.tdb, self.key)
+if self.key is None:
+raise StopIteration
+return self.key
+
+def __iter__(self):
+return Tdb.TdbIterator(self.tdb)
+
+# Implement other dict functions using TdbIterator
+
def keys(self):
-pass
+return [k for k in iter(self)]
+
+def values(self):
+return [self[k] for k in iter(self)]
+
+def items(self):
+return [(k, self[k]) for k in iter(self)]
+
+def __len__(self):
+return len(self.keys())
+
+def clear(self):
+for k in iter(self):
+del(self[k])
Modified: branches/SAMBA_4_0/source/scripting/swig/torture/torture_tdb.py
===
--- branches/SAMBA_4_0/source/scripting/swig/torture/torture_tdb.py
2006-04-01 19:17:07 UTC (rev 14853)
+++ branches/SAMBA_4_0/source/scripting/swig/torture/torture_tdb.py
2006-04-02 01:56:22 UTC (rev 14854)
@@ -1,6 +1,82 @@
#!/usr/bin/python
-import Tdb, os
+import sys, os
+import Tdb
-t = Tdb.Tdb('foo.tdb')
-os.unlink('foo.tdb')
+def fail(msg):
+print 'FAILED:', msg
+sys.exit(1)
+
+tdb_file = '/tmp/torture_tdb.tdb'
+
+# Create temporary tdb file
+
+t = Tdb.Tdb(tdb_file, flags = Tdb.CLEAR_IF_FIRST)
+
+# Check non-existent key throws KeyError exception
+
+try:
+t['__none__']
+except KeyError:
+pass
+else:
+fail('non-existent key did not throw KeyError')
+
+# Check storing key
+
+t['bar'] = '1234'
+if t['bar'] != '1234':
+fail('store key failed')
+
+# Check key exists
+
+if not t.has_key('bar'):
+fail('has_key() failed for existing key')
+
+if t.has_key('__none__'):
+fail('has_key() succeeded for non-existent key')
+
+# Delete key
+
+try:
+del(t['__none__'])
+except KeyError:
+pass
+else:
+fail('delete of non-existent key did not throw KeyError')
+
+del t['bar']
+if t.has_key('bar'):
+fail('delete of existing key did not delete key')
+
+# Clear all keys
+
+t.clear()
+if len(t) != 0:
+fail('clear failed to remove all keys')
+
+# Other dict functions
+
+t['a'] = '1'
+t['ab'] = '12'
+t['abc'] = '123'
+
+if len(t) != 3:
+fail('len method produced wrong value')
+
+keys = t.keys()
+values = t.values()
+items = t.items()
+
+if set(keys) != set(['a', 'ab', 'abc']):
+fail('keys method produced wrong values')
+
+if set(values) != set(['1', '12', '123']):
+fail('values method produced wrong values')
+
+if
svn commit: samba r14855 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0/source/param branches/SAMBA_3_0/source/passdb branches/SAMBA_3_
Author: jerry Date: 2006-04-02 06:25:11 + (Sun, 02 Apr 2006) New Revision: 14855 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14855 Log: Various fixes: * depreacte 'acl group control' after discussion with Jeremy and implement functionality as part of 'dos filemode' * fix winbindd on a non-member server to expand local groups * prevent code previously only used by smbd from blindly turning _NO_WINBINDD back on Modified: branches/SAMBA_3_0/source/VERSION branches/SAMBA_3_0/source/lib/system_smbd.c branches/SAMBA_3_0/source/nsswitch/wb_common.c branches/SAMBA_3_0/source/nsswitch/winbindd.c branches/SAMBA_3_0/source/nsswitch/winbindd_passdb.c branches/SAMBA_3_0/source/nsswitch/winbindd_util.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/passdb/pdb_interface.c branches/SAMBA_3_0/source/smbd/posix_acls.c trunk/source/lib/system_smbd.c trunk/source/nsswitch/wb_common.c trunk/source/nsswitch/winbindd.c trunk/source/nsswitch/winbindd_passdb.c trunk/source/nsswitch/winbindd_util.c trunk/source/param/loadparm.c trunk/source/passdb/pdb_interface.c trunk/source/smbd/posix_acls.c Changeset: Sorry, the patch is too large (587 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14855
