Re: [Samba] Issue with Samba version 3.0.25b on Debian
On Sat, Aug 11, 2007 at 10:24:07PM +0100, Dan Peachey wrote: I have an issue with Samba version 3.0.25b on Debian. I am receiving a number of mails from my server with the following: The Samba 'panic action' script, /usr/share/samba/panic-action, was called for PID 18483 (). We need a backtrace from that. The log file should have it. Also, when running 'smbstatus' I get the following at the bottom of the output: -- tdb(/var/run/samba/locking.tdb): tdb_rec_read bad magic 0xd9fee666 at offset=678200 locked file list truncated That's not desirable, but normal. smbstatus opens the tdbs readonly, which means no locking. When there's heavy activity on a larger file server, these messages are possible. It should not happen in quiet periods. Volker pgpE6wTDeWihv.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Issue with Samba version 3.0.25b on Debian
On Sat, Aug 11, 2007 at 10:24:07PM +0100, Dan Peachey wrote: I have an issue with Samba version 3.0.25b on Debian. I am receiving a number of mails from my server with the following: The Samba 'panic action' script, /usr/share/samba/panic-action, was called for PID 18483 (). We need a backtrace from that. The log file should have it. Thanks for the reply. Here is the backtrace info from the log file: -- [2007/08/08 08:49:54, 1] smbd/service.c:make_connection_snum(1033) ian (192.168.1.35) connect to service shared initially as user ianlang (uid=1005, gid=106) (pid 18483) [2007/08/08 09:00:43, 0] lib/util.c:smb_panic(1632) PANIC (pid 18483): Could not store share mode entry [2007/08/08 09:00:43, 0] lib/util.c:log_stack_trace(1736) BACKTRACE: 11 stack frames: #0 /usr/sbin/smbd(log_stack_trace+0x2d) [0x827c5cd] #1 /usr/sbin/smbd(smb_panic+0x5d) [0x827c6fd] #2 /usr/sbin/smbd [0x8220b28] #3 /usr/sbin/smbd(talloc_free+0x1c1) [0x8261a81] #4 /usr/sbin/smbd(open_directory+0x5e4) [0x80f4be4] #5 /usr/sbin/smbd(reply_ntcreate_and_X+0x10b5) [0x80c1105] #6 /usr/sbin/smbd [0x810ace0] #7 /usr/sbin/smbd(smbd_process+0x836) [0x810c076] #8 /usr/sbin/smbd(main+0xbdd) [0x834ffad] #9 /lib/libc.so.6(__libc_start_main+0xe0) [0xb7b4b030] #10 /usr/sbin/smbd [0x8093f31] [2007/08/08 09:00:43, 0] lib/util.c:smb_panic(1637) smb_panic(): calling panic action [/usr/share/samba/panic-action 18483] [2007/08/08 09:00:43, 0] lib/util.c:smb_panic(1645) smb_panic(): action returned status 0 [2007/08/08 09:00:43, 0] lib/fault.c:dump_core(181) dumping core in /var/log/samba/cores/smbd -- Also, when running 'smbstatus' I get the following at the bottom of the output: -- tdb(/var/run/samba/locking.tdb): tdb_rec_read bad magic 0xd9fee666 at offset=678200 locked file list truncated That's not desirable, but normal. smbstatus opens the tdbs readonly, which means no locking. When there's heavy activity on a larger file server, these messages are possible. It should not happen in quiet periods. I just checked now which is a quiet period and indeed, the messages do not show. One less thing to worry about :-) Regards, Dan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Issue with Samba version 3.0.25b on Debian
On Sun, Aug 12, 2007 at 09:12:58AM +0100, Dan Peachey wrote: Thanks for the reply. Here is the backtrace info from the log file: -- [2007/08/08 08:49:54, 1] smbd/service.c:make_connection_snum(1033) ian (192.168.1.35) connect to service shared initially as user ianlang (uid=1005, gid=106) (pid 18483) [2007/08/08 09:00:43, 0] lib/util.c:smb_panic(1632) PANIC (pid 18483): Could not store share mode entry Is it possible that the file system where you store the locking.tdb is full? Volker pgpdWNBYAfw1T.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Issue with Samba version 3.0.25b on Debian
On Sun, Aug 12, 2007 at 09:12:58AM +0100, Dan Peachey wrote: Thanks for the reply. Here is the backtrace info from the log file: -- [2007/08/08 08:49:54, 1] smbd/service.c:make_connection_snum(1033) ian (192.168.1.35) connect to service shared initially as user ianlang (uid=1005, gid=106) (pid 18483) [2007/08/08 09:00:43, 0] lib/util.c:smb_panic(1632) PANIC (pid 18483): Could not store share mode entry Is it possible that the file system where you store the locking.tdb is full? Volker Hi, It is OK, there is a lot of space left on the disk. Regards, Dan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Issue with Samba version 3.0.25b on Debian
On Sun, Aug 12, 2007 at 10:31:47AM +0100, Dan Peachey wrote: It is OK, there is a lot of space left on the disk. The next most likely reason is that you locking.tdb is indeed corrupt. reiserfs? Does it become better if you shut down smbd, delete it and restart smbd? Voler pgp1zPKVo8eOf.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] AD + winbindd(8): group permissions being ignored ? WTF ?
Hi all, I am successfully authenticating FreeBSD 7.0-CURRENT #1: Wed Jul 25 17:31:15 WST 2007 against AD. Users can log in succesfully with home directories being served via amd(8) and NFS. However, I have discovered a potential show-stopper that will force me to abort this mission :( The problem -~-~-~-~-~- In a nutshell: Simple group permissions set with chown(1) are not being honoured. e.g. #touch testing.txt #ls -l !$ -rw-r--r-- 1 root wheel 0 Aug 12 17:49 testing #chmod 770 !$ #ls -l testing.txt -rwxrwx--- 1 root wheel 0 Aug 12 17:49 testing.txt #chown root:scis stl admins testing.txt #ls -l !$ ls -l testing.txt -rwxrwx--- 1 root scis stl admins 0 Aug 12 17:49 testing.txt #su - my_username my__shellecho this sux /var/tmp/testing.txt testing.txt: Permission denied. And I KNOW 150% I am in the the group scis stl admins. The odd thing is, is that chown(1) allows me to give the file testing.txt group memebership, but users in the actual group are not given these permissions. I'm getting kinda desparate now. Have I missed something concetually ? Any insights into this problem whatsoever will be greatly appreciated. Thanks -aW IMPORTANT: This email remains the property of the Australian Defence Organisation and is subject to the jurisdiction of section 70 of the CRIMES ACT 1914. If you have received this email in error, you are requested to contact the sender and delete the email. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: PDC: Windows xp sp2 reboots when login onto domain
Jose Manuel D. Mendinueta skrev: In the lab I was working we had 10 computers, and the same thing. When the Samba PDC and the computers were installed, all was fine. The computers of the lab were updated regularly, and everything is working fine. The problem is with a new network I am installing in other company. I think that the problem could be related with only newly installed computers, or maybe related with profile creation: I mean, with SP2 msgina.dll, if the profile is not in the server, the client crashes (as no file is created in the Samba server profile folder for the user). Anyway, I am astonished because I think this is an important problem that should happen with XP SP2 installations, and it seems only a few people is suffering it. Maybe there could be some others factors involved, but I used vanilla Xp SP2 windows intallations. Cheers, Mendi Hi Jose It sounds a bit wierd, that your comnputers crashes if the user profile does not exist. Usually missing profiles are created on the client when you logon and is copied to the server when you log off. Have you done anything to the resigtry on your clients? Check http://www.auditmypc.com/process/msgina.asp -- Rune Tønnesen Bedste Hilsner/Best Regards -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Issue with Samba version 3.0.25b on Debian
On Sun, Aug 12, 2007 at 10:31:47AM +0100, Dan Peachey wrote: It is OK, there is a lot of space left on the disk. The next most likely reason is that you locking.tdb is indeed corrupt. reiserfs? Does it become better if you shut down smbd, delete it and restart smbd? Voler I'm using ext3 with RAID1. Here are some more details: -- server01:/home/dan# df -h FilesystemSize Used Avail Use% Mounted on /dev/md0 72G 15G 54G 21% / tmpfs 248M 0 248M 0% /lib/init/rw udev 10M 60K 10M 1% /dev tmpfs 248M 0 248M 0% /dev/shm server01:/home/dan# mdadm --detail /dev/md0 /dev/md0: Version : 00.90.03 Creation Time : Fri Apr 22 15:38:44 2005 Raid Level : raid1 Array Size : 76172096 (72.64 GiB 78.00 GB) Device Size : 76172096 (72.64 GiB 78.00 GB) Raid Devices : 2 Total Devices : 2 Preferred Minor : 0 Persistence : Superblock is persistent Update Time : Sun Aug 12 13:43:09 2007 State : clean Active Devices : 2 Working Devices : 2 Failed Devices : 0 Spare Devices : 0 UUID : 2fae712e:5c464738:f87979ca:777de3c9 Events : 0.6969538 Number Major Minor RaidDevice State 0 820 active sync /dev/sda2 1 8 181 active sync /dev/sdb2 -- I have deleted the locking.tdb like you have said. I will monitor from now and report back. Tomorrow the users will start using the files again. Regards, Dan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] admin access to user home directories
I've user directorys set to: chmod 700 chown username:Domain Users Users can access stuff fine. However, I'd like the samba root user to be able to access these shares as well. How might I go about this? Example permissions drwx-- 2 jdomDomain Users 4096 2007-07-01 09:32 jdom/ [homes] comment = Home Directories valid users = %S read only = no create mask = 0600 directory mask = 0700 browseable = no -- This message has been scanned for viruses and dangerous content by RCRnet, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] admin access to user home directories
Linux Guy wrote: I've user directorys set to: chmod 700 chown username:Domain Users Users can access stuff fine. However, I'd like the samba root user to be able to access these shares as well. How might I go about this? Example permissions drwx-- 2 jdomDomain Users 4096 2007-07-01 09:32 jdom/ [homes] comment = Home Directories valid users = %S,root -- read only = no create mask = 0600 directory mask = 0700 browseable = no The UNIX perms/ownerships can stay as they are. -- Ben Tisdall -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Got Sighup dumpmg debug info
I am Running Centos 4.4 on a Poweredge box 2600 Aug 8th 7.30 am, the server had a problem when all the available disk space had gone, there should of been 180 Gig. Investigating the logs the last activity was at 04.02 in the morning with this: ** Aug 8 04:02:05 localhost nmbd[3799]: [2007/08/08 04:02:05, 0] nmbd/nmbd.crocess(542) Aug 8 04:02:05 localhost nmbd[3799]: Got SIGHUP dumping debug info. Aug 8 04:02:05 localhost nmbd[3799]: [2007/08/08 04:02:05, 0] nmbd/nmbd_workgroupdb.c:dump_workgroups(284) Aug 8 04:02:05 localhost nmbd[3799]: dump_workgroups() Aug 8 04:02:05 localhost nmbd[3799]: dump workgroup on subnet 10.0.0.115: netmask= 255.255.255.0: Aug 8 04:02:05 localhost nmbd[3799]: WORKGROUP(1) current master browser = NETPILOT Aug 8 04:02:05 localhost nmbd[3799]: LINUXSERVER 40019a03 (LinuxServer) Aug 8 04:02:05 localhost nmbd[3799]: NETPILOT 400c9a03 (Samba 2.0.6) Aug 8 08:41:01 localhost gdm(pam_unix)[4568]: session opened for user kingsmead by (uid=0) Aug 8 08:41:02 localhost gconfd (kingsmead-14752): starting (version 2.8.1), pid 14752 user 'kingsmead' Aug 8 08:41:02 localhost gconfd (kingsmead-14752): Resolved address xml:readonly:/etc/gconf/gconf.xml.mandatory to a read-only configuration source at position 0 Aug 8 08:41:02 localhost gconfd (kingsmead-14752): Resolved address xml:readwrite:/home/kingsmead/.gconf to a writable configuration source at position 1 Aug 8 08:41:02 localhost gconfd (kingsmead-14752): Resolved address xml:readonly:/etc/gconf/gconf.xml.defaults to a read-only configuration source at position 2 Aug 8 08:41:09 localhost gconfd (kingsmead-14752): Resolved address xml:readwrite:/home/kingsmead/.gconf to a writable configuration source at position 0 A reboot was successful and the disk space was back to normal, I had also notice before reboot that on the system monitor the /dev/mapper/VolGroup00-logVol00 was reading 98% and system activity was going crazy. Since that reboot all system activity has been normal and seems stable. There was no loss of data. Looking at the logs again there is still the nmbd dump_workgroups () message at 4 am, but is this normal log rotation? or is there a problem with Samba configuration ? Thanks to anyone who can help throw some light on this, I see there has been quite a few question about this ( nmbd dump_workgroups () messages at 4 am) . Thanks in advance for any help -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ppolicy overlay (WAS: Enforcing Password Policies...)
On Thu, 2007-08-09 at 00:56 +0200, Thierry Lacoste wrote: On Wednesday 08 August 2007 20:17, Matt Anderson wrote: Dear Help, I'm currently running Samba with an LDAP passdb backend. I'm trying to figure out how to NOT allow a particular user to change their password (through Windows, or any interface). I've tried modifying the values for sambaPwdCanChange and sambaPwdMustChange for a particular user, but it seems like it only effects making them change their password, instead of whether or not they're ALLOWED to. With OpenLDAP one can use ldap passwd sync = only in smb.conf and let the smbk5pwd overlay synchronize the LM and NT passwords. If you add the ppolicy overlay you have a clean way to prevent password changes for some acounts (through Windows, or any interface). For instance one can use a pwdPolicy with pwdAllowUserChange: FALSE The only problem is that a Windows client reports a successful password change even though the password was not changed because of the above pwdPolicy. Was it not changed? To OpenLDAP, the change from Samba doesn't look like a user change (because we set it using Samba's credentials). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. http://redhat.com signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Freebsd + Samba + Ldap + Acls - No locking file
Hello.. File server freebsd 6.2-STABLE + samba-3.0.25a + ldap + acls Problem: I've a situation where file locking does not seem to be functioning as expected, in that more than one user can open and write to a file without any notifications being displayed about the file already being opened by another user. I have two Windows XP clients accessing the same shared file, user1 has the file open. User2 then opens the same file, receiving no warnings about the file being open by another user. File is modified by user1 and saved and remains open. File then modified by user2 and saved. File closed and opened by user1 who sees only modifications made by user2. user1 (WinXP) open test2.ods smbstatus: Locked files: Pid UidDenyMode Access R/WOplock SharePath Name Time -- 1475810004 DENY_WRITE 0x2019f RDWR EXCLUSIVE+BATCH /work/samba/bazafirm test2.ods Wed Aug 1 17:50:15 1475810004 DENY_NONE 0x11RDONLY NONE /work/samba/bazafirm . Wed Aug 1 17:49:47 user2 (WinXP) open file: smbstatus: Locked files: Pid UidDenyMode Access R/WOplock SharePath Name Time -- 1478710002 DENY_WRITE 0x2019f RDWR EXCLUSIVE+BATCH /work/samba/bazafirm test2.ods Wed Aug 1 17:55:38 1478710002 DENY_NONE 0x11RDONLY NONE /work/samba/bazafirm . Wed Aug 1 17:55:12 But when I use option force user = root tha file lock works OK!!! smb.conf [global] dos charset = cp852 unix charset = iso8859-2 display charset = iso8859-2 workgroup = COSTAM.LOCAL netbios name = DRAGON server string = COSTAM LDAP PDC [on FreeBSD :: Samba server %v] interfaces = 192.168.50.254/24 bind interfaces only = Yes security = USER encrypt passwords = Yes update encrypted = No client schannel = Auto server schannel = Auto allow trusted domains = Yes map to guest = Never null passwords = Yes obey pam restrictions = No password server = * smb passwd file = /usr/local/etc/samba/smbpasswd private dir = /usr/local/etc/samba passdb backend = ldapsam:ldap://127.0.0.1/ algorithmic rid base = 1000 guest account = nobody enable privileges = Yes pam password change = No passwd chat = *new*password* %n\n *new*password* %n\n *changed* passwd chat debug = No passwd chat timeout = 2 check password script = password level = 0 username level = 0 unix password sync = No restrict anonymous = 0 lanman auth = Yes ntlm auth = Yes client NTLMv2 auth = No client lanman auth = Yes client plaintext auth = Yes use kerberos keytab = No log level = 2 syslog = 0 syslog only = No log file = /var/log/samba/log.%m max log size = 10 debug timestamp = Yes debug prefix timestamp = No debug hires timestamp = No debug pid = No debug uid = No enable core files = Yes smb ports = 445 139 large readwrite = Yes max protocol = NT1 min protocol = CORE read bmpx = No read raw = Yes write raw = Yes disable netbios = No reset on zero vc = No acl compatibility = auto defer sharing violations = Yes nt pipe support = Yes nt status support = Yes announce version = 4.9 announce as = NT max mux = 50 max xmit = 16644 name resolve order = wins bcast dns host max ttl = 259200 max wins ttl = 518400 min wins ttl = 21600 time server = Yes unix extensions = Yes use spnego = Yes client signing = auto server signing = No client use spnego = Yes enable asu support = No deadtime = 0 getwd cache = Yes keepalive = 300 lpq cache time = 30 max smbd processes = 0 paranoid server security = Yes max disk size = 0 max open files = 500 open files database hash size = 10007 socket options = SO_KEEPALIVE SO_BROADCAST TCP_NODELAY SO_SNDBUF=16384 SO_RCVBUF=16384 IPTOS_LOWDELAY use mmap = Yes hostname lookups = No name cache timeout = 660 load printers = No printcap cache time = 750 disable spoolss = No show add printer wizard = Yes mangling method = hash2 mangle prefix = 1 max stat cache size = 1024 stat cache = Yes machine password timeout = 604800 add user script = /usr/local/sbin/smbldap-useradd -m %u delete user script = /usr/local/sbin/smbldap-userdel %u add group script = /usr/local/sbin/smbldap-groupadd -p %g delete group script = /usr/local/sbin/smbldap-groupdel %g add user to group script = /usr/local/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/local/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/local/sbin/smbldap-usermod -g %g %u add machine script = /usr/local/sbin/smbldap-useradd -w %u logon script
svn commit: samba r24346 - in branches/SAMBA_3_2/source/smbd: .
Author: vlendec
Date: 2007-08-12 09:16:54 + (Sun, 12 Aug 2007)
New Revision: 24346
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24346
Log:
Push reply_prep_legacy into send_file_readX
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 04:00:15 UTC (rev
24345)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 09:16:54 UTC (rev
24346)
@@ -2733,16 +2733,28 @@
Reply to a read and X - possibly using sendfile.
/
-int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int
length, int len_outbuf,
- files_struct *fsp, SMB_OFF_T startpos, size_t smb_maxcnt)
+static void send_file_readX(connection_struct *conn, struct smb_request *req,
+ files_struct *fsp, SMB_OFF_T startpos,
+ size_t smb_maxcnt)
{
SMB_STRUCT_STAT sbuf;
- int outsize = 0;
ssize_t nread = -1;
- char *data = smb_buf(outbuf);
+ char *data;
+ char *inbuf, *outbuf;
+ int length, len_outbuf;
+ if (!reply_prep_legacy(req, inbuf, outbuf, length, len_outbuf)) {
+ reply_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ set_message(inbuf, outbuf, 12, 0, True);
+
+ data = smb_buf(outbuf);
+
if(SMB_VFS_FSTAT(fsp,fsp-fh-fd, sbuf) == -1) {
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ reply_unixerror(req, ERRDOS, ERRnoaccess);
+ return;
}
if (startpos sbuf.st_size) {
@@ -2803,8 +2815,9 @@
}
DEBUG( 3, ( send_file_readX: fake_sendfile
fnum=%d max=%d nread=%d\n,
fsp-fnum, (int)smb_maxcnt, (int)nread
) );
- /* Returning -1 here means successful sendfile.
*/
- return -1;
+ /* No outbuf here means successful sendfile. */
+ TALLOC_FREE(req-outbuf);
+ return;
}
DEBUG(0,(send_file_readX: sendfile failed for file %s
(%s). Terminating\n,
@@ -2814,8 +2827,9 @@
DEBUG( 3, ( send_file_readX: sendfile fnum=%d max=%d
nread=%d\n,
fsp-fnum, (int)smb_maxcnt, (int)nread ) );
- /* Returning -1 here means successful sendfile. */
- return -1;
+ /* No outbuf here means successful sendfile. */
+ TALLOC_FREE(req-outbuf);
+ return;
}
#endif
@@ -2836,21 +2850,24 @@
fsp-fsp_name, strerror(errno) ));
exit_server_cleanly(send_file_readX: fake_sendfile
failed);
}
- return -1;
+ TALLOC_FREE(req-outbuf);
+ return;
} else {
nread = read_file(fsp,data,startpos,smb_maxcnt);
if (nread 0) {
- return(UNIXERROR(ERRDOS,ERRnoaccess));
+ reply_unixerror(req, ERRDOS, ERRnoaccess);
+ return;
}
- outsize = setup_readX_header(inbuf, outbuf,nread);
+ setup_readX_header(inbuf, outbuf,nread);
DEBUG( 3, ( send_file_readX fnum=%d max=%d nread=%d\n,
fsp-fnum, (int)smb_maxcnt, (int)nread ) );
- /* Returning the number of bytes we want to send back -
including header. */
- return outsize;
+ chain_reply_new(req);
+
+ return;
}
}
@@ -2862,14 +2879,11 @@
{
files_struct *fsp;
SMB_OFF_T startpos;
- ssize_t nread = -1;
size_t smb_maxcnt;
BOOL big_readX = False;
#if 0
size_t smb_mincnt = SVAL(req-inbuf,smb_vwv6);
#endif
- char *inbuf, *outbuf;
- int length, bufsize;
START_PROFILE(SMBreadX);
@@ -2967,29 +2981,8 @@
return;
}
- if (!reply_prep_legacy(req, inbuf, outbuf, length, bufsize)) {
- reply_nterror(req, NT_STATUS_NO_MEMORY);
- END_PROFILE(SMBreadX);
- return;
- }
+ send_file_readX(conn, req, fsp, startpos, smb_maxcnt);
- set_message(inbuf,outbuf,12,0,True);
-
- nread = send_file_readX(conn, inbuf, outbuf, length, bufsize, fsp,
- startpos, smb_maxcnt);
- /* Only call chain_reply if not an error. */
- if (nread != -1 SVAL(outbuf,smb_rcls) == 0) {
- nread = chain_reply(inbuf,outbuf,length,bufsize);
- }
-
- if (nread == -1) {
-
svn commit: samba r24347 - in branches/SAMBA_3_2/source/smbd: .
Author: vlendec
Date: 2007-08-12 11:22:26 + (Sun, 12 Aug 2007)
New Revision: 24347
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24347
Log:
fake_sendfile does not need Inbuf/Outbuf
In the future, we might put the new Linux splice(2) syscall here. This
should also work for reply_write, but getting that in is a bit trickier.
We need to decide very early before fetching the whole buffer that we
have a write call.
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 09:16:54 UTC (rev
24346)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 11:22:26 UTC (rev
24347)
@@ -2333,10 +2333,23 @@
Fake (read/write) sendfile. Returns -1 on read or write fail.
/
-static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T startpos, size_t
nread, char *buf, size_t bufsize)
+static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T startpos,
+size_t nread)
{
+ size_t bufsize;
size_t tosend = nread;
+ char *buf;
+ if (nread == 0) {
+ return 0;
+ }
+
+ bufsize = MIN(nread, 65536);
+
+ if (!(buf = SMB_MALLOC_ARRAY(char, bufsize))) {
+ return -1;
+ }
+
while (tosend 0) {
ssize_t ret;
size_t cur_read;
@@ -2348,6 +2361,7 @@
}
ret = read_file(fsp,buf,startpos,cur_read);
if (ret == -1) {
+ SAFE_FREE(buf);
return -1;
}
@@ -2357,12 +2371,14 @@
}
if (write_data(smbd_server_fd(),buf,cur_read) != cur_read) {
+ SAFE_FREE(buf);
return -1;
}
tosend -= cur_read;
startpos += cur_read;
}
+ SAFE_FREE(buf);
return (ssize_t)nread;
}
@@ -2408,7 +2424,7 @@
set_use_sendfile(SNUM(conn), False);
DEBUG(0,(send_file_readbraw: sendfile not
available. Faking..\n));
- if (fake_sendfile(fsp, startpos, nread, outbuf
+ 4, out_buffsize - 4) == -1) {
+ if (fake_sendfile(fsp, startpos, nread) == -1) {
DEBUG(0,(send_file_readbraw:
fake_sendfile failed for file %s (%s).\n,
fsp-fsp_name, strerror(errno)
));
exit_server_cleanly(send_file_readbraw
fake_sendfile failed);
@@ -2806,9 +2822,9 @@
/* Ensure we don't do this again. */
set_use_sendfile(SNUM(conn), False);
DEBUG(0,(send_file_readX: sendfile not
available. Faking..\n));
-
- if ((nread = fake_sendfile(fsp, startpos,
smb_maxcnt, data,
- len_outbuf -
(data-outbuf))) == -1) {
+ nread = fake_sendfile(fsp, startpos,
+ smb_maxcnt);
+ if (nread == -1) {
DEBUG(0,(send_file_readX:
fake_sendfile failed for file %s (%s).\n,
fsp-fsp_name, strerror(errno)
));
exit_server_cleanly(send_file_readX:
fake_sendfile failed);
@@ -2844,8 +2860,8 @@
fsp-fsp_name, strerror(errno) ));
exit_server_cleanly(send_file_readX sendfile failed);
}
- if ((nread = fake_sendfile(fsp, startpos, smb_maxcnt, data,
- len_outbuf - (data-outbuf))) == -1) {
+ nread = fake_sendfile(fsp, startpos, smb_maxcnt);
+ if (nread == -1) {
DEBUG(0,(send_file_readX: fake_sendfile failed for
file %s (%s).\n,
fsp-fsp_name, strerror(errno) ));
exit_server_cleanly(send_file_readX: fake_sendfile
failed);
svn commit: samba r24348 - in branches/SAMBA_3_2/source/smbd: .
Author: vlendec
Date: 2007-08-12 11:40:27 + (Sun, 12 Aug 2007)
New Revision: 24348
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24348
Log:
Do not use inbuf/outbuf in the sendfile path of read_and_X
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 11:22:26 UTC (rev
24347)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 11:40:27 UTC (rev
24348)
@@ -2731,15 +2731,17 @@
static int setup_readX_header(char *inbuf, char *outbuf, size_t smb_maxcnt)
{
int outsize;
- char *data = smb_buf(outbuf);
+ char *data;
+ outsize = set_message(inbuf, outbuf,12,smb_maxcnt,False);
+ data = smb_buf(outbuf);
+
SSVAL(outbuf,smb_vwv2,0x); /* Remaining - must be -1. */
SSVAL(outbuf,smb_vwv5,smb_maxcnt);
SSVAL(outbuf,smb_vwv6,smb_offset(data,outbuf));
SSVAL(outbuf,smb_vwv7,(smb_maxcnt 16));
SSVAL(smb_buf(outbuf),-2,smb_maxcnt);
SCVAL(outbuf,smb_vwv0,0xFF);
- outsize = set_message(inbuf, outbuf,12,smb_maxcnt,False);
/* Reset the outgoing length, set_message truncates at 0x1. */
_smb_setlen_large(outbuf,(smb_size + 12*2 + smb_maxcnt - 4));
return outsize;
@@ -2759,15 +2761,6 @@
char *inbuf, *outbuf;
int length, len_outbuf;
- if (!reply_prep_legacy(req, inbuf, outbuf, length, len_outbuf)) {
- reply_nterror(req, NT_STATUS_NO_MEMORY);
- return;
- }
-
- set_message(inbuf, outbuf, 12, 0, True);
-
- data = smb_buf(outbuf);
-
if(SMB_VFS_FSTAT(fsp,fsp-fh-fd, sbuf) == -1) {
reply_unixerror(req, ERRDOS, ERRnoaccess);
return;
@@ -2790,8 +2783,9 @@
* on a train in Germany :-). JRA.
*/
- if ((chain_size == 0) (CVAL(inbuf,smb_vwv0) == 0xFF)
+ if ((chain_size == 0) (CVAL(req-inbuf,smb_vwv0) == 0xFF)
lp_use_sendfile(SNUM(conn)) (fsp-wcp == NULL) ) {
+ char headerbuf[smb_size + 12 * 2];
DATA_BLOB header;
/*
@@ -2800,12 +2794,11 @@
* correct amount of data).
*/
- setup_readX_header(inbuf,outbuf,smb_maxcnt);
- set_message(inbuf,outbuf,12,smb_maxcnt,False);
- header.data = (uint8 *)outbuf;
- header.length = data - outbuf;
- header.free = NULL;
+ header = data_blob_const(headerbuf, sizeof(headerbuf));
+ construct_reply_common((char *)req-inbuf, headerbuf);
+ setup_readX_header((char *)req-inbuf, headerbuf, smb_maxcnt);
+
if ((nread = SMB_VFS_SENDFILE( smbd_server_fd(), fsp,
fsp-fh-fd, header, startpos, smb_maxcnt)) == -1) {
/* Returning ENOSYS means no data at all was sent. Do
this as a normal read. */
if (errno == ENOSYS) {
@@ -2852,6 +2845,15 @@
normal_read:
+ if (!reply_prep_legacy(req, inbuf, outbuf, length, len_outbuf)) {
+ reply_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+
+ set_message(inbuf, outbuf, 12, 0, True);
+
+ data = smb_buf(outbuf);
+
if ((smb_maxcnt 0xFF) 0x1) {
int sendlen = setup_readX_header(inbuf,outbuf,smb_maxcnt) -
smb_maxcnt;
/* Send out the header. */
svn commit: samba r24349 - in branches/SAMBA_3_2/source/smbd: .
Author: vlendec
Date: 2007-08-12 12:15:32 + (Sun, 12 Aug 2007)
New Revision: 24349
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24349
Log:
For large readx we need more than 64k of outbuf.
Modified:
branches/SAMBA_3_2/source/smbd/process.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/process.c
===
--- branches/SAMBA_3_2/source/smbd/process.c2007-08-12 11:40:27 UTC (rev
24348)
+++ branches/SAMBA_3_2/source/smbd/process.c2007-08-12 12:15:32 UTC (rev
24349)
@@ -953,8 +953,19 @@
allocate and initialize a reply packet
/
-void reply_outbuf(struct smb_request *req, uint8 num_words, uint16 num_bytes)
+void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
{
+ /*
+ * Protect against integer wrap
+ */
+ if ((num_bytes 0xff)
+ || ((num_bytes + smb_size + num_words*2) 0xff)) {
+ char *msg;
+ asprintf(msg, num_bytes too large: %u,
+(unsigned)num_bytes);
+ smb_panic(msg);
+ }
+
if (!(req-outbuf = TALLOC_ARRAY(
req, uint8,
smb_size + num_words*2 + num_bytes))) {
svn commit: samba r24350 - in branches/SAMBA_4_0: . source/lib/replace
Author: jelmer Date: 2007-08-12 12:21:34 + (Sun, 12 Aug 2007) New Revision: 24350 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24350 Log: Remove offsetof() replacement to see if there are actually any hosts that don't have it. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/replace/README branches/SAMBA_4_0/source/lib/replace/replace.h Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/lib/replace/README === --- branches/SAMBA_4_0/source/lib/replace/README2007-08-12 12:15:32 UTC (rev 24349) +++ branches/SAMBA_4_0/source/lib/replace/README2007-08-12 12:21:34 UTC (rev 24350) @@ -92,7 +92,6 @@ ZERO_ARRAY ARRAY_SIZE PTR_DIFF -offsetof Headers: stdint.h Modified: branches/SAMBA_4_0/source/lib/replace/replace.h === --- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-08-12 12:15:32 UTC (rev 24349) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-08-12 12:21:34 UTC (rev 24350) @@ -52,10 +52,6 @@ #define QSORT_CAST (int (*)(const void *, const void *)) #endif -#ifndef offsetof -#define offsetof(t,f) ((unsigned int)((t *)0)-f) -#endif - #ifdef HAVE_STDINT_H #include stdint.h /* force off HAVE_INTTYPES_H so that roken doesn't try to include both,
svn commit: samba r24351 - in branches/SAMBA_3_2/source/smbd: .
Author: vlendec
Date: 2007-08-12 12:57:56 + (Sun, 12 Aug 2007)
New Revision: 24351
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24351
Log:
Remove reply_prep_legacy from reply_read_and_X
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 12:21:34 UTC (rev
24350)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-08-12 12:57:56 UTC (rev
24351)
@@ -2728,12 +2728,14 @@
Setup readX header.
/
-static int setup_readX_header(char *inbuf, char *outbuf, size_t smb_maxcnt)
+static int setup_readX_header(const uint8 *inbuf, uint8 *outbuf,
+ size_t smb_maxcnt)
{
int outsize;
char *data;
- outsize = set_message(inbuf, outbuf,12,smb_maxcnt,False);
+ outsize = set_message((char *)inbuf, (char *)outbuf,12,smb_maxcnt,
+ False);
data = smb_buf(outbuf);
SSVAL(outbuf,smb_vwv2,0x); /* Remaining - must be -1. */
@@ -2757,9 +2759,6 @@
{
SMB_STRUCT_STAT sbuf;
ssize_t nread = -1;
- char *data;
- char *inbuf, *outbuf;
- int length, len_outbuf;
if(SMB_VFS_FSTAT(fsp,fsp-fh-fd, sbuf) == -1) {
reply_unixerror(req, ERRDOS, ERRnoaccess);
@@ -2785,7 +2784,7 @@
if ((chain_size == 0) (CVAL(req-inbuf,smb_vwv0) == 0xFF)
lp_use_sendfile(SNUM(conn)) (fsp-wcp == NULL) ) {
- char headerbuf[smb_size + 12 * 2];
+ uint8 headerbuf[smb_size + 12 * 2];
DATA_BLOB header;
/*
@@ -2796,8 +2795,8 @@
header = data_blob_const(headerbuf, sizeof(headerbuf));
- construct_reply_common((char *)req-inbuf, headerbuf);
- setup_readX_header((char *)req-inbuf, headerbuf, smb_maxcnt);
+ construct_reply_common((char *)req-inbuf, (char *)headerbuf);
+ setup_readX_header(req-inbuf, headerbuf, smb_maxcnt);
if ((nread = SMB_VFS_SENDFILE( smbd_server_fd(), fsp,
fsp-fh-fd, header, startpos, smb_maxcnt)) == -1) {
/* Returning ENOSYS means no data at all was sent. Do
this as a normal read. */
@@ -2845,19 +2844,15 @@
normal_read:
- if (!reply_prep_legacy(req, inbuf, outbuf, length, len_outbuf)) {
- reply_nterror(req, NT_STATUS_NO_MEMORY);
- return;
- }
+ if ((smb_maxcnt 0xFF) 0x1) {
+ uint8 headerbuf[smb_size + 2*12];
- set_message(inbuf, outbuf, 12, 0, True);
+ construct_reply_common((char *)req-inbuf, (char *)headerbuf);
+ setup_readX_header(req-inbuf, headerbuf, smb_maxcnt);
- data = smb_buf(outbuf);
-
- if ((smb_maxcnt 0xFF) 0x1) {
- int sendlen = setup_readX_header(inbuf,outbuf,smb_maxcnt) -
smb_maxcnt;
/* Send out the header. */
- if (write_data(smbd_server_fd(),outbuf,sendlen) != sendlen) {
+ if (write_data(smbd_server_fd(), (char *)headerbuf,
+ sizeof(headerbuf)) != sizeof(headerbuf)) {
DEBUG(0,(send_file_readX: write_data failed for file
%s (%s). Terminating\n,
fsp-fsp_name, strerror(errno) ));
exit_server_cleanly(send_file_readX sendfile failed);
@@ -2871,14 +2866,16 @@
TALLOC_FREE(req-outbuf);
return;
} else {
- nread = read_file(fsp,data,startpos,smb_maxcnt);
+ reply_outbuf(req, 12, smb_maxcnt);
+ nread = read_file(fsp, smb_buf(req-outbuf), startpos,
+ smb_maxcnt);
if (nread 0) {
reply_unixerror(req, ERRDOS, ERRnoaccess);
return;
}
- setup_readX_header(inbuf, outbuf,nread);
+ setup_readX_header(req-inbuf, req-outbuf, nread);
DEBUG( 3, ( send_file_readX fnum=%d max=%d nread=%d\n,
fsp-fnum, (int)smb_maxcnt, (int)nread ) );
svn commit: samba r24352 - in branches/SAMBA_3_2_0/source: .
Author: vlendec Date: 2007-08-12 16:58:59 + (Sun, 12 Aug 2007) New Revision: 24352 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24352 Log: Fix the build of vfs_fileid Thanks to Kai Blin [EMAIL PROTECTED] for reporting this Modified: branches/SAMBA_3_2_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_2_0/source/Makefile.in === --- branches/SAMBA_3_2_0/source/Makefile.in 2007-08-12 12:57:56 UTC (rev 24351) +++ branches/SAMBA_3_2_0/source/Makefile.in 2007-08-12 16:58:59 UTC (rev 24352) @@ -1677,7 +1677,8 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFS_FILEID_OBJ) @echo Building plugin $@ - @$(SHLD_MODULE) $(VFS_FILEID_OBJ) + @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_FILEID_OBJ) \ + @[EMAIL PROTECTED] [EMAIL PROTECTED] # ## IdMap NSS plugins
svn commit: samba r24353 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
Author: kai
Date: 2007-08-12 17:36:42 + (Sun, 12 Aug 2007)
New Revision: 24353
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24353
Log:
Add a getpwuid lookup to wbinfo.
Merged from my Samba4 GSoC branch.
Volker, can you check if that's done the way you thought?
Modified:
branches/SAMBA_3_2/source/nsswitch/wbinfo.c
branches/SAMBA_3_2_0/source/nsswitch/wbinfo.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/wbinfo.c
===
--- branches/SAMBA_3_2/source/nsswitch/wbinfo.c 2007-08-12 16:58:59 UTC (rev
24352)
+++ branches/SAMBA_3_2/source/nsswitch/wbinfo.c 2007-08-12 17:36:42 UTC (rev
24353)
@@ -150,6 +150,35 @@
return True;
}
+/* pull pwent info for a given uid */
+static BOOL wbinfo_get_uidinfo(int uid)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ NSS_STATUS result;
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ request.data.uid = uid;
+
+ result = winbindd_request_response(WINBINDD_GETPWUID, request,
response);
+
+ if (result != NSS_STATUS_SUCCESS)
+ return False;
+
+ d_printf( %s:%s:%d:%d:%s:%s:%s\n,
+ response.data.pw.pw_name,
+ response.data.pw.pw_passwd,
+ response.data.pw.pw_uid,
+ response.data.pw.pw_gid,
+ response.data.pw.pw_gecos,
+ response.data.pw.pw_dir,
+ response.data.pw.pw_shell );
+
+ return True;
+}
+
/* pull grent for a given group */
static BOOL wbinfo_get_groupinfo(char *group)
{
@@ -1196,6 +1225,7 @@
OPT_SEPARATOR,
OPT_LIST_ALL_DOMAINS,
OPT_LIST_OWN_DOMAIN,
+ OPT_UID_INFO,
OPT_GROUP_INFO,
};
@@ -1237,6 +1267,7 @@
{ sequence, 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, Show sequence
numbers of all domains },
{ domain-info, 'D', POPT_ARG_STRING, string_arg, 'D', Show
most of the info we have about the domain },
{ user-info, 'i', POPT_ARG_STRING, string_arg, 'i', Get
user info, USER },
+ { uid-info, 0, POPT_ARG_INT, int_arg, OPT_UID_INFO, Get
user info from uid, UID },
{ group-info, 0, POPT_ARG_STRING, string_arg,
OPT_GROUP_INFO, Get group info, GROUP },
{ user-groups, 'r', POPT_ARG_STRING, string_arg, 'r', Get
user groups, USER },
{ user-domgroups, 0, POPT_ARG_STRING, string_arg,
@@ -1410,6 +1441,13 @@
goto done;
}
break;
+ case OPT_UID_INFO:
+ if ( !wbinfo_get_uidinfo(int_arg)) {
+ d_fprintf(stderr, Could not get info for uid
+ %d\n, int_arg);
+ goto done;
+ }
+ break;
case OPT_GROUP_INFO:
if ( !wbinfo_get_groupinfo(string_arg)) {
d_fprintf(stderr, Could not get info for
Modified: branches/SAMBA_3_2_0/source/nsswitch/wbinfo.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/wbinfo.c 2007-08-12 16:58:59 UTC
(rev 24352)
+++ branches/SAMBA_3_2_0/source/nsswitch/wbinfo.c 2007-08-12 17:36:42 UTC
(rev 24353)
@@ -150,6 +150,35 @@
return True;
}
+/* pull pwent info for a given uid */
+static BOOL wbinfo_get_uidinfo(int uid)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ NSS_STATUS result;
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ request.data.uid = uid;
+
+ result = winbindd_request_response(WINBINDD_GETPWUID, request,
response);
+
+ if (result != NSS_STATUS_SUCCESS)
+ return False;
+
+ d_printf( %s:%s:%d:%d:%s:%s:%s\n,
+ response.data.pw.pw_name,
+ response.data.pw.pw_passwd,
+ response.data.pw.pw_uid,
+ response.data.pw.pw_gid,
+ response.data.pw.pw_gecos,
+ response.data.pw.pw_dir,
+ response.data.pw.pw_shell );
+
+ return True;
+}
+
/* pull grent for a given group */
static BOOL wbinfo_get_groupinfo(char *group)
{
@@ -1196,6 +1225,7 @@
OPT_SEPARATOR,
OPT_LIST_ALL_DOMAINS,
OPT_LIST_OWN_DOMAIN,
+ OPT_UID_INFO,
OPT_GROUP_INFO,
};
@@ -1237,6 +1267,7 @@
{ sequence, 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, Show sequence
numbers of all domains },
{ domain-info, 'D', POPT_ARG_STRING, string_arg, 'D', Show
most of the info we have about the domain },
{ user-info, 'i', POPT_ARG_STRING, string_arg, 'i', Get
user info, USER },
+ { uid-info, 0, POPT_ARG_INT, int_arg, OPT_UID_INFO, Get
user
svn commit: samba-docs r1144 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2007-08-12 18:47:12 + (Sun, 12 Aug 2007) New Revision: 1144 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1144 Log: Fix typo notified by Patrick Goetz Modified: trunk/Samba3-HOWTO/TOSHARG-PDC.xml Changeset: Modified: trunk/Samba3-HOWTO/TOSHARG-PDC.xml === --- trunk/Samba3-HOWTO/TOSHARG-PDC.xml 2007-08-11 17:49:47 UTC (rev 1143) +++ trunk/Samba3-HOWTO/TOSHARG-PDC.xml 2007-08-12 18:47:12 UTC (rev 1144) @@ -425,7 +425,7 @@ indextermprimaryidentity information/primary/indexterm Primary domain control, if it is to be scalable to meet the needs of large sites, must therefore be capable of using LDAP. The rapid adoption of OpenLDAP, and Samba configurations that use it, is ample proof that the era -of the directoy has started. Samba-3 does not demand the use of LDAP, but the demand for a mechanism by which +of the directory has started. Samba-3 does not demand the use of LDAP, but the demand for a mechanism by which user and group identity information can be distributed makes it an an unavoidable option. /para
svn commit: samba r24354 - in branches/SAMBA_3_2/source/lib/replace: .
Author: vlendec Date: 2007-08-12 21:23:06 + (Sun, 12 Aug 2007) New Revision: 24354 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24354 Log: Remove offsetof macro Samba4 seems not to suffer from it Modified: branches/SAMBA_3_2/source/lib/replace/replace.h Changeset: Modified: branches/SAMBA_3_2/source/lib/replace/replace.h === --- branches/SAMBA_3_2/source/lib/replace/replace.h 2007-08-12 17:36:42 UTC (rev 24353) +++ branches/SAMBA_3_2/source/lib/replace/replace.h 2007-08-12 21:23:06 UTC (rev 24354) @@ -52,10 +52,6 @@ #define QSORT_CAST (int (*)(const void *, const void *)) #endif -#ifndef offsetof -#define offsetof(t,f) ((unsigned int)((t *)0)-f) -#endif - #ifdef HAVE_STDINT_H #include stdint.h /* force off HAVE_INTTYPES_H so that roken doesn't try to include both,
svn commit: samba-docs r1145 - in trunk/manpages-3: .
Author: kai Date: 2007-08-12 22:41:24 + (Sun, 12 Aug 2007) New Revision: 1145 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1145 Log: Add --uid-info option to manpage. I wanted to get this done before I forgot about it, but I don't have the required packages to build the manpage installed. Could someone check if the changes were valid, please? Modified: trunk/manpages-3/wbinfo.1.xml Changeset: Modified: trunk/manpages-3/wbinfo.1.xml === --- trunk/manpages-3/wbinfo.1.xml 2007-08-12 18:47:12 UTC (rev 1144) +++ trunk/manpages-3/wbinfo.1.xml 2007-08-12 22:41:24 UTC (rev 1145) @@ -43,6 +43,7 @@ arg choice=opt-S sid/arg arg choice=opt-t/arg arg choice=opt-u/arg + arg choice=opt--uid-info/arg arg choice=opt--user-domgroups sid/arg arg choice=opt--user-sids sid/arg arg choice=opt-U uid/arg @@ -281,8 +282,14 @@ refentrytitlewinbindd/refentrytitlemanvolnum8/manvolnum/citerefentry ./para/listitem /varlistentry - + varlistentry + term--uid-info/term + listitemparaGet user info for the user conencted to + uid./para/listitem + /varlistentry + + varlistentry term--user-domgroups SID/term listitemparaGet user domain groups. /para/listitem
svn commit: samba-docs r1146 - in trunk/manpages-3: .
Author: kai Date: 2007-08-12 22:57:04 + (Sun, 12 Aug 2007) New Revision: 1146 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1146 Log: --uid-info takes a uid as parameter I knew I was going to mess up. I hope that one is better. Modified: trunk/manpages-3/wbinfo.1.xml Changeset: Modified: trunk/manpages-3/wbinfo.1.xml === --- trunk/manpages-3/wbinfo.1.xml 2007-08-12 22:41:24 UTC (rev 1145) +++ trunk/manpages-3/wbinfo.1.xml 2007-08-12 22:57:04 UTC (rev 1146) @@ -43,7 +43,7 @@ arg choice=opt-S sid/arg arg choice=opt-t/arg arg choice=opt-u/arg - arg choice=opt--uid-info/arg + arg choice=opt--uid-info uid/arg arg choice=opt--user-domgroups sid/arg arg choice=opt--user-sids sid/arg arg choice=opt-U uid/arg @@ -284,9 +284,9 @@ /varlistentry varlistentry - term--uid-info/term + term--uid-info UID/term listitemparaGet user info for the user conencted to - uid./para/listitem + user id UID./para/listitem /varlistentry varlistentry
Build status as of Mon Aug 13 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-08-12 00:00:35.0 + +++ /home/build/master/cache/broken_results.txt 2007-08-13 00:01:09.0 + @@ -1,10 +1,10 @@ -Build status as of Sun Aug 12 00:00:01 2007 +Build status as of Mon Aug 13 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 28 7 0 +ccache 29 7 0 ctdb 0 0 0 distcc 2 0 0 ldb 29 4 0 @@ -16,9 +16,9 @@ rsync30 10 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 27 16 1 +samba4 27 17 2 samba_3_231 18 0 smb-build27 27 0 -talloc 29 1 0 -tdb 29 3 0 +talloc 30 1 0 +tdb 29 4 0
