Re: [Samba] Kaspersky Anti-virus unable to join Domain
On Tuesday 12 February 2008 22:30:25 Dennis McLeod wrote: Just a heads up. I recently built a new (XPSP2) image with the Kaspersky 6.0.3.837 on it. I had issues joining the domain with the AV running. Had to disable. (A domain controller for domain ABC could not be contacted.) I didn't have AV on my previous image, so I don't know if version 5 did the same. I don't recall seeing this on the list, so I thought I would throw it out Dennis Have you contacted Kaspersky support team? In my experience they will help if they can. Anne 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] problem with init_iconv on Debian 4.0 Amd64
Hi, I' ve found a lot of issues of the same probllem on the web , but no solution. So if someone can help me? I have a Debian Server with linux-image-2.6.18-5-amd64 and Samba 3.0.24-6et in my smb.conf I put these lines: [global] unix charset = UTF8 display charset = IS0-8859-15 ... But when I run testparm I get the error: Load smb config files from /etc/samba/smb.conf init_iconv: Conversion from UTF-16LE to IS0-8859-15 not supported init_iconv: Attempting to replace with conversion from UTF-16LE to ASCII init_iconv: Conversion from UTF8 to IS0-8859-15 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII init_iconv: Conversion from IS0-8859-15 to UTF-16LE not supported init_iconv: Attempting to replace with conversion from ASCII to UTF-16LE init_iconv: Conversion from IS0-8859-15 to UTF8 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII init_iconv: Conversion from IS0-8859-15 to CP850 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII init_iconv: Conversion from IS0-8859-15 to UTF8 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII init_iconv: Conversion from CP850 to IS0-8859-15 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII init_iconv: Conversion from UTF8 to IS0-8859-15 not supported init_iconv: Attempting to replace with conversion from ASCII to ASCII ... On another Debian test server, with linux-image-2.6.18-6-686 and the same Samba environnement It works well !! Is there a bug on the 64 bits linux version and Samba ? Someone can help me? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multiple homedir entries in smb.conf ?
ok, UnionFS is one solution - but it takes several days to configure. Is there no change to add more than one homedir template to the smb.conf (just like using variables) ? What about mounting with the bind option all the /home/$SERVER/home/$USERNAME dirs in /home/$USERNAME Hi don't know about bind-option. What is meant with bind-option ? Is it an option for the smbfstab ? -- Regards, Jens Strohschnitter - *!!!LINUX LINUX LINUX LINUX LINUX!!!* * http://www.jens-strohschnitter.de * - Set the controls for the heart of the sun - __ Raiffeisen Waren-Zentrale Rhein-Main eG 50668 Koeln, Altenberger Str. 1a Tel: 0221/1638-0 Fax: 0221/1638-254 Sitz: Koeln Amtsgericht Koeln, GnR 728 Geschaeftsfuehrender Vorstand: Hans-Josef Hilgers (Sprecher) Markus Stuettgen Dr. Karl-Heinrich Suemmermann Vorstand: Friedhelm Decker (Vorsitzender) Ingo Steitz Vorsitzender des Aufsichtsrates: Peter Bleser (MdB) St.Nr.: 215/5938/0152 Bankverbindung: WGZ Bank AG, Duesseldorf (BLZ 300 600 10) Konto-Nr.: 300 011 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba and the InterWeb
Scott Lovenberg uttered: Alex Hooper wrote: Hi, We have an office-based Windows-locked publishing system whose only delivery mechanism is to write to a local filesystem, and a requirement for its output to be available to a collocated production environment comprising Solaris and Linux boxes. The 'obvious' solution was to run a Samba server on one of the collocated Linux boxes and mount the share it provides on the relevant Windows machines in the office. And this is what I have done. This works, but encounters the problem I am about to describe. SCENARIO ONE: Connecting to the server/share in Explorer (Windows XP) by typing the path (\\dns.host.name\share) into the address bar is accomplished without problem, as is receiving a directory listing. But uploading a file to the remote share (by drag and dropping) causes Explorer to freeze for anything between 10 and 30 seconds after which the file transfers at good speed. SCENARIO TWO: Map the remote share, using same connection details. Now copy is often fine, but sometimes will just fail with a Cannot copy filename: The specified network name is no longer available. and leave a zero-length file at the remote end. Not infrequently, smbd processes are being left in an 'uninterruptible sleep' state. If I mount the remote share via smbmount onto a Linux server in the office, I don't encounter any of these problems. Packet-sniffing on scenario one shows that the pause is happening before any set-up for the file transfer: it looks like the client disconnects, then there's a pause, then it reconnects. I'm using Samba version 3.0.25b-1.el4_6.4 on RHEL ES release 4. Clients are Windows XP Pro. Our office has a fairly large and complex LAN which is managed by a separate department. Access to the Internet is, not surprisingly, via a NATting gateway. Appropriate ports have been opened in the firewalls, though all communication is in Direct-hosted mode (ie, I only see traffic on port 445/tcp). smb.conf looks like this: [global] workgroup = WG123 netbios name = n2323 # hostname of server server string = FOO-BAR-Samba #wins proxy = yes #wins server = xxx.xx.xx.x security = user passdb backend = tdbsam load printers = no # idle time (mins) before client is disconnected dead time = 15 keepalive = 10 socket options = IPTOS_THROUGHPUT SO_SNDBUF=8576 inherit permissions = yes [test-xml] path = /stuff/test-xml writeable = Yes public = no Could anyone suggest what might be going on here? Thanks, Alex. On scenario1, is it (Windows client) trying to connect to port 445 on the server, being dropped instead of rejected, timing out, and then establishing a connection on port 139? I think by default Windows tries to connect to both at the same time or something weird like that. No. There is no attempt to use port 139: only 445 is approached. On scenario2, I've seen behavior something akin to this on a corrupted e1000 kernel module. I've also seen bad cables (twice where gigabit and mii are concerned, IIRC) that behave all kinds of weird, at any given moment. The server's using the bnx2 module and the NIC is at 100MB FD. I'm not noting any other network weirdness, which would seem to suggest cabling is probably OK, wouldn't it? Anyways, FWIW, how does your 'netstat -s' output look? Are you getting a considerable number of connection resets being sent or received? No. All the reset sents in the diff below belong to an unrelated application. In the time between the two netstats compared below, various stalling transfers were made and one network name is no longer available was received: # diff -Bub /root/netstat-20080213-0939 /root/netstat-20080213-1016 --- /root/netstat-20080213-0939 2008-02-13 09:39:24.0 + +++ /root/netstat-20080213-1016 2008-02-13 10:16:34.0 + @@ -1,43 +1,44 @@ Ip: -4336 total packets received +21933 total packets received 0 forwarded 0 incoming packets discarded -4335 incoming packets delivered -4134 requests sent out +20292 incoming packets delivered +19069 requests sent out Icmp: -26 ICMP messages received +92 ICMP messages received 0 input ICMP message failed. ICMP input histogram: -echo requests: 26 -26 ICMP messages sent +echo requests: 92 +92 ICMP messages sent 0 ICMP messages failed ICMP output histogram: -echo replies: 26 +echo replies: 92 Tcp: -6 active connections openings -161 passive connection openings +11 active connections openings +169 passive connection openings 0 failed connection attempts -0 connection resets received -93 connections established -4176 segments received -3992 segments send out +1 connection resets received +97 connections established +18529
Re: [Samba] Multiple homedir entries in smb.conf ?
What about mounting with the bind option all the /home/$SERVER/home/$USERNAME dirs in /home/$USERNAME Hi don't know about bind-option. What is meant with bind-option ? Is it an option for the smbfstab ? Ok I have read the manpages fpr mount. So I tried out: Existing mounts: //server01/home on /server/server01 //server02/home on /server/server02 So I tried to mount via: # mount --bind /server/server02 /server/server01 But now in /server/server01 I see only the content of server02. What do I wrong ? -- Regards, Jens Strohschnitter - *!!!LINUX LINUX LINUX LINUX LINUX!!!* * http://www.jens-strohschnitter.de * - Set the controls for the heart of the sun - -- Regards, Jens Strohschnitter - *!!!LINUX LINUX LINUX LINUX LINUX!!!* * http://www.jens-strohschnitter.de * - Set the controls for the heart of the sun - __ Raiffeisen Waren-Zentrale Rhein-Main eG 50668 Koeln, Altenberger Str. 1a Tel: 0221/1638-0 Fax: 0221/1638-254 Sitz: Koeln Amtsgericht Koeln, GnR 728 Geschaeftsfuehrender Vorstand: Hans-Josef Hilgers (Sprecher) Markus Stuettgen Dr. Karl-Heinrich Suemmermann Vorstand: Friedhelm Decker (Vorsitzender) Ingo Steitz Vorsitzender des Aufsichtsrates: Peter Bleser (MdB) St.Nr.: 215/5938/0152 Bankverbindung: WGZ Bank AG, Duesseldorf (BLZ 300 600 10) Konto-Nr.: 300 011 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multiple homedir entries in smb.conf ?
ok, UnionFS is one solution - but it takes several days to configure. Is
there
no change to add more than one homedir template to the smb.conf (just
like using
variables) ?
What about mounting with the bind option all the
/home/$SERVER/home/$USERNAME dirs in /home/$USERNAME
Hi
don't know about bind-option. What is meant with bind-option ? Is it an
option
for the smbfstab ?
for i in /home/server{1..3}/home/*
do
cd /home mkdir basename $i
mount --bind $i /home/`basename $i`
done
This script strictly untested.
Hi
yep! It works fine! Just the line cd /home mkdir basename $i
must be: cd /home mkdir `basename $i`
Many, many thanxx !!!
--
Regards,
Jens Strohschnitter
-
*!!!LINUX LINUX LINUX LINUX LINUX!!!*
* http://www.jens-strohschnitter.de *
-
Set the controls for
the heart of the sun
-
__
Raiffeisen Waren-Zentrale Rhein-Main eG
50668 Koeln, Altenberger Str. 1a
Tel: 0221/1638-0
Fax: 0221/1638-254
Sitz: Koeln
Amtsgericht Koeln, GnR 728
Geschaeftsfuehrender Vorstand:
Hans-Josef Hilgers (Sprecher)
Markus Stuettgen
Dr. Karl-Heinrich Suemmermann
Vorstand:
Friedhelm Decker (Vorsitzender)
Ingo Steitz
Vorsitzender des Aufsichtsrates:
Peter Bleser (MdB)
St.Nr.: 215/5938/0152
Bankverbindung:
WGZ Bank AG, Duesseldorf
(BLZ 300 600 10) Konto-Nr.: 300 011
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multiple homedir entries in smb.conf ?
J. Strohschnitter wrote:
ok, UnionFS is one solution - but it takes several days to configure. Is there
no change to add more than one homedir template to the smb.conf (just like using
variables) ?
What about mounting with the bind option all the
/home/$SERVER/home/$USERNAME dirs in /home/$USERNAME
Hi
don't know about bind-option. What is meant with bind-option ? Is it an option
for the smbfstab ?
for i in /home/server{1..3}/home/*
do
cd /home mkdir basename $i
mount --bind $i /home/`basename $i`
done
This script strictly untested.
you can try mount --bind directly by using
mount --bind /home/server1/home/myuser /home/myuser
Laurent
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ldap passwd sync not working
Edmundo Valle Neto escreveu: Fabiano Caixeta Duarte escreveu: Fabiano Caixeta Duarte wrote: Hi, there! When my XP users try to change passwords, they get a message saying that password has been changed. That's not true! NT and LM passwords are changed but unixPassword isn't. Look at this openldap.log lines: Feb 12 07:50:28 apolo slapd[22826]: conn=698021 op=40 MOD dn=uid=teste,ou=Users,dc=domain Feb 12 07:50:28 apolo slapd[22826]: conn=698021 op=40 MOD attr=sambaLMPassword sambaLMPassword sambaNTPassword sambaNTPassword sambaPwdLastSet sambaPwdLastSet See? My smb.conf have this ldap related options: passdb backend = ldapsam:ldap://apolo.domain idmap backend = ldapsam:ldap://apolo.domain ldap suffix = dc=domain ldap admin dn = cn=root,dc=domain ldap ssl = start_tls ldap group suffix = ou=Groups ldap user suffix = ou=Users ldap machine suffix = ou=Computers ldap idmap suffix = ou=Users ldap passwd sync = yes add user script = /usr/local/sbin/smbldap-useradd -m %u ldap delete dn = Yes delete user script = /usr/local/sbin/smbldap-userdel %u add machine script = /usr/local/sbin/smbldap-useradd -w %u add group script = /usr/local/sbin/smbldap-groupadd -p %g add user to group script = /usr/local/sbin/smbldap-groupmod -m %u %g set primary group script = /usr/local/sbin/smbldap-usermod -g %g %u The question may not be related to LDAP since your domain passwords are changed. You should be looking at why the Unix password isn't being changed. - Are you using LDAP for Unix authentication? - Can you change the Unix password using passwd? - is your password chat in smb.conf correct for your system? AFAIK when using ldapsam, we must use ldap attributes for storing unix information. So passwd won't work. passwd works partially. passwd uses PAM, and PAM can access LDAP but it only knows about posix attributes. If so, we cannot use passwd chat passwd program unix password sync, etc. Instead, we have to use ldap passwd sync. Well, you can, but yes, ldap passwd sync does the same thing without need to configure anything, so, it works but just doesnt make sense configure both. idealx documentation explain that: http://sourceforge.net/docman/display_doc.php?docid=33543group_id=166108 6.8 The directive passwd program = /usr/local/sbin/smbldap-passwd -u %u is not called, or i got a error message when changing the password from windows The directive is called if you also set unix password sync = Yes. Notes: * if you use OpenLDAP, none of those two options are needed. You just need ldap passwd sync = Yes. * the script called here must only update the userPassword attribute. This is the reason of the -u option. Samba passwords will be updated by samba itself. * the passwd chat directive must match what is prompted when using the smbldap-passwd command So..., just -u to change only userPassword and a working passwd chat :) And in: 8.1.3 The samba configuration file : /etc/samba/smb.conf #unix password sync = Yes #passwd program = /opt/IDEALX/sbin/smbldap-passwd -u %u #passwd chat = Changing password for*\nNew password* %n\n *Retype new password* %n\n ldap passwd sync = Yes One OR another. But both approaches works. Am I wrong? Yes. And yes, I'm using also unix authentication for some services. I assume that I missed something on smb.conf because samba doesn't ask for modification on unixPassword ldap attribute as shown on openldap.log Thats funny, I cannot point anything missing in your smb.conf, ldap passwd sync should work alone. but you can try smbldap-passwd as shown at the tree lines above. Make sure it works at the command line first. Thanks for your attention. Regards. Edmundo Valle Neto Sure enough smbldap-passwd works. I have tried this once ldap passwd sync was not working. Though, there are two problems: 1) it's too slow and 2) it shows a message to the user telling he has no permissions to change password. So it's confusing. I don't feel comfortable using such a thing. Actually, I was hoping for some answer from whom has ldap passwd sync working. Hints on how to debug and so on. Thanks again! -- Fabiano Caixeta Duarte Especialista em Redes de Computadores Linux User #195299 Ribeirão Preto - SP -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] acl, no rights and possibility to delete files
Hello, I've a samba 3.0.24 and a share in ext3 with acl. I've set on a file the following permissions on a file a.txt : vssamba:/# getfacl /mnt/samba/partage/a.txt getfacl: Removing leading '/' from absolute path names # file: mnt/samba/partage/a.txt # owner: herve # group: users user::rwx group::r-- other::r-- The rights for share Partage are : [partage] comment = blablabla path = /mnt/samba/partage public = yes writable = yes directory mask = 0744 create mask = 0744 security mask = 0744 force security mode = 0 directory security mask = 0744 force directory security mode = 0 BUT, a user in others can delete the file from Windows XP What I have missed ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba and the InterWeb
Alex Hooper wrote: Scott Lovenberg uttered: Alex Hooper wrote: Hi, We have an office-based Windows-locked publishing system whose only delivery mechanism is to write to a local filesystem, and a requirement for its output to be available to a collocated production environment comprising Solaris and Linux boxes. The 'obvious' solution was to run a Samba server on one of the collocated Linux boxes and mount the share it provides on the relevant Windows machines in the office. And this is what I have done. This works, but encounters the problem I am about to describe. SCENARIO ONE: Connecting to the server/share in Explorer (Windows XP) by typing the path (\\dns.host.name\share) into the address bar is accomplished without problem, as is receiving a directory listing. But uploading a file to the remote share (by drag and dropping) causes Explorer to freeze for anything between 10 and 30 seconds after which the file transfers at good speed. SCENARIO TWO: Map the remote share, using same connection details. Now copy is often fine, but sometimes will just fail with a Cannot copy filename: The specified network name is no longer available. and leave a zero-length file at the remote end. Not infrequently, smbd processes are being left in an 'uninterruptible sleep' state. If I mount the remote share via smbmount onto a Linux server in the office, I don't encounter any of these problems. Packet-sniffing on scenario one shows that the pause is happening before any set-up for the file transfer: it looks like the client disconnects, then there's a pause, then it reconnects. I'm using Samba version 3.0.25b-1.el4_6.4 on RHEL ES release 4. Clients are Windows XP Pro. Our office has a fairly large and complex LAN which is managed by a separate department. Access to the Internet is, not surprisingly, via a NATting gateway. Appropriate ports have been opened in the firewalls, though all communication is in Direct-hosted mode (ie, I only see traffic on port 445/tcp). smb.conf looks like this: [global] workgroup = WG123 netbios name = n2323 # hostname of server server string = FOO-BAR-Samba #wins proxy = yes #wins server = xxx.xx.xx.x security = user passdb backend = tdbsam load printers = no # idle time (mins) before client is disconnected dead time = 15 keepalive = 10 socket options = IPTOS_THROUGHPUT SO_SNDBUF=8576 inherit permissions = yes [test-xml] path = /stuff/test-xml writeable = Yes public = no Could anyone suggest what might be going on here? Thanks, Alex. On scenario1, is it (Windows client) trying to connect to port 445 on the server, being dropped instead of rejected, timing out, and then establishing a connection on port 139? I think by default Windows tries to connect to both at the same time or something weird like that. No. There is no attempt to use port 139: only 445 is approached. On scenario2, I've seen behavior something akin to this on a corrupted e1000 kernel module. I've also seen bad cables (twice where gigabit and mii are concerned, IIRC) that behave all kinds of weird, at any given moment. The server's using the bnx2 module and the NIC is at 100MB FD. I'm not noting any other network weirdness, which would seem to suggest cabling is probably OK, wouldn't it? I once heard a quote (which I'd like to attribute to Jeremy Allison for some reason) to the effect of The Windows SMB network stack is like a canary in a coal mine, when you have network troubles it's the first thing to die. I could get everything else to work just fine with this driver, but SMB/CIFS just kept flaking out. So, I always try to trace a problem starting from the wall back. Anyways, FWIW, how does your 'netstat -s' output look? Are you getting a considerable number of connection resets being sent or received? No. All the reset sents in the diff below belong to an unrelated application. In the time between the two netstats compared below, various stalling transfers were made and one network name is no longer available was received: # diff -Bub /root/netstat-20080213-0939 /root/netstat-20080213-1016 --- /root/netstat-20080213-0939 2008-02-13 09:39:24.0 + +++ /root/netstat-20080213-1016 2008-02-13 10:16:34.0 + @@ -1,43 +1,44 @@ Ip: -4336 total packets received +21933 total packets received 0 forwarded 0 incoming packets discarded -4335 incoming packets delivered -4134 requests sent out +20292 incoming packets delivered +19069 requests sent out Icmp: -26 ICMP messages received +92 ICMP messages received 0 input ICMP message failed. ICMP input histogram: -echo requests: 26 -26 ICMP messages sent +echo requests: 92 +92 ICMP messages sent 0 ICMP messages failed ICMP output histogram: -echo
RE: [Samba] Kaspersky Anti-virus unable to join Domain
It turns out that this is the case. I'm using the Kaspersky Administration Kit. When the machine booted the first time, it was in a general group (In the admin kit), which didn't have a policy defined. So, it started with Anti-hacker turned on. Once I moved it to the correct group, it pulled down the correct policy, and then allowed domain logins. Interesting to note, until it did that, it wouldn't login to the domain, even after I got it to join. Thanks for the heads up on the Anti-Hacker settings. I only have 4 machines on KAV6 so far. The Anti-hacker wasn't part of KAV5. I had it disabled in my test installation, until I could get up to speed on it. Thanks, Dennis -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, February 12, 2008 5:55 PM To: Dennis McLeod Subject: Re: [Samba] Kaspersky Anti-virus unable to join Domain Hi, On Feb 12, 2008 8:30 PM, Dennis McLeod [EMAIL PROTECTED] wrote: Just a heads up. I recently built a new (XPSP2) image with the Kaspersky 6.0.3.837 on it. I had issues joining the domain with the AV running. Had to disable. (A domain controller for domain ABC could not be contacted.) I didn't have AV on my previous image, so I don't know if version 5 did the same. I don't know if it is complete secure, but, in a Kaspersky 6 installation I saw, using XP SP2, they had to go to Settings, Anti-hacker, Zone and add there the subnet of their PDC/WINS server. After that, they could join to domain, with Kaspersky working. At least on the workstation they tested. If your case is similar to this, I would like to ask you some questions about login times. Cheers, Cássio -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Kaspersky Anti-virus unable to join Domain
See my other reply, but it turns out it is the Anti-hacker module in KAV6. I probably could have found more info on their website, but I had no idea why it was unable to join. I dumped the image down twice, although I'm not sure what the second re-image was going to do ( I did have another problem with Ghostwalker, so I though the image might be bad.) The biggest difference in the image was KAV, so once I shut it down it was able to join. I posted here, so others having the Unable to contact... message would see my notes and check their AV software. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Anne Wilson Sent: Wednesday, February 13, 2008 12:23 AM To: samba@lists.samba.org Subject: Re: [Samba] Kaspersky Anti-virus unable to join Domain On Tuesday 12 February 2008 22:30:25 Dennis McLeod wrote: Just a heads up. I recently built a new (XPSP2) image with the Kaspersky 6.0.3.837 on it. I had issues joining the domain with the AV running. Had to disable. (A domain controller for domain ABC could not be contacted.) I didn't have AV on my previous image, so I don't know if version 5 did the same. I don't recall seeing this on the list, so I thought I would throw it out Dennis Have you contacted Kaspersky support team? In my experience they will help if they can. Anne -- 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 and the InterWeb
On Wed, Feb 13, 2008 at 11:34:13AM -0500, Scott Lovenberg wrote: I once heard a quote (which I'd like to attribute to Jeremy Allison for some reason) to the effect of The Windows SMB network stack is like a canary in a coal mine, when you have network troubles it's the first thing to die. Wow - great quote ! Not mine though :-). Wish I'd thought of it :-). Cheers, Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] FreeBSD: Changing UNIX password - Password Chat?
I can't get my Samba PDC (FreeBSD 7,0-BETA3) changing UNIX passwords from Windows clients (Ctrl-Alt-Del). I now have the password chat debug active and I have loglevel 100. I am not certain about the syntax in the password chat. But if I from a console try to change the password of a given user (here testuser1), I see these lines: mflserver3# /usr/bin/passwd testuser1 Changing local password for testuser1 New Password: (entering the password) Retype New Password: (entering it again) From that i guess the expression in the chat would be: *Changing*local*password*for* %u\n *New*Password* %n\n *Retype*New*Password* %n\n Selected parts of the log shows: [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Changing*local*password*for*] received [Changing local password for testuser1 New Password:] match yes [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [testuser1 ] [2008/02/13 17:47:07, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*New*Password*] received [ Retype New Password:] match yes [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [VerySecret ] [2008/02/13 17:47:10, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:10, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Retype*New*Password*] received [ Mismatch; try again, EOF to quit. New Password:] match no [2008/02/13 17:47:10, 2] smbd/chgpasswd.c:expect(285) expect: Unknown error: 0 [2008/02/13 17:47:10, 3] smbd/chgpasswd.c:talktochild(316) Response 3 incorrect [2008/02/13 17:47:10, 3] smbd/chgpasswd.c:chat_with_program(372) chat_with_program: Child failed to change password: testuser1 [2008/02/13 17:47:10, 3] smbd/sec_ctx.c:pop_sec_ctx(415) pop_sec_ctx (1035, 1036) - sec_ctx_stack_ndx = 1 [2008/02/13 17:47:10, 5] rpc_parse/parse_samr.c:init_samr_r_chgpasswd_user(7576) init_samr_r_chgpasswd_user [2008/02/13 17:47:10, 5] rpc_server/srv_samr_nt.c:_samr_chgpasswd_user(1581) _samr_chgpasswd_user: 1581 [2008/02/13 17:47:10, 5] rpc_parse/parse_prs.c:prs_debug(84) 00 samr_io_r_chgpasswd_user [2008/02/13 17:47:10, 5] rpc_parse/parse_prs.c:prs_ntstatus(769) status: NT_STATUS_ACCESS_DENIED As told, I'm not confident with the syntax. Have I made it wrong? Or can you see anything else from the log that can pinpoint the problem? I would believe that there must be several admins out there who use the combination of of Samba and FreeBSD without having these problems. Cheers, Jon Theil Nielsen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Access denied when setting permissions
I have a windows 2003 AD domain and a server joined to that domain. Winbind is being used as an idmap. Most everything seems to work fine. Winbind gets user info correctly: [EMAIL PROTECTED] ~]# wbinfo -u TESTDOMAIN\administrator TESTDOMAIN\guest TESTDOMAIN\support_388945a0 TESTDOMAIN\krbtgt TESTDOMAIN\swhaley TESTDOMAIN\test [EMAIL PROTECTED] ~]# wbinfo -g BUILTIN\administrators BUILTIN\users TESTDOMAIN\domain computers TESTDOMAIN\domain controllers TESTDOMAIN\schema admins TESTDOMAIN\enterprise admins TESTDOMAIN\domain admins TESTDOMAIN\domain users TESTDOMAIN\domain guests TESTDOMAIN\group policy creator owners TESTDOMAIN\dnsupdateproxy [EMAIL PROTECTED] ~]# wbinfo -a 'TESTDOMAIN\swhaley%password' plaintext password authentication succeeded challenge/response password authentication succeeded Domain functionality seems to work fine. [EMAIL PROTECTED] ~]# net ads testjoin Join is OK [EMAIL PROTECTED] ~]# net ads info LDAP server: 192.168.222.84 LDAP server name: server.TESTDOMAIN.COM Realm: TESTDOMAIN.COM Bind Path: dc=TESTDOMAIN,dc=COM LDAP port: 389 Server time: Wed, 13 Feb 2008 11:19:09 CST KDC server: 192.168.222.84 Server time offset: -29 My user can connect to the samba share from a windows host without entering credentials, so kerberos and authentication is working properly. But whenever I try to set permissions on the share, with a member of the Domain Admins group, from the Computer Management snap in I always get access denied errors. I have nt acl support turned on for the share. Here's my samba config: [global] security = ads encrypt passwords = yes realm = TESTDOMAIN.COM workgroup = TESTDOMAIN idmap uid = 20 - 30 idmap gid = 20 - 30 server string = Samba Server Version 3 netbios name = SAMBA interfaces = lo eth0 192.168.222.110/24 [public] comment = Public Stuff path = /home/samba public = yes writable = yes printable = no valid users = TESTDOMAIN.COM\swhaley nt acl support = yes map acl inherit = yes inherit acls = yes I've also assigned the SeDiskOperatorPrivilege to the Domain Admins group [EMAIL PROTECTED] ~]# net rpc rights list accounts -Uswhaley Password: TESTDOMAIN\swhaley SeDiskOperatorPrivilege BUILTIN\Print Operators No privileges assigned BUILTIN\Account Operators No privileges assigned BUILTIN\Backup Operators No privileges assigned TESTDOMAIN\Domain Admins SeDiskOperatorPrivilege BUILTIN\Server Operators No privileges assigned BUILTIN\Administrators SeMachineAccountPrivilege SeTakeOwnershipPrivilege SeBackupPrivilege SeRestorePrivilege SeRemoteShutdownPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeDiskOperatorPrivilege Everyone No privileges assigned I'm running CentOS5, so POSIX acl support is on by default. I tested it by setting and removing some ACLs just to be sure, and they worked properly. As mentioned, I'm running CentOS5. Samba is version 3.0.25b. Can anyone shed some light on this? It's been driving me crazy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Wrong perms on new files/dirs using smbmount
Greetings- I am working through coming up with a Linux client integration to Samba PDC's. I mount several shares with this sort of syntax: /bin/mount -t cifs -o credentials=/home/userid/.smbcredentials,uid=userid,gid=userid,dmask=0777,fmask=0666 //ldslnx01/data /mnt/ldslnx01/data/ However when I create new files/dirs on the Samba share from the Linux workstation, the perms are not 0666/0777 as I have specified. Historically I set those perms on the share, and that has always worked with Windows clients. I added that bit to the mount command, but it made no difference. I believe I end up with 0755/0644, but do not hold me to that as I have simply verified it is not correct and that is all the checking I have done. Thanks! -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Wrong perms on new files/dirs using smbmount
Michael Lueck wrote: Greetings- I am working through coming up with a Linux client integration to Samba PDC's. I mount several shares with this sort of syntax: /bin/mount -t cifs -o credentials=/home/userid/.smbcredentials,uid=userid,gid=userid,dmask=0777,fmask=0666 //ldslnx01/data /mnt/ldslnx01/data/ However when I create new files/dirs on the Samba share from the Linux workstation, the perms are not 0666/0777 as I have specified. Historically I set those perms on the share, and that has always worked with Windows clients. I added that bit to the mount command, but it made no difference. I believe I end up with 0755/0644, but do not hold me to that as I have simply verified it is not correct and that is all the checking I have done. Thanks! I think you'll find that is your default umask (more specifically, your umask is 022, i.e., (7-0)(7-2)(7-2)=755) It must be overriding. I'm not sure why this would be, though. Could it be that '/' is mounted with an explicit permission setting that is shadowing your mount settings? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba share over a NFS mount (tuning)
Hi, I have a server that run OpenSuse 10.3, this server run VMware Server and host an OpenSuse 10.3 virtual machine witch is a Samba file server for my windows clients. The goal behind having a OpenSuse hosting an OpenSuse virtual machine is to separate the configurations from the data so I can easily change the configurations without affecting the data. The host keep all the data and share it with the virtual machine with NFS v3, so the virtual machine mount the NFS share and then a use Samba 3.0.26a to share the NFS mounted folder for my windows clients. The network I use between my host and my virtual machine is an Host-only virtual network. My virtual machine use a bridged network over a dedicated 1Gb Ethernet card to communicate with the windows clients. I reuse a smb.conf from the previous Samba (3.0.25b) file server witch was functioning with absolutely no problems. The problem I have with my new Samba file server is that my Vista client have a 20 to 60 second delay when they open a MS Office 2007 file. They have the same delay with MS Office 2003 and all the Office's file the Vista clients open with MS Office 2003 are read only. I think it is a file lock issue because went I disable the file lock at the NFS mount or in Samba smb.conf file. In my case, I just cannot disable file lock in my production environment. Thanks for your help, Mathieu Beaudoin Responsable des T.I. CVT Corp Technologies de vitesse variable Variable Speed Technologies -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] macro for number of copies
Gentleman, I'd like to know the proper macro for getting the number of copies of a job sent by a windows client. If one send one or more copies of a job which has 10 pages, the %c macro has a value of 10. This is the only lack for me to publish a simple printing quota system based on a samba environment. Thanks for you time. PS: I really tried to understand the source related to printing shares and could get anywhere. Is there a place where I can learn something about this? -- Fabiano Caixeta Duarte Especialista em Redes de Computadores Linux User #195299 Ribeirão Preto - SP -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ldap passwd sync not working
Le Tue, Feb 12, 2008 at 09:44:01AM -0200, Fabiano Caixeta Duarte a ecrit: Hi, there! When my XP users try to change passwords, they get a message saying that password has been changed. That's not true! I can confirmed you that the following configuration work for me: unix password sync = No ldap passwd sync = Yes passwd program = /usr/sbin/smbldap-passwd -u %u passwd chat = Changing password for*\nNew password* %n\n *Retype new password* %n\n If you have not set the last directive, you should do: 'smbldap-password' does not prompt you the same way as 'passwd' for example. You sould also be careful to not add space or other caracter. -- Jerome Tournier GPG key ID (pgp.mit.edu): 75FE0A51 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Wrong perms on new files/dirs using smbmount
Michael Lueck wrote: Scott Lovenberg wrote: Could it be that '/' is mounted with an explicit permission setting that is shadowing your mount settings? I do not think so, but have a look. This share happens to be on the /srv partition. /dev/sda1 / xfs defaults0 1 /dev/sda9 /srvxfs defaults0 2 That seems fine. What are the samba server side settings(smb.conf) for the share you are mounting? Do you have inherit permissions set? from smb.conf(5) man page: inherit permissions (S) The permissions on new files and directories are normally governed by create mask, directory mask, force create mode and force directory mode but the boolean inherit permissions parameter overrides this. New directories inherit the mode of the parent directory, including bits such as setgid. New files inherit their read/write bits from the parent directory. Their execute bits continue to be determined by map archive, map hidden and map system as usual. Note that the setuid bit is never set via inheritance (the code explicitly prohibits this). This can be particularly useful on large systems with many users, perhaps several thousand, to allow a single [homes] share to be used flexibly by each user. Default: inherit permissions = no -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Problem with winbind not seeing a user as part of a group
Trimble, Ronald D wrote: That may be possible, but like I said, sometimes it works and sometimes it doesn't. Sometimes the span between the two is only a few seconds. From: Scott Lovenberg [mailto:[EMAIL PROTECTED] Sent: Tuesday, February 12, 2008 10:05 PM To: Trimble, Ronald D Cc: samba@lists.samba.org Subject: Re: [Samba] Problem with winbind not seeing a user as part of a group Trimble, Ronald D wrote: I have never explored those options. We have auth fall through turned off. If the authentication fails, they get a 401 message indicating they don't have permissions. Here is an example from our vhosts.conf... Location /scm/spar/svn DAV svn SVNPATH /scm/spar/svn SVNPathAuthz off AuthPAM_Enabled on AuthPAM_FallThrough off AuthType Basic AuthName SPAR Subversion require group NA\USTR-LINUX-1-SPAR LimitExcept GET PROPFIND OPTIONS REPORT require group NA\USTR-LINUX-1-SPAR /LimitExcept /Location Location /scm/spar/trac SetHandler mod_python PythonHandler trac.web.modpython_frontend PythonOption TracEnv /scm/spar/trac PythonOption TracUriRoot /scm/spar/trac AuthPAM_Enabled on AuthPAM_FallThrough off AuthType Basic AuthName SPAR Trac require group NA\USTR-LINUX-1-SPAR /Location From: Scott Lovenberg [mailto:[EMAIL PROTECTED] Sent: Tuesday, February 12, 2008 9:27 PM To: Trimble, Ronald D Cc: samba@lists.samba.orgmailto:samba@lists.samba.org Subject: Re: [Samba] Problem with winbind not seeing a user as part of a group Trimble, Ronald D wrote: It looks like it is only happening when apache2 is involved. Although, other login methods are far less common. I have a suspicion it may be related to the mod_auth_pam module but what I don't understand is why it is happening. Mod_auth_pam makes dozens of requests to winbind for each session. Why do some work and others don't? Could it be that winbind is overwhelmed and thus doesn't return anything? -Original Message- From: Scott Lovenberg [mailto:[EMAIL PROTECTED] Sent: Tuesday, February 12, 2008 9:09 PM To: Trimble, Ronald D Cc: samba@lists.samba.orgmailto:samba@lists.samba.org Subject: Re: [Samba] Problem with winbind not seeing a user as part of a group Trimble, Ronald D wrote: Everyone, Here is a challenge for all of you samba experts! Lately I have been seeing a problem where winbind is not correctly identifying a user as a member of a group he most certainly belong to. This is with a Domain Local group so I know samba should support it. Users access a HTTPS (SSL) webpage that is secured by a Domain Local group. Sometimes they get in, others they don't. Here are some examples from the logs. /var/log/apache2/error_log [Tue Feb 12 18:54:52 2008] [error] [client 172.xx.xxx.xxx] GROUP: NA\\selltc not in required group(s)., referer: https://ustr-linux-1/scm/spar/trac/browser/trunk/common/include/channe ls [Tue Feb 12 18:55:00 2008] [error] [client 172.xx.xxx.xxx] GROUP: NA\\selltc not in required group(s)., referer: https://ustr-linux-1/scm/spar/trac/browser/trunk/common/include/channe ls [Tue Feb 12 18:56:12 2008] [error] [client 172.xx.xxx.xxx] GROUP: NA\\selltc not in required group(s)., referer: https://ustr-linux-1/scm/spar/trac/browser/trunk/common/include/channe ls However a little later it is mysteriously working again... /var/log/apache2/access_log 172.xx.xxx.xxx - NA\\selltc [12/Feb/2008:20:02:37 -0500] GET /scm/spar/trac/chrome/common/css/trac.css HTTP/1.1 304 - 172.xx.xxx.xxx - NA\\selltc [12/Feb/2008:20:02:37 -0500] GET /scm/spar/trac/chrome/common/css/browser.css HTTP/1.1 304 - 172.xx.xxx.xxx - NA\\selltc [12/Feb/2008:20:02:37 -0500] GET /scm/spar/trac/chrome/common/css/diff.css HTTP/1.1 304 - Now obviously my example doesn't have the user accessing the same link, but it doesn't matter. Winbind went from identifying the user as not in the group to then identifying him as in the group and nothing changed! This is happening several times a day and is driving us insane. What can I do to figure this out? Has anyone else seen this? Here is what is going on in the /var/log/samba/log.wb-NA (our domain) log at that time for that user. [2008/02/12 18:54:52, 10] nsswitch/winbindd_dual.c:child_process_request(479) process_request: request fn PAM_AUTH [2008/02/12 18:54:52, 3] nsswitch/winbindd_pam.c:winbindd_dual_pam_auth(1341) [10824]: dual pam auth NA\selltc [2008/02/12 18:54:52, 10] nsswitch/winbindd_pam.c:winbindd_dual_pam_auth(1364) winbindd_dual_pam_auth: domain: NA last was online [2008/02/12 18:54:52, 10]
[Samba] Re: Wrong perms on new files/dirs using smbmount
Scott Lovenberg wrote: Could it be that '/' is mounted with an explicit permission setting that is shadowing your mount settings? I do not think so, but have a look. This share happens to be on the /srv partition. /dev/sda1 / xfs defaults0 1 /dev/sda9 /srvxfs defaults0 2 -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Access denied when setting permissions
I may be totally wrong but for what it is worth. Looking at this it looks like your workstation time and server time are out of sync. Check to make sure your timezone is correct and run the following command. net time set /S server [EMAIL PROTECTED] ~]# net ads info LDAP server: 192.168.222.84 LDAP server name: server.TESTDOMAIN.COM Realm: TESTDOMAIN.COM Bind Path: dc=TESTDOMAIN,dc=COM LDAP port: 389 Server time: Wed, 13 Feb 2008 11:19:09 CST KDC server: 192.168.222.84 Server time offset: -29 From: [EMAIL PROTECTED] on behalf of Steven Whaley Sent: Wed 2/13/2008 12:26 PM To: samba@lists.samba.org Subject: [Samba] Access denied when setting permissions I have a windows 2003 AD domain and a server joined to that domain. Winbind is being used as an idmap. Most everything seems to work fine. Winbind gets user info correctly: [EMAIL PROTECTED] ~]# wbinfo -u TESTDOMAIN\administrator TESTDOMAIN\guest TESTDOMAIN\support_388945a0 TESTDOMAIN\krbtgt TESTDOMAIN\swhaley TESTDOMAIN\test [EMAIL PROTECTED] ~]# wbinfo -g BUILTIN\administrators BUILTIN\users TESTDOMAIN\domain computers TESTDOMAIN\domain controllers TESTDOMAIN\schema admins TESTDOMAIN\enterprise admins TESTDOMAIN\domain admins TESTDOMAIN\domain users TESTDOMAIN\domain guests TESTDOMAIN\group policy creator owners TESTDOMAIN\dnsupdateproxy [EMAIL PROTECTED] ~]# wbinfo -a 'TESTDOMAIN\swhaley%password' plaintext password authentication succeeded challenge/response password authentication succeeded Domain functionality seems to work fine. [EMAIL PROTECTED] ~]# net ads testjoin Join is OK [EMAIL PROTECTED] ~]# net ads info LDAP server: 192.168.222.84 LDAP server name: server.TESTDOMAIN.COM Realm: TESTDOMAIN.COM Bind Path: dc=TESTDOMAIN,dc=COM LDAP port: 389 Server time: Wed, 13 Feb 2008 11:19:09 CST KDC server: 192.168.222.84 Server time offset: -29 My user can connect to the samba share from a windows host without entering credentials, so kerberos and authentication is working properly. But whenever I try to set permissions on the share, with a member of the Domain Admins group, from the Computer Management snap in I always get access denied errors. I have nt acl support turned on for the share. Here's my samba config: [global] security = ads encrypt passwords = yes realm = TESTDOMAIN.COM workgroup = TESTDOMAIN idmap uid = 20 - 30 idmap gid = 20 - 30 server string = Samba Server Version 3 netbios name = SAMBA interfaces = lo eth0 192.168.222.110/24 [public] comment = Public Stuff path = /home/samba public = yes writable = yes printable = no valid users = TESTDOMAIN.COM\swhaley nt acl support = yes map acl inherit = yes inherit acls = yes I've also assigned the SeDiskOperatorPrivilege to the Domain Admins group [EMAIL PROTECTED] ~]# net rpc rights list accounts -Uswhaley Password: TESTDOMAIN\swhaley SeDiskOperatorPrivilege BUILTIN\Print Operators No privileges assigned BUILTIN\Account Operators No privileges assigned BUILTIN\Backup Operators No privileges assigned TESTDOMAIN\Domain Admins SeDiskOperatorPrivilege BUILTIN\Server Operators No privileges assigned BUILTIN\Administrators SeMachineAccountPrivilege SeTakeOwnershipPrivilege SeBackupPrivilege SeRestorePrivilege SeRemoteShutdownPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeDiskOperatorPrivilege Everyone No privileges assigned I'm running CentOS5, so POSIX acl support is on by default. I tested it by setting and removing some ACLs just to be sure, and they worked properly. As mentioned, I'm running CentOS5. Samba is version 3.0.25b. Can anyone shed some light on this? It's been driving me crazy. -- 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] ldap passwd sync not working
(...) Sure enough smbldap-passwd works. I have tried this once ldap passwd sync was not working. How? Though, there are two problems: 1) it's too slow and 2) it shows a message to the user telling he has no permissions to change password. Where? How? So it's confusing. I don't feel comfortable using such a thing. Actually, I was hoping for some answer from whom has ldap passwd sync working. Mine is. It doesn't needs anything else. Hints on how to debug and so on. Was suggested one, try smbldap-passwd -u from command line and inside samba and see if it works, if it works alone theres a possibility that your samba config has a problem if it doesn't works even outside samba, it doesn't have anything to do with samba, as it runs alone, its a simple perl script that binds to ldap directly. If you conclude that the problem is with samba you can start to raise the log level, if its not, its useless and maybe you should look at your ldap acls. So, it depends, I didnt understood what works and what doesn't and in which situation now. Thanks again! Edmundo Valle Neto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Wrong perms on new files/dirs using smbmount
On Wednesday 13 February 2008, Michael Lueck wrote: I mount several shares with this sort of syntax: /bin/mount -t cifs Subject line is misleading: smbmount != cifs. -- Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Access denied when setting permissions
I wish it were that simple, but I synced them with net time set before running through all of this, and checked again before testing a second time. Rondall Stewart wrote: I may be totally wrong but for what it is worth. Looking at this it looks like your workstation time and server time are out of sync. Check to make sure your timezone is correct and run the following command. net time set /S server [EMAIL PROTECTED] ~]# net ads info LDAP server: 192.168.222.84 LDAP server name: server.TESTDOMAIN.COM Realm: TESTDOMAIN.COM Bind Path: dc=TESTDOMAIN,dc=COM LDAP port: 389 Server time: Wed, 13 Feb 2008 11:19:09 CST KDC server: 192.168.222.84 Server time offset: -29 From: [EMAIL PROTECTED] on behalf of Steven Whaley Sent: Wed 2/13/2008 12:26 PM To: samba@lists.samba.org Subject: [Samba] Access denied when setting permissions I have a windows 2003 AD domain and a server joined to that domain. Winbind is being used as an idmap. Most everything seems to work fine. Winbind gets user info correctly: [EMAIL PROTECTED] ~]# wbinfo -u TESTDOMAIN\administrator TESTDOMAIN\guest TESTDOMAIN\support_388945a0 TESTDOMAIN\krbtgt TESTDOMAIN\swhaley TESTDOMAIN\test [EMAIL PROTECTED] ~]# wbinfo -g BUILTIN\administrators BUILTIN\users TESTDOMAIN\domain computers TESTDOMAIN\domain controllers TESTDOMAIN\schema admins TESTDOMAIN\enterprise admins TESTDOMAIN\domain admins TESTDOMAIN\domain users TESTDOMAIN\domain guests TESTDOMAIN\group policy creator owners TESTDOMAIN\dnsupdateproxy [EMAIL PROTECTED] ~]# wbinfo -a 'TESTDOMAIN\swhaley%password' plaintext password authentication succeeded challenge/response password authentication succeeded Domain functionality seems to work fine. [EMAIL PROTECTED] ~]# net ads testjoin Join is OK [EMAIL PROTECTED] ~]# net ads info LDAP server: 192.168.222.84 LDAP server name: server.TESTDOMAIN.COM Realm: TESTDOMAIN.COM Bind Path: dc=TESTDOMAIN,dc=COM LDAP port: 389 Server time: Wed, 13 Feb 2008 11:19:09 CST KDC server: 192.168.222.84 Server time offset: -29 My user can connect to the samba share from a windows host without entering credentials, so kerberos and authentication is working properly. But whenever I try to set permissions on the share, with a member of the Domain Admins group, from the Computer Management snap in I always get access denied errors. I have nt acl support turned on for the share. Here's my samba config: [global] security = ads encrypt passwords = yes realm = TESTDOMAIN.COM workgroup = TESTDOMAIN idmap uid = 20 - 30 idmap gid = 20 - 30 server string = Samba Server Version 3 netbios name = SAMBA interfaces = lo eth0 192.168.222.110/24 [public] comment = Public Stuff path = /home/samba public = yes writable = yes printable = no valid users = TESTDOMAIN.COM\swhaley nt acl support = yes map acl inherit = yes inherit acls = yes I've also assigned the SeDiskOperatorPrivilege to the Domain Admins group [EMAIL PROTECTED] ~]# net rpc rights list accounts -Uswhaley Password: TESTDOMAIN\swhaley SeDiskOperatorPrivilege BUILTIN\Print Operators No privileges assigned BUILTIN\Account Operators No privileges assigned BUILTIN\Backup Operators No privileges assigned TESTDOMAIN\Domain Admins SeDiskOperatorPrivilege BUILTIN\Server Operators No privileges assigned BUILTIN\Administrators SeMachineAccountPrivilege SeTakeOwnershipPrivilege SeBackupPrivilege SeRestorePrivilege SeRemoteShutdownPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeDiskOperatorPrivilege Everyone No privileges assigned I'm running CentOS5, so POSIX acl support is on by default. I tested it by setting and removing some ACLs just to be sure, and they worked properly. As mentioned, I'm running CentOS5. Samba is version 3.0.25b. Can anyone shed some light on this? It's been driving me crazy. -- 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] pdb_new_rid: Failed to find unused RID
We are getting the following error trying to add new samba users or machines:
pdb_new_rid: Failed to find unused RID
Does this have something to do with idmap?
The following command shows a big jump in ID numbers with the last ones having
the same number repeated.
pdbedit -L | awk -F: '{print $2 $1 : $3}' | sort -n
==
...
3904 bobc:Clara Bob
3905 k121-001-26699$:Machine
3906 k121-01-26699$:Machine
65534 nobody:nobody
4294967295 16061-JPRM107$:16061-JPRM107$
4294967295 23562-JP-STENO2$:23562-JP-STENO2$
4294967295 J107-STN-01$:J107-STN-01$
...
4294967295 Maryjean Paluck:mpaluck
4294967295 hal:Hardware abstraction layer,,,
...
==
Here is the top part of the smb.conf
==
[global]
netbios name = SERVER
workgroup = WORKGROUP
server string = Server
dns proxy = no
strict locking = no
log file = /var/log/samba/log.%m
max log size = 1000
syslog = 0
panic action = /usr/share/samba/panic-action %d
#log level = 10
security = user
encrypt passwords = true
passdb backend = tdbsam
obey pam restrictions = yes
passwd program = /usr/bin/passwd %u
passwd chat = *Enter\snew\sUNIX\spassword:* %n\n
*Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* .
domain logons = yes
logon drive = H:
logon home = \\%N\%U\.profiles
logon script = %a.bat
add machine script = /usr/sbin/useradd -g machines -c
Machine -d /var/lib/nobody -s /bin/false '%m$'
load printers = yes
printing = cups
printer admin = @ntadmin, @lpadmin
socket options = TCP_NODELAY
domain master = yes
local master = yes
; idmap uid = 1-2
; idmap gid = 1-2
== snip =
pdbedit -L | wc -l
1845
We have allot of users on the system and currently we can not add any more.
--
Dean Montgomery
Network Support Tech./Programmer
School District #73
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] FreeBSD: Changing UNIX password - Password Chat?
Jon Theil Nielsen escreveu: I can't get my Samba PDC (FreeBSD 7,0-BETA3) changing UNIX passwords from Windows clients (Ctrl-Alt-Del). I now have the password chat debug active and I have loglevel 100. I am not certain about the syntax in the password chat. But if I from a console try to change the password of a given user (here testuser1), I see these lines: mflserver3# /usr/bin/passwd testuser1 Changing local password for testuser1 New Password: (entering the password) Retype New Password: (entering it again) From that i guess the expression in the chat would be: *Changing*local*password*for* %u\n *New*Password* %n\n *Retype*New*Password* %n\n No. %u is the username and %n is the newpassword. What*to*expect %n\n (send the password and a new line) What*to*expect*then %n\n (send the password again and a new line) Selected parts of the log shows: [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Changing*local*password*for*] received [Changing local password for testuser1 New Password:] match yes It matched the two first lines stopping at (New Password:) as you have a * at the end. And wait. [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [testuser1 ] You sent an username to the New password: prompt??? [2008/02/13 17:47:07, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*New*Password*] received [ Retype New Password:] match yes It matched the second line stopping at (Retype New Password:) And wait. [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [VerySecret ] You sent a VerySecret password (that obviously will not match the first) [2008/02/13 17:47:10, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:10, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Retype*New*Password*] received [ Mismatch; try again, EOF to quit. New Password:] match no Mismatch. Try again. (your chat doesn't expected that this will happens and don't have more expressions to match. [2008/02/13 17:47:10, 2] smbd/chgpasswd.c:expect(285) expect: Unknown error: 0 Error. [2008/02/13 17:47:10, 3] smbd/chgpasswd.c:talktochild(316) Response 3 incorrect [2008/02/13 17:47:10, 3] smbd/chgpasswd.c:chat_with_program(372) chat_with_program: Child failed to change password: testuser1 [2008/02/13 17:47:10, 3] smbd/sec_ctx.c:pop_sec_ctx(415) pop_sec_ctx (1035, 1036) - sec_ctx_stack_ndx = 1 [2008/02/13 17:47:10, 5] rpc_parse/parse_samr.c:init_samr_r_chgpasswd_user(7576) init_samr_r_chgpasswd_user [2008/02/13 17:47:10, 5] rpc_server/srv_samr_nt.c:_samr_chgpasswd_user(1581) _samr_chgpasswd_user: 1581 [2008/02/13 17:47:10, 5] rpc_parse/parse_prs.c:prs_debug(84) 00 samr_io_r_chgpasswd_user [2008/02/13 17:47:10, 5] rpc_parse/parse_prs.c:prs_ntstatus(769) status: NT_STATUS_ACCESS_DENIED And so on. As told, I'm not confident with the syntax. Have I made it wrong? Or can you see anything else from the log that can pinpoint the problem? I would believe that there must be several admins out there who use the combination of of Samba and FreeBSD without having these problems. Cheers, Jon Theil Nielsen Regards. Edmundo Valle Neto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] samba with quotas
Well Mario, thanks for the reply. I already checked what you've said and I arrived using quotas in the partition. Also, I use this tutorial to setup samba that authenticate to active directory through Kerberos. The problem is when I ask ticket to the active directory, it seems it expires. http://www.howtoforge.com/samba_ads_security_mode Please help. TRIK -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of FC Mario Patty Sent: Tuesday, February 12, 2008 3:24 PM To: samba@lists.samba.org Subject: Re: [Samba] samba with quotas Well Patrick, I don't know yet if we can do that with samba. But for what I've already done here, I set user quota to the partition that has the directory of the samba share via /etc/fstab (so it can be mounted automatically). There're plenty of source in the web that can show you just how to do that. Hope it can help. Peace, On Feb 12, 2008 6:26 AM, Patrick G. Victoriano [EMAIL PROTECTED] wrote: Good day, I just want to ask how to setup quotas on a samba server. I have linux centOS 4 installed and samba 3.0.25b. Thank you TRIK -- 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
Fwd: [Samba] Issue with version 3.0.28 on FC8
Thanks for the suggestion, but I am not sure it applies. This HP L7680 is simply doing a file copy to the server and it is not able to reconnect to the server immediately after it transfers the first file. I am not trying to use it from within Linux. Walt Begin forwarded message: From: Karl Banasky [EMAIL PROTECTED] Date: February 13, 2008 5:19:29 PM EST To: Walter Mahla [EMAIL PROTECTED] Subject: Re: [Samba] Issue with version 3.0.28 on FC8 I would check that the HPLIP stuff is installed and running. http://hplip.sourceforge.net/ Check that web page out. I really do not know anything about setting up a network attached scanner. hope that points you in the right direction. Karl- - Original Message - From: Walter Mahla [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Monday, February 11, 2008 6:52:38 PM (GMT-0800) America/ Los_Angeles Subject: [Samba] Issue with version 3.0.28 on FC8 I am a newbie, so any help would be most appreciated. I am in the process of building a new Linux box (Fedora Core 8) to replace a fairly ancient FC4 box. I am have an issue on the FC8 box with samba that I did not have on the FC4 box. (The FC8 box is running samba version 3.0.28, the FC4 box is running 3.0.23.) I have a network attached scanner (HP Officejet L7680) which has worked flawlessly with my FC4 box. On my FC8 box, it will connect and transfer a file after sitting idle for a while. If I try to do a second scan after the first one completes, the scanner can not connect to the server. If I wait some time before trying again, it works. I see no errors in logs at all. Not sure if the problem is samba or the scanner. Can anyone point me in the right direction? Your help would be most appreciated. Thanks, Walt -- 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] acl, no rights and possibility to delete files
mailto:[EMAIL PROTECTED]Hervé Hénoch wrote: Hello, I've a samba 3.0.24 and a share in ext3 with acl. I've set on a file the following permissions on a file a.txt : vssamba:/# getfacl /mnt/samba/partage/a.txt getfacl: Removing leading '/' from absolute path names # file: mnt/samba/partage/a.txt # owner: herve # group: users user::rwx group::r-- other::r-- The rights for share Partage are : [partage] comment = blablabla path = /mnt/samba/partage public = yes writable = yes directory mask = 0744 create mask = 0744 security mask = 0744 force security mode = 0 directory security mask = 0744 force directory security mode = 0 BUT, a user in others can delete the file from Windows XP What I have missed ? What are the permissions on the parent directory? Deleting a file doesn't require permission to write to the file, it is a change to the directory... ~/test$ ls -la total 8 drwxr-xr-x 2 user group 4096 2008-02-14 08:09 ./ drwxr-xr-x 17 user group 4096 2008-02-14 08:09 ../ ~/test$ touch asdf ~/test$ chmod 000 asdf ~/test$ rm -f asdf ~/test$ touch asdf ~/test$ chmod 555 ./ ~/test$ rm -f asdf rm: cannot remove `asdf': Permission denied ~/test$ touch ./zxcv touch: cannot touch `./zxcv': Permission denied As you can see, removing all permissions from asdf doesn't prevent me from deleting it (although I wouldn't be able to modify it) it is the write permission on the parent directory that controls whether or not I can create or delete files. *Michael Heydon - IT Administrator * [EMAIL PROTECTED] 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] smbclient error message interpretation
Hi all, For sure I'm dense today. I use smbclient rarely - every few years just to test a new setup. I'm building a replacement server, and want to go from an smbpasswd setup to an ADS member setup. The smbpasswd setup has worked just fine for the Windows workstations, but we'd like the convenience of just maintaining the users in one place through Windows. So I'm going through the rough guide at http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/domain-member.html and have got to where the net ads join works. Then I'm trying to test it with smbclient. All that doc says is Use smbclient as usual, but specify the -k option. My problem obviously: I don't usually use smbclient. Smbclient takes me straight to an error message: Server not using user level security and no password supplied. This happens even when I've just been presented with a password prompt and given it what should be a good password. And it happens if the password is in the command line in the --user=username%password syntax. While I don't know quite what the first part of the message points to, the and no password supplied is, in common sense English, plain wrong. Obviously there a Samba English in which it's entirely correct and illuminating. What I'm looking for is the dictionary. Even more confusing: I get the exact same error message from smbclient on the smbpasswd-based box: smbclient //BLAH/BLAH --user=whit Password: ** Server not using user level security and no password supplied. (The difference from the first is just the omission of -k.) What? On this box, there are current users from our Windows clients. So maybe I'm using smbclient wrong, but how? In the ADS version of this, I've got security = ADS set in smb.conf. In the smbpasswd version, security's whatever it defaults to. Isn't ADS in the category of user level security? And on the smbpasswd-secured box, those users not specified in smb.conf have no access to the shares, so isn't that user level security? Something's being lost in my attempt at translation into common English. That leaves me at a loss as to what to look to fix. Apologies again for the fog I'm in with this. Thanks for all pointers. Whit -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] FreeBSD: Changing UNIX password - Password Chat?
2008/2/13, Edmundo Valle Neto [EMAIL PROTECTED]: Jon Theil Nielsen escreveu: I can't get my Samba PDC (FreeBSD 7,0-BETA3) changing UNIX passwords from Windows clients (Ctrl-Alt-Del). I now have the password chat debug active and I have loglevel 100. I am not certain about the syntax in the password chat. But if I from a console try to change the password of a given user (here testuser1), I see these lines: mflserver3# /usr/bin/passwd testuser1 Changing local password for testuser1 New Password: (entering the password) Retype New Password: (entering it again) From that i guess the expression in the chat would be: *Changing*local*password*for* %u\n *New*Password* %n\n *Retype*New*Password* %n\n No. %u is the username and %n is the newpassword. What*to*expect %n\n (send the password and a new line) What*to*expect*then %n\n (send the password again and a new line) Selected parts of the log shows: [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Changing*local*password*for*] received [Changing local password for testuser1 New Password:] match yes It matched the two first lines stopping at (New Password:) as you have a * at the end. Okay, I shoulden't have that trailing *? And wait. [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [testuser1 ] You sent an username to the New password: prompt??? It wasn't my intention, but I can see that's what happened. [2008/02/13 17:47:07, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(279) expect: expected [*New*Password*] received [ Retype New Password:] match yes It matched the second line stopping at (Retype New Password:) And wait. [2008/02/13 17:47:07, 10] smbd/chgpasswd.c:expect(290) expect: returning True [2008/02/13 17:47:07, 100] smbd/chgpasswd.c:expect(242) expect: sending [VerySecret ] You sent a VerySecret password (that obviously will not match the first) So, that part seemed to work. But obviously not compared to what happened above. [2008/02/13 17:47:10, 10] lib/util_sock.c:read_socket_with_timeout(476) read_socket_with_timeout: timeout read. select timed out. [2008/02/13 17:47:10, 100] smbd/chgpasswd.c:expect(279) expect: expected [*Retype*New*Password*] received [ Mismatch; try again, EOF to quit. New Password:] match no And again something is completely wrong, I see. As I said, I am far from confident with the syntax/mecanism here. So I would really appreciate some more explicit help. I have tried to modify the chat by removing the trailing * or by putting the expressions into double quotes - but with no luck. Again, what is going on in the console is exactely what I wrote above. What would then be tbe correct chat? Regards, Jon Theil Nielsen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba BDC, share host
Hello everyone, I am faced with a samba related problem, I have set up a PDC with a ldap backend. This PDC is working perfectly. I have also set up another samba box to act as my BDC. The BDC is working correctly as well. PDC:192.168.1.1 BDC:192.168.1.2 My PDC is currently sharing a few file shares. I would like my BDC to host a few file shares as well. I share the file like this,(this is in the BDC smb.conf file) [shared] comment = test share browseable = yes path = /home/shared public = yes valid users = @domain users when I browse to my BDC wit \\192.168.1.2\ I get a error saying that I do not have permissions to access this. The error message also states that the service is not started. In the BDC smb.conf files I have specified the following [global] workgroup = midgard server string = The Web obey pam restrictions = Yes passdb backend = ldapsam:ldap://192.168.1.1 passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* . syslog = 0 log file = /var/log/samba/log.%m max log size = 1000 logon script = logon.bat logon path = logon drive = H: dns proxy = No wins support = Yes ldap admin dn = cn=admin,dc=example,dc=net ldap group suffix = ou=Groups ldap machine suffix = ou=machines ldap suffix = dc=example,dc=net ldap user suffix = ou=People panic action = /usr/share/samba/panic-action %d invalid users = root [shared] comment = test share browseable = yes path = /home/shared public = yes valid users = @domain users Can anyone explain to me what is wrong with my BDC config files. Why can't I browse to it? -- REGARDS, Andy Z -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] FreeBSD: Changing UNIX password - Password Chat?
Oops, that was truncated a bit to much. But I hope you understand. I must be tired. Regards, Jon Theil Nielsen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] FreeBSD: Changing UNIX password - Password Chat?
Jon Theil Nielsen escreveu: 2008/2/13, Edmundo Valle Neto [EMAIL PROTECTED]: Jon Theil Nielsen escreveu: I can't get my Samba PDC (FreeBSD 7,0-BETA3) changing UNIX passwords from Windows clients (Ctrl-Alt-Del). I now have the password chat debug active and I have loglevel 100. I am not certain about the syntax in the password chat. But if I from a console try to change the password of a given user (here testuser1), I see these lines: mflserver3# /usr/bin/passwd testuser1 Changing local password for testuser1 New Password: (entering the password) Retype New Password: (entering it again) From that i guess the expression in the chat would be: *Changing*local*password*for* %u\n *New*Password* %n\n *Retype*New*Password* %n\n (...) And again something is completely wrong, I see. As I said, I am far from confident with the syntax/mecanism here. So I would really appreciate some more explicit help. I have tried to modify the chat by removing the trailing * or by putting the expressions into double quotes - but with no luck. Again, what is going on in the console is exactely what I wrote above. What would then be tbe correct chat? Regards, Jon Theil Nielsen Your problem is not the trailing *, you can't use %u. Its just strings with wildcards, WATCH THIS send this WATCH THIS send this. I think that even if you do that C*: it works as you have only one C and only one : before the first iteration. It matches anything in the middle, Cblablablablablablablab\nlablabla blablablabla: passwd chat = Changing local password for*\nNew Password* %n\n *Retype New Password* %n\n Have you ever used regular expressions? This is a hundred times simpler :) Its a sintax based on a unix program called expect that is used in automation. It feeds command line programs that doesn't accept options. Regards. Edmundo Valle Neto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Access denied when setting permissions
Steven Whaley [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] I have a windows 2003 AD domain and a server joined to that domain. Winbind is being used as an idmap. Most everything seems to work fine. My user can connect to the samba share from a windows host without entering credentials, so kerberos and authentication is working properly. But whenever I try to set permissions on the share, with a member of the Domain Admins group, from the Computer Management snap in I always get access denied errors. I have nt acl support turned on for the share. Perhaps this article will shed some light on the issue. It explains how Samba works with Windows ACL's. http://searchenterpriselinux.techtarget.com/tip/0,289483,sid39_gci1080966,00.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ldap passwd sync not working
Jerome Tournier escreveu: Le Tue, Feb 12, 2008 at 09:44:01AM -0200, Fabiano Caixeta Duarte a ecrit: Hi, there! When my XP users try to change passwords, they get a message saying that password has been changed. That's not true! I can confirmed you that the following configuration work for me: unix password sync = No ldap passwd sync = Yes passwd program = /usr/sbin/smbldap-passwd -u %u passwd chat = Changing password for*\nNew password* %n\n *Retype new password* %n\n I assume that your ldap sync passwd is enough (like I wanted to) because smb.conf tells us that passwd chat is not used if unix password sync is set to no. passwd chat (G) Note that this parameter only is only used if the unix password sync parameter is set to yes. So, as I told Edmundo in my last post, I tried using unix passord sync = yes passwd program = /usr/local/sbin/smbldap-passwd -u %u passwd chat = Changing UNIX password for %u*New*password:* %n\n *Retype new password:* %n\n and it sort of worked. Both samba and unix passwords were changed, but users get a message telling they don't have permission to change passwords. In addition, it takes too long since user try the operation until system respond. Could you post (or send me in PVT) your smb.conf. I think this will help a lot. Please inform either the version of OS, samba and openldap. I'm using FreeBSD 6.3 in both samba and openldap servers, Samba 3.0.26a and openldap 2.3.38. Not using PAM. -- Fabiano Caixeta Duarte Especialista em Redes de Computadores Linux User #195299 Ribeirão Preto - SP -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Wrong perms on new files/dirs using smbmount
Chris Smith wrote: On Wednesday 13 February 2008, Michael Lueck wrote: I mount several shares with this sort of syntax: /bin/mount -t cifs Subject line is misleading: smbmount != cifs. I get the idea from man smbmount that smbmount is merely a wrapper invoking mount -t cifs. Would you expect different results if I were using the smbmount binary instead? If so, I would gladly test that method. -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Wrong perms on new files/dirs using smbmount
Scott Lovenberg wrote: What are the samba server side settings(smb.conf) for the share you are mounting? [data] comment = Shared Application Data Files path = /srv/shares/data guest ok = no read only = no create mask = 0666 directory mask = 0777 Do you have inherit permissions set? from smb.conf(5) man page: Default: inherit permissions = no I set inherit acls = yes once for an ACL aware implementation for a client. Otherwise no specific acl/perm stuff at this time. -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] multiple login deny
Dear all I want to deny multiple login in domain with single user account what is the solution for it ?? $ cat ~/satish/url.txt http://www.linuxbug.org _ - Get the freedom to save as many mails as you wish. Click here to know how. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba+ACL+w2k domain
Hi, nix. I have set up samba as a member of w2k the domain, has made Share with ACL support. I distribute the rights through Windows ticks sucsessfully. But I can not be remove them - windows says that You can not remove the user because this object is inheriting permission from his parent After I remove inheritence on the share user still stays in the ACL withoue any permissions. Windows writes, that these rights are as though inherited. I do not know, that I do not so. FreeBSD 6.2 Samba Version 3.0.28 heimdal 1.0.1 Samba config: [global] workgroup = MYDOMAIN security = domain server string = ws01 Samba Server netbiosname = ws01 local master = no domain master = no preferred master = no dns proxy = no display charset = koi8-r unix charset = koi8-r dos charset = cp866 idmap uid = 1-2 idmap gid = 1-2 winbind cache time = 15 winbind enum users = Yes winbind enum groups = Yes hosts allow = 192.168.0. 192.168.1. 127. bind interfaces only = Yes interfaces = 192.168.0.125 log file = /var/log/samba/log.%m max log size = 50 load printers = no # Share Definitions == [store] comment = qwerty! path = /store read list = @MYDOMAIN\Domain Users write list = @MYDOMAIN\Domain Admins admin users = @MYDOMAIN\Domain Admins, [EMAIL PROTECTED] read only = No create mask = 700 directory mask = 700 inherit owner = yes inherit acls = yes inherit permissions = yes map acl inherit = yes locking = nophotoarch Anybody help me please! -- Best regards, nix_kot 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] Default Posix ACLs not honoured
Hi all, we are experiencing difficulties with posix ACLs using samba 3.0.28 on a Debian 4.0 etch server. The goal is to not let the Windows clients manage the ACLs but instead set the permissions from the Samba server, hence smb.conf says nt acl support = no. Problems arise when I have a directory with default permissions for a named group, e.g. # file: ACLTest # owner: juergen # group: users user::rwx group::rwx group:msr-systems:r-x mask::rwx other::--- default:user::rwx default:group::rwx default:group:msr-systems:r-x default:mask::rwx default:other::--- When user juergen creates a file within directory ACLTest I would expect it to have user::rw- group::rwx #effective:rw- group:msr-systems:r-x #effective:r-- mask::rw- other::--- But what the files get instead is user::rw- group::rw- group:msr-systems:r-x mask::rwx other::rw- What is Samba doing here? It can't be the Windows client, because nt acl support is disabled, right? I mean, when there are no posix ACLs in the file system standard ugo perms/suid/sgid always behave as you would expect from Linux. -- Juergen Beurskens -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Virus found in the message
SHAME ON YOU, TRYING TO GET ME TO BITE AT YOUR ERRONUS EFFORT TO GET ME TO BUY YOUR, MORE THAN LIKELY, SUB-STANDARD PRODUCT. GET STUFFED PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-795-g36a31f3
The branch, v4-0-test has been updated via 36a31f31c4c01f4ebf1359650c497a1ba447e6d0 (commit) from df82b0aa6990b59cde20893cb690a8a260526178 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test - Log - commit 36a31f31c4c01f4ebf1359650c497a1ba447e6d0 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Tue Feb 12 14:39:52 2008 +0100 Makefile: --enable-automatic-dependencies usage metze --- Summary of changes: source/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile b/source/Makefile index a5f32e1..a99dc82 100644 --- a/source/Makefile +++ b/source/Makefile @@ -21,6 +21,7 @@ HOSTLD_FLAGS = $(LDFLAGS) default: all +include rules.mk include data.mk DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ @@ -175,7 +176,6 @@ testcov-html:: include pidl/config.mk include selftest/config.mk -include rules.mk showflags:: @echo ' pwd= '`/bin/pwd` -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2159-gbc4482c
The branch, v3-2-test has been updated via bc4482cde1571bb1cb2d55106fc8ee22d26efa23 (commit) via 97a60565ad6657af8e4a3b8b38b69b48597e3eec (commit) via d1bec3882908086747e1176a275617700cada097 (commit) via dddfdee90ee30d225e08d7f1685409f62fabf7c1 (commit) via 71b990d9d687b517dec3d4eff67b6a3fe417a12a (commit) via 880238c65c13c8b280e2f34431aa331a16af4a7b (commit) via ed2337e3a24e800e0a445a9ffc7d735d49abc6d7 (commit) via cb7f42bcbc6cbe84823402cd3c7bb9327669ed9b (commit) from 5116c9d9f4bd1a523ac7a2a31b3b1552388f040f (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit bc4482cde1571bb1cb2d55106fc8ee22d26efa23 Author: Michael Adam [EMAIL PROTECTED] Date: Tue Feb 12 15:28:51 2008 +0100 Fix some comment typos. Michael commit 97a60565ad6657af8e4a3b8b38b69b48597e3eec Author: Michael Adam [EMAIL PROTECTED] Date: Tue Feb 12 15:26:00 2008 +0100 Remove some unneded variables: we always build and install some talloc libs. LIBTALLOC, INSTALL_LIBTALLOC, UNINSTALL_LIBTALLOC Michael commit d1bec3882908086747e1176a275617700cada097 Author: Michael Adam [EMAIL PROTECTED] Date: Tue Feb 12 15:18:56 2008 +0100 Put talloc lib targets into variables and uses these. LIBTALLOC_STATIC_TARGET and LIBTALLOC_SHARED_TARGET. Michael commit dddfdee90ee30d225e08d7f1685409f62fabf7c1 Author: Michael Adam [EMAIL PROTECTED] Date: Tue Feb 12 14:43:20 2008 +0100 Simplify code by moving duplicate assignment to common place. Michael commit 71b990d9d687b517dec3d4eff67b6a3fe417a12a Author: Michael Adam [EMAIL PROTECTED] Date: Fri Feb 8 14:41:30 2008 +0100 Add support for linking talloc library statically or dynamically into samba. This also establishes a general configure mechanism to control static vs dynamic linking of internal subsystems built as libraries: This first simple approach is as follows. * It applies only to subsystems that we build as libraries and for that linking samba against the libraries (as opposed to linking in the plain object files) has been configured in Makefile.in. * If we do build the shared library, then we link dynamically by default. * We only link statically if we don't build shared or if the library appears in the new --with-static-libs configure option (comma-separated list). Example (currently only one): --with-static-libs=talloc makes use of libtalloc.a instead of linking the dynamic variant with -ltalloc. A possilble way to setup linking against libraries in Makefile.in is this: For a subsystem, mylib say, we build bin/libmylib.a and bin/libmylib.so. The subsystem usually has a MYLIB_OBJ definition in Makefile.in. Define LIBMYLIB_STATIC=bin/libmylib.a and and LIBMYLIB_LIBS=-lmylib in configure.in as controlled by presence of mylib in the list given to --with-static-libs and change uses of $(MYLIB_OBJ) to @LIBMYLIB_STATIC@ in Makefile.in and add @LIBMYLIB_LIBS@ to the link targets as needed. In the example of talloc, which is needed everywhere, I have simply added @LIBTALLOC_LIBS@ to the definition of LIBS in Makefile.in. For other subsystems, one will have to be more careful. Michael commit 880238c65c13c8b280e2f34431aa331a16af4a7b Author: Michael Adam [EMAIL PROTECTED] Date: Fri Feb 8 17:16:51 2008 +0100 Use data from lib/talloc/libtalloc.m4 instead of hard coded data. Michael commit ed2337e3a24e800e0a445a9ffc7d735d49abc6d7 Author: Michael Adam [EMAIL PROTECTED] Date: Mon Feb 11 16:09:19 2008 +0100 Move the AC_LIBREPLACE_CC_CHECKS up before building SAMBA_CPPFLAGS. Michael commit cb7f42bcbc6cbe84823402cd3c7bb9327669ed9b Author: Michael Adam [EMAIL PROTECTED] Date: Fri Feb 8 01:00:03 2008 +0100 Add support for building libtalloc.a and libtalloc.so. Michael --- Summary of changes: source/Makefile.in | 46 +++ source/configure.in| 105 +--- source/library-versions.in |1 + 3 files changed, 135 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 4c1fef4..5de5bc4 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -18,7 +18,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @LIBTALLOC_LIBS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -141,6 +141,9 @@ CODEPAGEDIR = @codepagedir@ # the directory where pid files go PIDDIR = @piddir@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ +LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ LIBSMBCLIENT=bin/libsmbclient.a
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2160-gcd5bf34
The branch, v3-2-test has been updated
via cd5bf3449adee7537ae6ca4e3b398e99d34555fd (commit)
from bc4482cde1571bb1cb2d55106fc8ee22d26efa23 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit cd5bf3449adee7537ae6ca4e3b398e99d34555fd
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 12 23:30:44 2008 +0100
Some minor, cosmetic cleanup in srv_samr_util.c.
Guenther
---
Summary of changes:
source/rpc_server/srv_samr_util.c | 166 -
1 files changed, 108 insertions(+), 58 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_samr_util.c
b/source/rpc_server/srv_samr_util.c
index cc08d53..364adbc 100644
--- a/source/rpc_server/srv_samr_util.c
+++ b/source/rpc_server/srv_samr_util.c
@@ -56,9 +56,11 @@ void copy_id20_to_sam_passwd(struct samu *to,
mung.free = NULL;
new_string = (mung.length == 0) ?
NULL : base64_encode_data_blob(talloc_tos(), mung);
- DEBUG(10,(INFO_20 PARAMETERS: %s - %s\n,old_string,
new_string));
- if (STRING_CHANGED_NC(old_string,new_string))
- pdb_set_munged_dial(to , new_string, PDB_CHANGED);
+ DEBUG(10,(INFO_20 PARAMETERS: %s - %s\n,
+ old_string, new_string));
+ if (STRING_CHANGED_NC(old_string,new_string)) {
+ pdb_set_munged_dial(to, new_string, PDB_CHANGED);
+ }
TALLOC_FREE(new_string);
}
@@ -88,116 +90,146 @@ void copy_id21_to_sam_passwd(const char *log_prefix,
}
if (from-fields_present SAMR_FIELD_LAST_LOGON) {
- unix_time=nt_time_to_unix(from-last_logon);
+ unix_time = nt_time_to_unix(from-last_logon);
stored_time = pdb_get_logon_time(to);
- DEBUG(10,(%s SAMR_FIELD_LAST_LOGON: %lu - %lu\n, l, (long
unsigned int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ DEBUG(10,(%s SAMR_FIELD_LAST_LOGON: %lu - %lu\n, l,
+ (long unsigned int)stored_time,
+ (long unsigned int)unix_time));
+ if (stored_time != unix_time) {
pdb_set_logon_time(to, unix_time, PDB_CHANGED);
+ }
}
if (from-fields_present SAMR_FIELD_LAST_LOGOFF) {
- unix_time=nt_time_to_unix(from-last_logoff);
+ unix_time = nt_time_to_unix(from-last_logoff);
stored_time = pdb_get_logoff_time(to);
- DEBUG(10,(%s SAMR_FIELD_LAST_LOGOFF: %lu - %lu\n, l, (long
unsigned int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ DEBUG(10,(%s SAMR_FIELD_LAST_LOGOFF: %lu - %lu\n, l,
+ (long unsigned int)stored_time,
+ (long unsigned int)unix_time));
+ if (stored_time != unix_time) {
pdb_set_logoff_time(to, unix_time, PDB_CHANGED);
+ }
}
if (from-fields_present SAMR_FIELD_ACCT_EXPIRY) {
- unix_time=nt_time_to_unix(from-acct_expiry);
+ unix_time = nt_time_to_unix(from-acct_expiry);
stored_time = pdb_get_kickoff_time(to);
- DEBUG(10,(%s SAMR_FIELD_ACCT_EXPIRY: %lu - %lu\n, l, (long
unsigned int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ DEBUG(10,(%s SAMR_FIELD_ACCT_EXPIRY: %lu - %lu\n, l,
+ (long unsigned int)stored_time,
+ (long unsigned int)unix_time));
+ if (stored_time != unix_time) {
pdb_set_kickoff_time(to, unix_time , PDB_CHANGED);
+ }
}
if (from-fields_present SAMR_FIELD_LAST_PWD_CHANGE) {
- unix_time=nt_time_to_unix(from-last_password_change);
+ unix_time = nt_time_to_unix(from-last_password_change);
stored_time = pdb_get_pass_last_set_time(to);
- DEBUG(10,(%s SAMR_FIELD_LAST_PWD_CHANGE: %lu - %lu\n, l,
(long unsigned int)stored_time, (long unsigned int)unix_time));
- if (stored_time != unix_time)
+ DEBUG(10,(%s SAMR_FIELD_LAST_PWD_CHANGE: %lu - %lu\n, l,
+ (long unsigned int)stored_time,
+ (long unsigned int)unix_time));
+ if (stored_time != unix_time) {
pdb_set_pass_last_set_time(to, unix_time, PDB_CHANGED);
+ }
}
if ((from-fields_present SAMR_FIELD_ACCOUNT_NAME)
(from-account_name.string)) {
old_string =
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2161-gb1deb11
The branch, v3-2-test has been updated
via b1deb11a19f09325449fd30fb364173f9ba9d681 (commit)
from cd5bf3449adee7537ae6ca4e3b398e99d34555fd (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit b1deb11a19f09325449fd30fb364173f9ba9d681
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 09:48:42 2008 +0100
Add forgotten file exports/libtalloc.syms ... Thanks Günther!
Michael
---
Summary of changes:
source/exports/{libnetapi.syms = libtalloc.syms} |0
1 files changed, 0 insertions(+), 0 deletions(-)
copy source/exports/{libnetapi.syms = libtalloc.syms} (100%)
Changeset truncated at 500 lines:
diff --git a/source/exports/libnetapi.syms b/source/exports/libtalloc.syms
similarity index 100%
copy from source/exports/libnetapi.syms
copy to source/exports/libtalloc.syms
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2165-g9312755
The branch, v3-2-test has been updated
via 9312755955eac9897c8117773f8cd7d1652b2bca (commit)
from 243bdaeea7900ab6a65edfda877e8c225ec7b213 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 9312755955eac9897c8117773f8cd7d1652b2bca
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:27:15 2008 +0100
Remove unused marshalling for NET_TRUST_DOM_LIST.
Guenther
---
Summary of changes:
source/include/rpc_netlogon.h | 16 --
source/rpc_parse/parse_net.c | 102 -
2 files changed, 0 insertions(+), 118 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index bab2caa..f2802b8 100644
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -398,22 +398,6 @@ typedef struct net_r_logon_ctrl2_info {
NTSTATUS status; /* return code */
} NET_R_LOGON_CTRL2;
-/* NET_Q_TRUST_DOM_LIST - LSA Query Trusted Domains */
-typedef struct net_q_trust_dom_info {
- uint32 ptr; /* undocumented buffer pointer */
- UNISTR2 uni_server_name; /* server name, starting with two '\'s */
-} NET_Q_TRUST_DOM_LIST;
-
-#define MAX_TRUST_DOMS 1
-
-/* NET_R_TRUST_DOM_LIST - response to LSA Trusted Domains */
-typedef struct net_r_trust_dom_info {
- UNISTR2 uni_trust_dom_name[MAX_TRUST_DOMS];
-
- NTSTATUS status; /* return code */
-} NET_R_TRUST_DOM_LIST;
-
-
/* NEG_FLAGS */
typedef struct neg_flags_info {
uint32 neg_flags; /* negotiated flags */
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 55af821..257f461 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -479,108 +479,6 @@ bool net_io_r_logon_ctrl(const char *desc,
NET_R_LOGON_CTRL *r_l, prs_struct *ps
}
/***
- Inits an NET_R_TRUST_DOM_LIST structure.
-/
-
-void init_r_trust_dom(NET_R_TRUST_DOM_LIST *r_t,
- uint32 num_doms, const char *dom_name)
-{
- unsigned int i = 0;
-
- DEBUG(5,(init_r_trust_dom\n));
-
- for (i = 0; i MAX_TRUST_DOMS; i++) {
- r_t-uni_trust_dom_name[i].uni_str_len = 0;
- r_t-uni_trust_dom_name[i].uni_max_len = 0;
- }
- if (num_doms MAX_TRUST_DOMS)
- num_doms = MAX_TRUST_DOMS;
-
- for (i = 0; i num_doms; i++) {
- fstring domain_name;
- fstrcpy(domain_name, dom_name);
- strupper_m(domain_name);
- init_unistr2(r_t-uni_trust_dom_name[i], domain_name,
UNI_STR_TERMINATE);
- /* the use of UNISTR2 here is non-standard. */
- r_t-uni_trust_dom_name[i].offset = 0x1;
- }
-
- r_t-status = NT_STATUS_OK;
-}
-
-/***
- Reads or writes an NET_R_TRUST_DOM_LIST structure.
-/
-
-bool net_io_r_trust_dom(const char *desc, NET_R_TRUST_DOM_LIST *r_t,
prs_struct *ps, int depth)
-{
- uint32 value;
-
- if (r_t == NULL)
-return False;
-
- prs_debug(ps, depth, desc, net_io_r_trust_dom);
- depth++;
-
- /* temporary code to give a valid response */
- value=2;
- if(!prs_uint32(status, ps, depth, value))
-return False;
-
- value=1;
- if(!prs_uint32(status, ps, depth, value))
-return False;
- value=2;
- if(!prs_uint32(status, ps, depth, value))
-return False;
-
- value=0;
- if(!prs_uint32(status, ps, depth, value))
-return False;
-
- value=0;
- if(!prs_uint32(status, ps, depth, value))
-return False;
-
-/* old non working code */
-#if 0
- int i;
-
- for (i = 0; i MAX_TRUST_DOMS; i++) {
- if (r_t-uni_trust_dom_name[i].uni_str_len == 0)
- break;
- if(!smb_io_unistr2(, r_t-uni_trust_dom_name[i], True, ps,
depth))
-return False;
- }
-
- if(!prs_ntstatus(status, ps, depth, r_t-status))
-return False;
-#endif
- return True;
-}
-
-
-/***
- Reads or writes an NET_Q_TRUST_DOM_LIST structure.
-/
-
-bool net_io_q_trust_dom(const char *desc, NET_Q_TRUST_DOM_LIST *q_l,
prs_struct *ps, int depth)
-{
- if (q_l == NULL)
-return False;
-
- prs_debug(ps, depth, desc, net_io_q_trust_dom);
- depth++;
-
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2162-ge904a3d
The branch, v3-2-test has been updated via e904a3dd532d7510ac2393e598b3edcf8e1349e8 (commit) from b1deb11a19f09325449fd30fb364173f9ba9d681 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit e904a3dd532d7510ac2393e598b3edcf8e1349e8 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 10:11:43 2008 +0100 Add linking -ltalloc to libwbclient.so. Noted by Metze. Michael --- Summary of changes: source/Makefile.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 5de5bc4..50dfe4a 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1453,9 +1453,9 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTALLOC_OBJ0) -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) \ + @$(SHLD_DSO) @LIBTALLOC_LIBS@ $(LIBWBCLIENT_OBJ) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) @ln -s -f `basename [EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2166-g26d012d
The branch, v3-2-test has been updated
via 26d012dd3de8ec146eb22656f1ed8eef110e4be6 (commit)
from 9312755955eac9897c8117773f8cd7d1652b2bca (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 26d012dd3de8ec146eb22656f1ed8eef110e4be6
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 10:36:43 2008 +0100
Fix install: Add creation of include dir to installlibtalloc target.
Michael
---
Summary of changes:
source/Makefile.in |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 50dfe4a..5d78b99 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1959,6 +1959,7 @@ installlibtalloc: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) ${prefix}/include
-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h
$(DESTDIR)${prefix}/include
installlibsmbsharemodes: installdirs libsmbsharemodes
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2163-g9fca3ca
The branch, v3-2-test has been updated
via 9fca3ca37eaf10c24f852e854dd28b7155c3e536 (commit)
from e904a3dd532d7510ac2393e598b3edcf8e1349e8 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 9fca3ca37eaf10c24f852e854dd28b7155c3e536
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:19:06 2008 +0100
Merge data_blob_talloc_zero() from samba4.
Guenther
---
Summary of changes:
source/lib/data_blob.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/data_blob.c b/source/lib/data_blob.c
index 8bbbc32..daba17d 100644
--- a/source/lib/data_blob.c
+++ b/source/lib/data_blob.c
@@ -144,3 +144,15 @@ DATA_BLOB data_blob_const(const void *p, size_t length)
blob.free = NULL;
return blob;
}
+
+/**
+ construct a zero data blob, using supplied TALLOC_CTX.
+ use this sparingly as it initialises data - better to initialise
+ yourself if you want specific data in the blob
+**/
+DATA_BLOB data_blob_talloc_zero(TALLOC_CTX *mem_ctx, size_t length)
+{
+ DATA_BLOB blob = data_blob_talloc(mem_ctx, NULL, length);
+ data_blob_clear(blob);
+ return blob;
+}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2168-g135d9dd
The branch, v3-2-test has been updated
via 135d9dd6d830ce6ae5c7917468763aa9a148d76a (commit)
via 5f623f54a919cc687d0ff16c16038c05a501008d (commit)
from 26d012dd3de8ec146eb22656f1ed8eef110e4be6 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 135d9dd6d830ce6ae5c7917468763aa9a148d76a
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Feb 11 18:36:45 2008 +0100
libwbclient: include wb_common.o in libwbclient.a
And only link in wb_common.o directly into binaries
which really need it.
Note: It's important that $(WBCOMMON_OBJ) comes before
@LIBWBCLIENT_STATIC@ overwise we may try to
link in wb_common.o twice.
metze
commit 5f623f54a919cc687d0ff16c16038c05a501008d
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Feb 11 18:35:58 2008 +0100
nsswitch: convert winbind_env_set(), winbind_on() and winbind_off() into
macros
metze
---
Summary of changes:
source/Makefile.in | 22 --
source/lib/system_smbd.c |4 ++--
source/nsswitch/wb_common.c | 27 ---
source/nsswitch/winbind_client.h | 11 ---
source/passdb/pdb_interface.c|4 ++--
source/winbindd/idmap_nss.c |8
6 files changed, 28 insertions(+), 48 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 5d78b99..4b11965 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -328,7 +328,6 @@ LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o
lib/debug.o lib/fault.o \
lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
lib/md5.o lib/hmacmd5.o lib/arc4.o lib/iconv.o \
- $(WBCOMMON_OBJ) \
lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \
lib/adt_tree.o lib/gencache.o $(TDB_OBJ) \
lib/module.o lib/events.o lib/ldap_escape.o @CHARSET_STATIC@ \
@@ -642,8 +641,9 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV)
$(LIBSMB_OBJ) \
$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
- $(REGISTRY_OBJ) $(POPT_LIB_OBJ) @LIBWBCLIENT_STATIC@ \
- $(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ)
+ $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
+ $(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) \
+ $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_cups.o printing/print_generic.o \
@@ -798,14 +798,15 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_domain.o
utils/net_help.o \
utils/net_conf.o auth/token_util.o utils/net_dom.o
nsswitch/wb_client.o
NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
+ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
$(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
- $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(LIBNETAPI_OBJ1) $(LIBNET_OBJ)
+ $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(LIBNETAPI_OBJ1)
$(LIBNET_OBJ) \
+ $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
@@ -972,7 +973,7 @@ WINBINDD_OBJ = \
WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
\
$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ)
$(RPC_PARSE_OBJ1) \
- $(DOSERR_OBJ) lib/winbind_util.o @LIBWBCLIENT_STATIC@
+ $(DOSERR_OBJ) lib/winbind_util.o $(WBCOMMON_OBJ)
@LIBWBCLIENT_STATIC@
WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
@@ -1038,9 +1039,10 @@ NTLM_AUTH_OBJ1 = utils/ntlm_auth.o
utils/ntlm_auth_diagnostics.o
NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o
libads/kerberos.o \
libads/kerberos_verify.o $(SECRETS_OBJ) $(SERVER_MUTEX_OBJ) \
- libads/authdata.o $(RPC_PARSE_OBJ1) $(PASSDB_OBJ)
@LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
+ libads/authdata.o $(RPC_PARSE_OBJ1) $(PASSDB_OBJ)
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2172-gc6db963
The branch, v3-2-test has been updated
via c6db963dacb04a9b2ee12705d8cfb29b843c0ea2 (commit)
via 34c2566f026dbde4da10e2fc10c6960260eb6044 (commit)
via c19847a02486414117425930367dcd210e911715 (commit)
from fa3a78b815e0bcbb4ac08b6277f798593c0458e9 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit c6db963dacb04a9b2ee12705d8cfb29b843c0ea2
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:54:56 2008 +0100
Remove unused marshalling for SAMR_LOOKUP_RIDS.
Guenther
commit 34c2566f026dbde4da10e2fc10c6960260eb6044
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:49:55 2008 +0100
Convert last caller (in winbindd) to rpccli_samr_LookupRids.
Guenther
commit c19847a02486414117425930367dcd210e911715
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:54:16 2008 +0100
Remove unused init_sam_entry routine.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 44 -
source/rpc_client/cli_samr.c | 74 --
source/rpc_parse/parse_samr.c | 210
source/winbindd/winbindd_rpc.c | 48 +-
4 files changed, 25 insertions(+), 351 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 28bd807..9b9b4d2 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -227,50 +227,6 @@ typedef struct r_samr_enum_dom_aliases_info
} SAMR_R_ENUM_DOM_ALIASES;
-/
-SAMR_Q_LOOKUP_RIDS - do a conversion from RID groups to something.
-
-called to resolve domain RID groups.
-*/
-/* SAMR_Q_LOOKUP_RIDS */
-typedef struct q_samr_lookup_rids_info
-{
- POLICY_HND pol; /* policy handle */
-
- uint32 num_rids1; /* number of rids being looked up */
- uint32 flags; /* 0x 03e8 - unknown */
- uint32 ptr;/* 0x - 32 bit unknown */
- uint32 num_rids2; /* number of rids being looked up */
-
- uint32 *rid; /* domain RIDs being looked up */
-
-} SAMR_Q_LOOKUP_RIDS;
-
-
-/
-SAMR_R_LOOKUP_RIDS - do a conversion from group RID to names
-
-*/
-/* SAMR_R_LOOKUP_RIDS */
-typedef struct r_samr_lookup_rids_info
-{
- uint32 num_names1; /* number of aliases being looked up */
- uint32 ptr_names; /* pointer to aliases */
- uint32 num_names2; /* number of aliases being looked up */
-
- UNIHDR *hdr_name; /* unicode account name header */
- UNISTR2 *uni_name; /* unicode account name string */
-
- uint32 num_types1; /* number of users in aliases being looked up */
- uint32 ptr_types; /* pointer to users in aliases */
- uint32 num_types2; /* number of users in aliases being looked up */
-
- uint32 *type; /* SID_ENUM type */
-
- NTSTATUS status;
-
-} SAMR_R_LOOKUP_RIDS;
-
/* these are from the old rpc_samr.h - they are needed while the merge
is still going on */
#define MAX_SAM_SIDS 15
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 2bb837b..a994db9 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -383,77 +383,3 @@ void get_query_dispinfo_params(int loop_count, uint32
*max_entries,
break;
}
}
-
-/* Lookup rids. Note that NT4 seems to crash if more than ~1000 rids are
- looked up in one packet. */
-
-NTSTATUS rpccli_samr_lookup_rids(struct rpc_pipe_client *cli,
-TALLOC_CTX *mem_ctx,
-POLICY_HND *domain_pol,
-uint32 num_rids, uint32 *rids,
-uint32 *num_names, char ***names,
-uint32 **name_types)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_LOOKUP_RIDS q;
- SAMR_R_LOOKUP_RIDS r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- uint32 i;
-
- DEBUG(10,(cli_samr_lookup_rids\n));
-
-if (num_rids 1000) {
-DEBUG(2, (cli_samr_lookup_rids: warning: NT4 can crash if
- more than ~1000 rids are looked up at once.\n));
-}
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_lookup_rids(mem_ctx, q, domain_pol, 1000, num_rids, rids);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_LOOKUP_RIDS,
- q, r,
- qbuf, rbuf,
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2169-gfa3a78b
The branch, v3-2-test has been updated via fa3a78b815e0bcbb4ac08b6277f798593c0458e9 (commit) from 135d9dd6d830ce6ae5c7917468763aa9a148d76a (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit fa3a78b815e0bcbb4ac08b6277f798593c0458e9 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 10:52:16 2008 +0100 Fix build: Add missing prerequisites for libwbclient.so Michael --- Summary of changes: source/Makefile.in |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 4b11965..fc8c4a3 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1382,11 +1382,11 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@ -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBWBCLIENT_SHARED@ @@ -1475,7 +1475,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED@ $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @@ -1485,7 +1485,7 @@ bin/libnetapi.a: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBNETAPI_OBJ) -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) @LIBWBCLIENT_SHARED@ $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-797-g5100452
The branch, v4-0-test has been updated
via 5100452cf3b3c3c5dcdb77a9efe27e8c506d1d43 (commit)
via d6cdddbcf37d120cb365bc7f8188858c8776e2e0 (commit)
from 36a31f31c4c01f4ebf1359650c497a1ba447e6d0 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit 5100452cf3b3c3c5dcdb77a9efe27e8c506d1d43
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Feb 13 10:41:57 2008 +0100
idl_types: remove unused lstring
metze
commit d6cdddbcf37d120cb365bc7f8188858c8776e2e0
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Feb 13 10:36:49 2008 +0100
spoolss.idl: improve idl for EnumPrinterData and not use 'lstring' any more
metze
---
Summary of changes:
source/librpc/idl/idl_types.h |5 -
source/librpc/idl/spoolss.idl | 11 ++-
source/torture/rpc/spoolss.c | 22 +++---
3 files changed, 21 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/idl/idl_types.h b/source/librpc/idl/idl_types.h
index 01524c2..9885ca5 100644
--- a/source/librpc/idl/idl_types.h
+++ b/source/librpc/idl/idl_types.h
@@ -10,11 +10,6 @@
#define STR_UTF8 LIBNDR_FLAG_STR_UTF8
/*
- a UCS2 string prefixed with [size], 32 bits
-*/
-#define lstring[flag(STR_SIZE4)] string
-
-/*
a null terminated UCS2 string
*/
#define nstring[flag(STR_NULLTERM)] string
diff --git a/source/librpc/idl/spoolss.idl b/source/librpc/idl/spoolss.idl
index 33b4dba..2144393 100644
--- a/source/librpc/idl/spoolss.idl
+++ b/source/librpc/idl/spoolss.idl
@@ -1407,12 +1407,13 @@ import security.idl, winreg.idl;
WERROR spoolss_EnumPrinterData(
[in,ref] policy_handle *handle,
[in] uint32 enum_index,
+ [out,ref,size_is(value_offered/2),charset(UTF16)] uint16
*value_name,
[in] uint32 value_offered,
- [out]lstring value_name,
- [out]uint32 value_needed,
- [out]uint32 printerdata_type,
- [out]DATA_BLOB buffer,
- [in,out,ref] uint32 *data_size
+ [out,ref] uint32 *value_needed,
+ [out,ref] uint32 *printerdata_type,
+ [out,ref] DATA_BLOB *buffer,
+ [in] uint32 data_offered,
+ [out,ref] uint32 *data_needed
);
/**/
diff --git a/source/torture/rpc/spoolss.c b/source/torture/rpc/spoolss.c
index 23b4aad..4a6ff48 100644
--- a/source/torture/rpc/spoolss.c
+++ b/source/torture/rpc/spoolss.c
@@ -1178,16 +1178,23 @@ static bool test_EnumPrinterData(struct torture_context
*tctx, struct dcerpc_pip
NTSTATUS status;
struct spoolss_EnumPrinterData r;
+ ZERO_STRUCT(r);
r.in.handle = handle;
r.in.enum_index = 0;
do {
- uint32_t data_size;
-
- r.in.value_offered = 0;
- data_size = 0;
- r.in.data_size = data_size;
- r.out.data_size = data_size;
+ uint32_t value_size = 0;
+ uint32_t data_size = 0;
+ uint32_t printerdata_type = 0;
+ DATA_BLOB data = data_blob(NULL,0);
+
+ r.in.value_offered = value_size;
+ r.out.value_needed = value_size;
+ r.in.data_offered = data_size;
+ r.out.data_needed = data_size;
+
+ r.out.printerdata_type = printerdata_type;
+ r.out.buffer = data;
torture_comment(tctx, Testing EnumPrinterData\n);
@@ -1195,7 +1202,8 @@ static bool test_EnumPrinterData(struct torture_context
*tctx, struct dcerpc_pip
torture_assert_ntstatus_ok(tctx, status, EnumPrinterData
failed);
- r.in.value_offered = r.out.value_needed;
+ r.in.value_offered = value_size;
+ r.in.data_offered = data_size;
status = dcerpc_spoolss_EnumPrinterData(p, tctx, r);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2164-g243bdae
The branch, v3-2-test has been updated
via 243bdaeea7900ab6a65edfda877e8c225ec7b213 (commit)
from 9fca3ca37eaf10c24f852e854dd28b7155c3e536 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 243bdaeea7900ab6a65edfda877e8c225ec7b213
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 10:23:45 2008 +0100
Use pidl for _netr_NetrEnumerateTrustedDomains().
This call is completely broken. For now, just make sure that we return the
exact same
data as before the conversion to pidl.
Guenther
---
Summary of changes:
source/rpc_server/srv_netlog.c| 46 +---
source/rpc_server/srv_netlog_nt.c | 32 +++--
2 files changed, 36 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index 30ef02b..4f0a014 100644
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -28,6 +28,27 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
+/***
+ /
+
+static bool proxy_netr_call(pipes_struct *p, uint8 opnum)
+{
+ struct api_struct *fns;
+ int n_fns;
+
+ netlogon_get_pipe_fns(fns, n_fns);
+
+ if (opnum = n_fns) {
+ return false;
+ }
+
+ if (fns[opnum].opnum != opnum) {
+ smb_panic(NETLOGON function table not sorted);
+ }
+
+ return fns[opnum].fn(p);
+}
+
/*
api_net_req_chal:
*/
@@ -218,30 +239,7 @@ static bool api_net_sam_logon(pipes_struct *p)
static bool api_net_trust_dom_list(pipes_struct *p)
{
- NET_Q_TRUST_DOM_LIST q_u;
- NET_R_TRUST_DOM_LIST r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* grab the lsa trusted domain list query... */
- if(!net_io_q_trust_dom(, q_u, data, 0)) {
- DEBUG(0,(api_net_trust_dom_list: Failed to unmarshall
NET_Q_TRUST_DOM_LIST.\n));
- return False;
- }
-
- /* construct reply. */
- r_u.status = _net_trust_dom_list(p, q_u, r_u);
-
- /* store the response in the SMB stream */
- if(!net_io_r_trust_dom(, r_u, rdata, 0)) {
- DEBUG(0,(net_reply_trust_dom_list: Failed to marshall
NET_R_TRUST_DOM_LIST.\n));
- return False;
- }
-
- return True;
+ return proxy_netr_call(p, NDR_NETR_NETRENUMERATETRUSTEDDOMAINS);
}
/*
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index 3a7075e..528a339 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -145,22 +145,28 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p,
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
}
/*
- net_reply_trust_dom_list:
+ _netr_NetrEnumerateTrustedDomains
*/
-NTSTATUS _net_trust_dom_list(pipes_struct *p, NET_Q_TRUST_DOM_LIST *q_u,
NET_R_TRUST_DOM_LIST *r_u)
+WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
+struct
netr_NetrEnumerateTrustedDomains *r)
{
- const char *trusted_domain = test_domain;
- uint32 num_trust_domains = 1;
+ struct netr_Blob trusted_domains_blob;
+ DATA_BLOB blob;
- DEBUG(6,(_net_trust_dom_list: %d\n, __LINE__));
+ DEBUG(6,(_netr_NetrEnumerateTrustedDomains: %d\n, __LINE__));
/* set up the Trusted Domain List response */
- init_r_trust_dom(r_u, num_trust_domains, trusted_domain);
- DEBUG(6,(_net_trust_dom_list: %d\n, __LINE__));
+ blob = data_blob_talloc_zero(p-mem_ctx, 2);
+ trusted_domains_blob.data = blob.data;
+ trusted_domains_blob.length = blob.length;
- return r_u-status;
+ DEBUG(6,(_netr_NetrEnumerateTrustedDomains: %d\n, __LINE__));
+
+ *r-out.trusted_domains_blob = trusted_domains_blob;
+
+ return WERR_OK;
}
/***
@@ -1331,16 +1337,6 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
/
/
-WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
-struct
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2174-gd950174
The branch, v3-2-test has been updated
via d950174bcb50ecb70dfef71d4201feec4985c08b (commit)
via 90bdd0fa2ee09bab8c661c241f5d5fe8fc57016b (commit)
from c6db963dacb04a9b2ee12705d8cfb29b843c0ea2 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit d950174bcb50ecb70dfef71d4201feec4985c08b
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 11:03:18 2008 +0100
Change hand written configure help strings to use AS_HELP_STRING().
Michael
commit 90bdd0fa2ee09bab8c661c241f5d5fe8fc57016b
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 09:34:40 2008 +0100
Use AS_HELP_STRING instead of (deprecated) AC_HELP_STRING.
Existence is guaranteed by libreplace.
Michael
---
Summary of changes:
source/configure.in | 125 +--
1 files changed, 62 insertions(+), 63 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 074bdfa..f3187aa 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -60,7 +60,7 @@ statedir=\${LOCKDIR}
cachedir=\${LOCKDIR}
AC_ARG_WITH(fhs,
-[ --with-fhs Use FHS-compliant paths (default=no)],
+[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
[ case $withval in
yes)
lockdir=\${VARDIR}/lib/samba
@@ -81,7 +81,7 @@ AC_ARG_WITH(fhs,
#
# set private directory location
AC_ARG_WITH(privatedir,
-[ --with-privatedir=DIR Where to put smbpasswd
($ac_default_prefix/private)],
+[AS_HELP_STRING([--with-privatedir=DIR], [Where to put smbpasswd
($ac_default_prefix/private)])],
[ case $withval in
yes|no)
#
@@ -97,7 +97,7 @@ AC_ARG_WITH(privatedir,
#
# set root sbin directory location
AC_ARG_WITH(rootsbindir,
-[ --with-rootsbindir=DIR Which directory to use for root sbin
($ac_default_prefix/sbin)],
+[AS_HELP_STRING([--with-rootsbindir=DIR], [Which directory to use for root
sbin ($ac_default_prefix/sbin)])],
[ case $withval in
yes|no)
#
@@ -113,7 +113,7 @@ AC_ARG_WITH(rootsbindir,
#
# set lock directory location
AC_ARG_WITH(lockdir,
-[ --with-lockdir=DIR Where to put lock files
($ac_default_prefix/var/locks)],
+[AS_HELP_STRING([--with-lockdir=DIR], [Where to put lock files
($ac_default_prefix/var/locks)])],
[ case $withval in
yes|no)
#
@@ -129,7 +129,7 @@ AC_ARG_WITH(lockdir,
#
# set pid directory location
AC_ARG_WITH(piddir,
-[ --with-piddir=DIR Where to put pid files
($ac_default_prefix/var/locks)],
+[AS_HELP_STRING([--with-piddir=DIR], [Where to put pid files
($ac_default_prefix/var/locks)])],
[ case $withval in
yes|no)
#
@@ -145,7 +145,7 @@ AC_ARG_WITH(piddir,
#
# set SWAT directory location
AC_ARG_WITH(swatdir,
-[ --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)],
+[AS_HELP_STRING([--with-swatdir=DIR], [Where to put SWAT files
($ac_default_prefix/swat)])],
[ case $withval in
yes|no)
#
@@ -161,7 +161,7 @@ AC_ARG_WITH(swatdir,
#
# set configuration directory location
AC_ARG_WITH(configdir,
-[ --with-configdir=DIRWhere to put configuration files ($libdir)],
+[AS_HELP_STRING([--with-configdir=DIR], [Where to put configuration files
($libdir)])],
[ case $withval in
yes|no)
#
@@ -177,7 +177,7 @@ AC_ARG_WITH(configdir,
#
# set log directory location
AC_ARG_WITH(logfilebase,
-[ --with-logfilebase=DIR Where to put log files ($VARDIR)],
+[AS_HELP_STRING([--with-logfilebase=DIR], [Where to put log files ($VARDIR)])],
[ case $withval in
yes|no)
#
@@ -194,7 +194,7 @@ AC_ARG_WITH(logfilebase,
#
# set ctdb source directory location
AC_ARG_WITH(ctdb,
-[ --with-ctdb=DIR Where to find ctdb sources],
+[AS_HELP_STRING([--with-ctdb=DIR], [Where to find ctdb sources])],
[ case $withval in
yes|no)
AC_MSG_WARN([--with-ctdb called without argument])
@@ -207,7 +207,7 @@ AC_ARG_WITH(ctdb,
#
# set lib directory location
AC_ARG_WITH(libdir,
-[ --with-libdir=DIR Where to put libdir ($libdir)],
+[AS_HELP_STRING([--with-libdir=DIR], [Where to put libdir ($libdir)])],
[ case $withval in
yes|no)
#
@@ -223,7 +223,7 @@ AC_ARG_WITH(libdir,
#
# set PAM modules directory location
AC_ARG_WITH(pammodulesdir,
-[ --with-pammodulesdir=DIR Which directory to use for PAM modules
($ac_default_prefix/$libdir/security)],
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2178-g7e1f334
The branch, v3-2-test has been updated
via 7e1f33436adb0625662969f52b501c57d4a4bc87 (commit)
via 33a97b447c1875bf1cd5a703871a84a7fb359fec (commit)
via 6f269ec8c0ad18bd0c04d5fc459fa80ab72dba63 (commit)
via 8890bc481f60cd42d96b240b2ed8e34bc3d81f13 (commit)
from d950174bcb50ecb70dfef71d4201feec4985c08b (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 7e1f33436adb0625662969f52b501c57d4a4bc87
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:17:40 2008 +0100
Remove unused marshalling for SAMR_ENUM_DOM_ALIASES.
Guenther
commit 33a97b447c1875bf1cd5a703871a84a7fb359fec
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:15:40 2008 +0100
Convert last caller (in winbindd) to rpccli_samr_EnumDomainAliases.
Guenther
commit 6f269ec8c0ad18bd0c04d5fc459fa80ab72dba63
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:11:34 2008 +0100
Remove unused marshalling for SAMR_ENUM_DOM_GROUPS.
Guenther
commit 8890bc481f60cd42d96b240b2ed8e34bc3d81f13
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:08:49 2008 +0100
Convert last caller (in winbindd) to rpccli_samr_EnumDomainGroups.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 74 --
source/rpc_client/cli_samr.c | 141 ---
source/rpc_parse/parse_samr.c | 292
source/winbindd/winbindd_rpc.c | 46 +--
4 files changed, 32 insertions(+), 521 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 9b9b4d2..62c6b16 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -153,80 +153,6 @@ SamrTestPrivateFunctionsUser
/* The following should be the greater of the preceeding two. */
#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K
-typedef struct samr_entry_info
-{
- uint32 rid;
- UNIHDR hdr_name;
-
-} SAM_ENTRY;
-
-/* SAMR_Q_ENUM_DOM_GROUPS - SAM rids and names */
-typedef struct q_samr_enum_dom_groups_info
-{
- POLICY_HND pol; /* policy handle */
-
- /* this is possibly an enumeration context handle... */
- uint32 start_idx; /* 0x */
-
- uint32 max_size; /* 0x */
-
-} SAMR_Q_ENUM_DOM_GROUPS;
-
-
-/* SAMR_R_ENUM_DOM_GROUPS - SAM rids and names */
-typedef struct r_samr_enum_dom_groups_info
-{
- uint32 next_idx;
- uint32 ptr_entries1;
-
- uint32 num_entries2;
- uint32 ptr_entries2;
-
- uint32 num_entries3;
-
- SAM_ENTRY *sam;
- UNISTR2 *uni_grp_name;
-
- uint32 num_entries4;
-
- NTSTATUS status;
-
-} SAMR_R_ENUM_DOM_GROUPS;
-
-
-/* SAMR_Q_ENUM_DOM_ALIASES - SAM rids and names */
-typedef struct q_samr_enum_dom_aliases_info
-{
- POLICY_HND pol; /* policy handle */
-
- /* this is possibly an enumeration context handle... */
- uint32 start_idx; /* 0x */
-
- uint32 max_size; /* 0x */
-
-} SAMR_Q_ENUM_DOM_ALIASES;
-
-
-/* SAMR_R_ENUM_DOM_ALIASES - SAM rids and names */
-typedef struct r_samr_enum_dom_aliases_info
-{
- uint32 next_idx;
- uint32 ptr_entries1;
-
- uint32 num_entries2;
- uint32 ptr_entries2;
-
- uint32 num_entries3;
-
- SAM_ENTRY *sam;
- UNISTR2 *uni_grp_name;
-
- uint32 num_entries4;
-
- NTSTATUS status;
-
-} SAMR_R_ENUM_DOM_ALIASES;
-
/* these are from the old rpc_samr.h - they are needed while the merge
is still going on */
#define MAX_SAM_SIDS 15
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index a994db9..c805f00 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -22,147 +22,6 @@
#include includes.h
-/* Enumerate domain groups */
-
-NTSTATUS rpccli_samr_enum_dom_groups(struct rpc_pipe_client *cli,
-TALLOC_CTX *mem_ctx,
-POLICY_HND *pol, uint32 *start_idx,
-uint32 size, struct acct_info **dom_groups,
-uint32 *num_dom_groups)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_ENUM_DOM_GROUPS q;
- SAMR_R_ENUM_DOM_GROUPS r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- uint32 name_idx, i;
-
- DEBUG(10,(cli_samr_enum_dom_groups starting at index %u\n, (unsigned
int)*start_idx));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_enum_dom_groups(q, pol, *start_idx, size);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_ENUM_DOM_GROUPS,
- q, r,
- qbuf, rbuf,
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2179-g8a8c582
The branch, v3-2-test has been updated via 8a8c5826e7a55742169e60d2145a7fe4d5786a23 (commit) from 7e1f33436adb0625662969f52b501c57d4a4bc87 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit 8a8c5826e7a55742169e60d2145a7fe4d5786a23 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Feb 13 11:36:17 2008 +0100 Goodbye parse_samr.c, rest in peace - but never come back! Guenther --- Summary of changes: source/Makefile.in|1 - source/rpc_parse/parse_samr.c | 29 - 2 files changed, 0 insertions(+), 30 deletions(-) delete mode 100644 source/rpc_parse/parse_samr.c Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index fc8c4a3..e0bb772 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -515,7 +515,6 @@ RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) RPC_PARSE_OBJ = rpc_parse/parse_lsa.o $(RPC_PARSE_OBJ2) \ -rpc_parse/parse_samr.o \ rpc_parse/parse_spoolss.o \ rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o \ rpc_parse/parse_ntsvcs.o rpc_parse/parse_svcctl.o $(REGOBJS_OBJ) diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c deleted file mode 100644 index ad55e48..000 --- a/source/rpc_parse/parse_samr.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * RPC Pipe client / server routines - * Copyright (C) Andrew Tridgell 1992-2000, - * Copyright (C) Luke Kenneth Casson Leighton 1996-2000, - * Copyright (C) Paul Ashton 1997-2000, - * Copyright (C) Elrond2000, - * Copyright (C) Jeremy Allison2001, - * Copyright (C) Jean François Micouleau 1998-2001, - * Copyright (C) Jim McDonough [EMAIL PROTECTED] 2002. - * - * 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 3 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, see http://www.gnu.org/licenses/. - */ - -#include includes.h - -#undef DBGC_CLASS -#define DBGC_CLASS DBGC_RPC_PARSE -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2180-ga84bf07
The branch, v3-2-test has been updated via a84bf0786f269b8514e0a08e32fa429cefabe1d3 (commit) from 8a8c5826e7a55742169e60d2145a7fe4d5786a23 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit a84bf0786f269b8514e0a08e32fa429cefabe1d3 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 11:54:41 2008 +0100 Add libreplace objects to libtalloc.so. Michael --- Summary of changes: source/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index e0bb772..f91bdf5 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -300,7 +300,7 @@ TALLOC_OBJ = @TALLOC_OBJS@ LIBTALLOC_OBJ0 = $(TALLOC_OBJ) -LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) +LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ) LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \ $(LIBREPLACE_OBJ) \ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2182-gd54456f
The branch, v3-2-test has been updated
via d54456f3c42f123af5516c6f75c87b279fdc775f (commit)
via 46d5989562bb771b3dcb2fdd197d2f90c3ff8653 (commit)
from a84bf0786f269b8514e0a08e32fa429cefabe1d3 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit d54456f3c42f123af5516c6f75c87b279fdc775f
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Jan 30 23:43:57 2008 +0100
Use rpccli_netr_LogonControl() in rpcclient.
Guenther
commit 46d5989562bb771b3dcb2fdd197d2f90c3ff8653
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:43:45 2008 +0100
Remove redundant (and unused) set of samr opcodes.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 71 ---
source/rpcclient/cmd_netlogon.c | 56 +-
2 files changed, 39 insertions(+), 88 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 62c6b16..cf60279 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -74,77 +74,6 @@ SamrTestPrivateFunctionsUser
/
-#define SAMR_CONNECT_ANON 0x00
-#define SAMR_CLOSE_HND 0x01
-#define SAMR_SET_SEC_OBJECT0x02
-#define SAMR_QUERY_SEC_OBJECT 0x03
-
-#define SAMR_UNKNOWN_4 0x04 /* profile info? */
-#define SAMR_LOOKUP_DOMAIN 0x05
-#define SAMR_ENUM_DOMAINS 0x06
-#define SAMR_OPEN_DOMAIN 0x07
-#define SAMR_QUERY_DOMAIN_INFO 0x08
-#define SAMR_SET_DOMAIN_INFO 0x09
-
-#define SAMR_CREATE_DOM_GROUP 0x0a
-#define SAMR_ENUM_DOM_GROUPS 0x0b
-#define SAMR_ENUM_DOM_USERS0x0d
-#define SAMR_CREATE_DOM_ALIAS 0x0e
-#define SAMR_ENUM_DOM_ALIASES 0x0f
-#define SAMR_QUERY_USERALIASES 0x10
-
-#define SAMR_LOOKUP_NAMES 0x11
-#define SAMR_LOOKUP_RIDS 0x12
-
-#define SAMR_OPEN_GROUP0x13
-#define SAMR_QUERY_GROUPINFO 0x14
-#define SAMR_SET_GROUPINFO 0x15
-#define SAMR_ADD_GROUPMEM 0x16
-#define SAMR_DELETE_DOM_GROUP 0x17
-#define SAMR_DEL_GROUPMEM 0x18
-#define SAMR_QUERY_GROUPMEM0x19
-#define SAMR_UNKNOWN_1A0x1a
-
-#define SAMR_OPEN_ALIAS0x1b
-#define SAMR_QUERY_ALIASINFO 0x1c
-#define SAMR_SET_ALIASINFO 0x1d
-#define SAMR_DELETE_DOM_ALIAS 0x1e
-#define SAMR_ADD_ALIASMEM 0x1f
-#define SAMR_DEL_ALIASMEM 0x20
-#define SAMR_QUERY_ALIASMEM0x21
-
-#define SAMR_OPEN_USER 0x22
-#define SAMR_DELETE_DOM_USER 0x23
-#define SAMR_QUERY_USERINFO0x24
-#define SAMR_SET_USERINFO2 0x25 /* this is SAMR_SET_USERINFO! */
-#define SAMR_QUERY_USERGROUPS 0x27
-
-#define SAMR_QUERY_DISPINFO0x28
-#define SAMR_GET_DISPENUM_INDEX 0x29
-#define SAMR_UNKNOWN_2a0x2a
-#define SAMR_UNKNOWN_2b0x2b
-#define SAMR_GET_USRDOM_PWINFO 0x2c
-#define SAMR_REMOVE_SID_FOREIGN_DOMAIN0x2d
-#define SAMR_QUERY_DOMAIN_INFO2 0x2e /* looks like an alias for
SAMR_QUERY_DOMAIN_INFO */
-#define SAMR_UNKNOWN_2f0x2f
-#define SAMR_QUERY_DISPINFO3 0x30 /* Alias for SAMR_QUERY_DISPINFO
- with info level 3 */
-#define SAMR_UNKNOWN_310x31
-#define SAMR_CREATE_USER 0x32
-#define SAMR_QUERY_DISPINFO4 0x33 /* Alias for SAMR_QUERY_DISPINFO
- with info level 4 */
-#define SAMR_ADDMULTI_ALIASMEM 0x34
-
-#define SAMR_UNKNOWN_350x35
-#define SAMR_UNKNOWN_360x36
-#define SAMR_CHGPASSWD_USER0x37
-#define SAMR_GET_DOM_PWINFO0x38
-#define SAMR_CONNECT 0x39
-#define SAMR_SET_USERINFO 0x3A /* this is SAMR_SET_USERINFO2! */
-#define SAMR_CONNECT4 0x3E
-#define SAMR_CHGPASSWD_USER3 0x3F
-#define SAMR_CONNECT5 0x40
-
#define PASS_MUST_CHANGE_AT_NEXT_LOGON 0x01
#define PASS_DONT_CHANGE_AT_NEXT_LOGON 0x00
diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index a752003..b175357 100644
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -348,30 +348,52 @@ static WERROR cmd_netlogon_dsr_getsitename(struct
rpc_pipe_client *cli,
return WERR_OK;
}
-static NTSTATUS cmd_netlogon_logon_ctrl(struct rpc_pipe_client *cli,
-TALLOC_CTX *mem_ctx, int argc,
-const char **argv)
+static WERROR cmd_netlogon_logon_ctrl(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx, int argc,
+ const char **argv)
{
-#if 0
- uint32 query_level = 1;
-#endif
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+ WERROR werr;
+ const char *logon_server = cli-cli-desthost;
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2183-gec49475
The branch, v3-2-test has been updated
via ec4947525e0881bfcde661f906ccd1f66fe54f5a (commit)
from d54456f3c42f123af5516c6f75c87b279fdc775f (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit ec4947525e0881bfcde661f906ccd1f66fe54f5a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 11:56:24 2008 +0100
Use pidl for _netr_LogonControl.
Guenther
---
Summary of changes:
source/rpc_server/srv_netlog.c| 23 +---
source/rpc_server/srv_netlog_nt.c | 41 +++-
2 files changed, 23 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index 4f0a014..7faf632 100644
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -279,28 +279,7 @@ static bool api_net_logon_ctrl2(pipes_struct *p)
static bool api_net_logon_ctrl(pipes_struct *p)
{
- NET_Q_LOGON_CTRL q_u;
- NET_R_LOGON_CTRL r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* grab the lsa netlogon ctrl query... */
- if(!net_io_q_logon_ctrl(, q_u, data, 0)) {
- DEBUG(0,(api_net_logon_ctrl: Failed to unmarshall
NET_Q_LOGON_CTRL.\n));
- return False;
- }
-
- r_u.status = _net_logon_ctrl(p, q_u, r_u);
-
- if(!net_io_r_logon_ctrl(, r_u, rdata, 0)) {
- DEBUG(0,(net_reply_logon_ctrl2: Failed to marshall
NET_R_LOGON_CTRL.\n));
- return False;
- }
-
- return True;
+ return proxy_netr_call(p, NDR_NETR_LOGONCONTROL);
}
/*
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index 528a339..b59ad62 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -43,21 +43,34 @@ static void init_net_r_req_chal(NET_R_REQ_CHAL *r_c,
}
/*
- net_reply_logon_ctrl:
+ _netr_LogonControl
*/
-NTSTATUS _net_logon_ctrl(pipes_struct *p, NET_Q_LOGON_CTRL *q_u,
- NET_R_LOGON_CTRL *r_u)
+WERROR _netr_LogonControl(pipes_struct *p,
+ struct netr_LogonControl *r)
{
- uint32 flags = 0x0;
- uint32 pdc_connection_status = 0x00; /* Maybe a win32 error code? */
-
+ struct netr_NETLOGON_INFO_1 *info1;
+ uint32_t flags = 0x0;
+ uint32_t pdc_connection_status = W_ERROR_V(WERR_OK);
+
/* Setup the Logon Control response */
- init_net_r_logon_ctrl(r_u, q_u-query_level, flags,
- pdc_connection_status);
+ switch (r-in.level) {
+ case 1:
+ info1 = TALLOC_ZERO_P(p-mem_ctx, struct
netr_NETLOGON_INFO_1);
+ if (!info1) {
+ return WERR_NOMEM;
+ }
+ info1-flags = flags;
+ info1-pdc_connection_status = pdc_connection_status;
- return r_u-status;
+ r-out.info-info1 = info1;
+ break;
+ default:
+ return WERR_UNKNOWN_LEVEL;
+ }
+
+ return WERR_OK;
}
/
@@ -1257,16 +1270,6 @@ NTSTATUS _netr_AccountSync(pipes_struct *p,
/
/
-WERROR _netr_LogonControl(pipes_struct *p,
- struct netr_LogonControl *r)
-{
- p-rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/
-/
-
WERROR _netr_GetDcName(pipes_struct *p,
struct netr_GetDcName *r)
{
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2184-g60a4c84
The branch, v3-2-test has been updated
via 60a4c8411b71f9f17956b51fd882f71273f5b0ca (commit)
from ec4947525e0881bfcde661f906ccd1f66fe54f5a (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 60a4c8411b71f9f17956b51fd882f71273f5b0ca
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 12:41:00 2008 +0100
Only export talloc related symbols in libtalloc.so.
Michael
---
Summary of changes:
source/exports/libtalloc.syms |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/exports/libtalloc.syms b/source/exports/libtalloc.syms
index eb34bfc..87f1c5c 100644
--- a/source/exports/libtalloc.syms
+++ b/source/exports/libtalloc.syms
@@ -1,3 +1,6 @@
{
- global: *;
+ global:
+ talloc_*;
+ _talloc_*;
+ local: *;
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-798-ga496abc
The branch, v4-0-test has been updated
via a496abc4042a98835d485769e0972826da161984 (commit)
from 5100452cf3b3c3c5dcdb77a9efe27e8c506d1d43 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit a496abc4042a98835d485769e0972826da161984
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Feb 13 13:04:54 2008 +0100
pidl: $size can be 'foo / 2' so we need to add '(' and ')'
'foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
---
Summary of changes:
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 60d5bf8..ef3eb3d 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2149,9 +2149,9 @@ sub ParseFunctionPull($$)
$self-pidl(NDR_PULL_ALLOC_N(ndr, r-out.$e-{NAME},
$size););
if (grep(/in/, @{$e-{DIRECTION}})) {
- $self-pidl(memcpy(r-out.$e-{NAME},
r-in.$e-{NAME}, $size * sizeof(*r-in.$e-{NAME})););
+ $self-pidl(memcpy(r-out.$e-{NAME},
r-in.$e-{NAME}, ($size) * sizeof(*r-in.$e-{NAME})););
} else {
- $self-pidl(memset(r-out.$e-{NAME}, 0, $size
* sizeof(*r-out.$e-{NAME})););
+ $self-pidl(memset(r-out.$e-{NAME}, 0,
($size) * sizeof(*r-out.$e-{NAME})););
}
} else {
$self-pidl(NDR_PULL_ALLOC(ndr, r-out.$e-{NAME}););
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2188-ge343593
The branch, v3-2-test has been updated
via e3435930a307cff3066fe2047ed8c5c48911f001 (commit)
via 923cb37837d508d5355038e95ed1ac09c5869a89 (commit)
via 72af96a320a97ce1a730d6e33d01950123d6a97c (commit)
via c5e6dd1ca9611e2830ff773875998c01bf779a64 (commit)
from 60a4c8411b71f9f17956b51fd882f71273f5b0ca (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit e3435930a307cff3066fe2047ed8c5c48911f001
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Feb 4 18:18:36 2008 +0100
auth_winbind: use wbcAuthenticateUserEx()
smbd doesn't need $(WBCOMMON_OBJ) anymore,
it works with any libwbclient.so now
and may talk to an older winbindd.
metze
commit 923cb37837d508d5355038e95ed1ac09c5869a89
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Jan 29 16:21:14 2008 +0100
wbinfo: use wbcAuthenticateUserEx()
metze
commit 72af96a320a97ce1a730d6e33d01950123d6a97c
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Jan 24 14:05:59 2008 +0100
libwbclient: add wbcAuthenticateUserEx() function
This function will be used by auth_winbind.c.
metze
commit c5e6dd1ca9611e2830ff773875998c01bf779a64
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Jan 18 08:43:45 2008 +0100
winbindd: add rids and other_sids arrays in WBFLAG_PAM_INFO3_TEXT mode
metze
---
Summary of changes:
source/Makefile.in |5 +-
source/auth/auth_util.c| 233 +
source/auth/auth_winbind.c | 113 +
source/nsswitch/libwbclient/wbc_pam.c | 300
source/nsswitch/libwbclient/wbclient.c |2 +
source/nsswitch/libwbclient/wbclient.h | 159 +-
source/nsswitch/wbinfo.c | 90 +-
source/winbindd/winbindd_pam.c | 44 +-
8 files changed, 825 insertions(+), 121 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index f91bdf5..e1a6436 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -640,9 +640,8 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV)
$(LIBSMB_OBJ) \
$(NOTIFY_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
- $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
- $(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) \
- $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@
+ $(REGISTRY_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
+ $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@
PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_cups.o printing/print_generic.o \
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index ce47e94..6efd31d 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -1654,6 +1654,239 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
+/*
+ Make a server_info struct from the wbcAuthUserInfo returned by a domain logon
+**/
+
+NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
+ const char *sent_nt_username,
+ const char *domain,
+ const struct wbcAuthUserInfo *info,
+ auth_serversupplied_info
**server_info)
+{
+ char zeros[16];
+
+ NTSTATUS nt_status = NT_STATUS_OK;
+ char *found_username = NULL;
+ const char *nt_domain;
+ const char *nt_username;
+ struct samu *sam_account = NULL;
+ DOM_SID user_sid;
+ DOM_SID group_sid;
+ bool username_was_mapped;
+ uint32_t i;
+
+ uid_t uid = (uid_t)-1;
+ gid_t gid = (gid_t)-1;
+
+ auth_serversupplied_info *result;
+
+ result = make_server_info(NULL);
+ if (result == NULL) {
+ DEBUG(4, (make_server_info failed!\n));
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ /*
+ Here is where we should check the list of
+ trusted domains, and verify that the SID
+ matches.
+ */
+
+ memcpy(user_sid, info-sids[0].sid, sizeof(user_sid));
+ memcpy(group_sid, info-sids[1].sid, sizeof(group_sid));
+
+ if (info-account_name) {
+ nt_username = talloc_strdup(result, info-account_name);
+ } else {
+ /* If the server didn't give us one, just use the one we sent
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2189-gec79357
The branch, v3-2-test has been updated
via ec793572187228deda7210dab02882e4e09f1972 (commit)
from e3435930a307cff3066fe2047ed8c5c48911f001 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit ec793572187228deda7210dab02882e4e09f1972
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 13:48:00 2008 +0100
Add -L./bin to LDFLAGS when building shared libs.
Formerly this was only needed for libwbclient, but now that we start
using more shared libs internally, this is needed more globally
to support linking internal libs dynamically on systemy without winbindd.
Michael
---
Summary of changes:
source/configure.in |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index f3187aa..cde3c0b 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1996,6 +1996,10 @@ if test $enable_shared = yes -a
${ac_cv_gnu_ld_version_script} = yes; then
DSO_EXPORTS=\$\(DSO_EXPORTS_CMD\)
fi
+if test x$BLDSHARED = xtrue ; then
+ LDFLAGS=$LDFLAGS -L./bin
+fi
+
AC_MSG_RESULT($BLDSHARED)
AC_MSG_CHECKING([LDFLAGS])
@@ -6284,7 +6288,6 @@ if test $BLDSHARED = true -a x$HAVE_WINBIND = xyes -a
x$BUILD_LIBWBCLIENT_S
INSTALL_LIBWBCLIENT=installlibwbclient
UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
WINBIND_LIBS=-lwbclient
- LDFLAGS=$LDFLAGS -L./bin
else
LIBWBCLIENT_STATIC=bin/libwbclient.a
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2190-g4ffc73d
The branch, v3-2-test has been updated via 4ffc73d90883491b9d4dc6d0249e1d859939670b (commit) from ec793572187228deda7210dab02882e4e09f1972 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit 4ffc73d90883491b9d4dc6d0249e1d859939670b Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 14:10:06 2008 +0100 Only use the needed objects for libnetapi.a Michael --- Summary of changes: source/Makefile.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index e1a6436..5302fce 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1479,9 +1479,9 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) -bin/libnetapi.a: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) +bin/libnetapi.a: $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2191-gf1c7fa1
The branch, v3-2-test has been updated
via f1c7fa19e43d720f0d42e6d1999130462d5979da (commit)
from 4ffc73d90883491b9d4dc6d0249e1d859939670b (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit f1c7fa19e43d720f0d42e6d1999130462d5979da
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 14:10:10 2008 +0100
Remove const on policy handle in net rpc.
Volker, are you ok with that?
Guenther
---
Summary of changes:
source/utils/net_rpc.c | 19 +--
1 files changed, 9 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 3767138..5bc37f3 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1406,9 +1406,8 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
- const POLICY_HND *user_hnd,
+ POLICY_HND *user_hnd,
int argc, const char **argv))
-
{
POLICY_HND connect_pol, domain_pol, user_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -1490,7 +1489,7 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
static NTSTATUS rpc_sh_user_show_internals(TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
- const POLICY_HND *user_hnd,
+ POLICY_HND *user_hnd,
int argc, const char **argv)
{
NTSTATUS result;
@@ -1502,7 +1501,7 @@ static NTSTATUS rpc_sh_user_show_internals(TALLOC_CTX
*mem_ctx,
}
result = rpccli_samr_QueryUserInfo(pipe_hnd, mem_ctx,
- CONST_DISCARD(struct policy_handle
*, user_hnd),
+ user_hnd,
21,
info);
if (!NT_STATUS_IS_OK(result)) {
@@ -1539,7 +1538,7 @@ do { if (strequal(ctx-thiscmd, name)) { \
static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
- const POLICY_HND *user_hnd,
+ POLICY_HND *user_hnd,
int argc, const char **argv)
{
NTSTATUS result;
@@ -1554,7 +1553,7 @@ static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX
*mem_ctx,
}
result = rpccli_samr_QueryUserInfo(pipe_hnd, mem_ctx,
- CONST_DISCARD(struct policy_handle
*, user_hnd),
+ user_hnd,
21,
info);
if (!NT_STATUS_IS_OK(result)) {
@@ -1589,7 +1588,7 @@ static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX
*mem_ctx,
SETSTR(description, description, DESCRIPTION);
result = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx,
-CONST_DISCARD(struct policy_handle *,
user_hnd),
+user_hnd,
21,
info);
@@ -1622,7 +1621,7 @@ static NTSTATUS rpc_sh_user_str_edit(TALLOC_CTX *mem_ctx,
static NTSTATUS rpc_sh_user_flag_edit_internals(TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client
*pipe_hnd,
- const POLICY_HND *user_hnd,
+ POLICY_HND *user_hnd,
int argc, const char **argv)
{
NTSTATUS result;
@@ -1643,7 +1642,7 @@ static NTSTATUS
rpc_sh_user_flag_edit_internals(TALLOC_CTX *mem_ctx,
newval = strequal(argv[0], yes);
result = rpccli_samr_QueryUserInfo(pipe_hnd, mem_ctx,
- CONST_DISCARD(struct policy_handle
*, user_hnd),
+ user_hnd,
21,
info);
if (!NT_STATUS_IS_OK(result)) {
@@ -1670,7
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2192-g983ac0a
The branch, v3-2-test has been updated
via 983ac0a6762b52945a784ccbc371f4df99a0a52b (commit)
from f1c7fa19e43d720f0d42e6d1999130462d5979da (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 983ac0a6762b52945a784ccbc371f4df99a0a52b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 12:24:56 2008 +0100
Pure cosmetics: remove trailing whitespace in netlogon server.
Guenther
---
Summary of changes:
source/rpc_server/srv_netlog_nt.c | 138 ++--
1 files changed, 69 insertions(+), 69 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index b59ad62..d9fcbeb 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -1,4 +1,4 @@
-/*
+/*
* Unix SMB/CIFS implementation.
* RPC Pipe client / server routines
* Copyright (C) Andrew Tridgell 1992-1997,
@@ -11,12 +11,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 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, see http://www.gnu.org/licenses/.
*/
@@ -101,54 +101,54 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p,
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
unistr2_to_ascii(servername, q_u-uni_server_name, sizeof(servername));
r_u-status = NT_STATUS_OK;
-
+
tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
fstrcpy( dc_name, );
-
+
switch ( q_u-function_code ) {
case NETLOGON_CONTROL_TC_QUERY:
unistr2_to_ascii(domain, q_u-info.info6.domain,
sizeof(domain));
-
+
if ( !is_trusted_domain( domain ) )
break;
-
+
if ( !get_dc_name( domain, NULL, dc_name2, dc_ss ) ) {
tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
break;
}
fstr_sprintf( dc_name, %s, dc_name2 );
-
+
tc_status = W_ERROR_V(WERR_OK);
-
+
break;
-
+
case NETLOGON_CONTROL_REDISCOVER:
unistr2_to_ascii(domain, q_u-info.info6.domain,
sizeof(domain));
-
+
if ( !is_trusted_domain( domain ) )
break;
-
+
if ( !get_dc_name( domain, NULL, dc_name2, dc_ss ) ) {
tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
break;
}
fstr_sprintf( dc_name, %s, dc_name2 );
-
+
tc_status = W_ERROR_V(WERR_OK);
-
+
break;
-
+
default:
/* no idea what this should be */
DEBUG(0,(_net_logon_ctrl2: unimplemented function
level [%d]\n,
q_u-function_code));
}
-
+
/* prepare the response */
-
- init_net_r_logon_ctrl2( r_u, q_u-query_level, flags,
+
+ init_net_r_logon_ctrl2( r_u, q_u-query_level, flags,
pdc_connection_status, logon_attempts, tc_status, dc_name );
if (lp_server_role() == ROLE_DOMAIN_BDC)
@@ -187,7 +187,7 @@ WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
***/
static void init_net_r_srv_pwset(NET_R_SRV_PWSET *r_s,
-DOM_CRED *srv_cred, NTSTATUS status)
+DOM_CRED *srv_cred, NTSTATUS status)
{
DEBUG(5,(init_net_r_srv_pwset: %d\n, __LINE__));
@@ -207,13 +207,13 @@ static NTSTATUS get_md4pw(char *md4pw, char *mach_acct,
uint16 sec_chan_type)
const uint8 *pass;
bool ret;
uint32 acct_ctrl;
-
+
#if 0
char addr[INET6_ADDRSTRLEN];
/*
* Currently this code is redundent as we already have a filter
- * by hostname list. What this code really
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2193-gef42431
The branch, v3-2-test has been updated
via ef424319410b7a29ecdfefca53b7e9704beb6139 (commit)
from 983ac0a6762b52945a784ccbc371f4df99a0a52b (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit ef424319410b7a29ecdfefca53b7e9704beb6139
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 14:08:59 2008 +0100
Use pidl for _netr_ServerReqChallenge.
Guenther
---
Summary of changes:
source/rpc_server/srv_netlog.c| 24 +---
source/rpc_server/srv_netlog_nt.c | 34 --
2 files changed, 13 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index 7faf632..1b23cd8 100644
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -55,29 +55,7 @@ static bool proxy_netr_call(pipes_struct *p, uint8 opnum)
static bool api_net_req_chal(pipes_struct *p)
{
- NET_Q_REQ_CHAL q_u;
- NET_R_REQ_CHAL r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- /* grab the challenge... */
- if(!net_io_q_req_chal(, q_u, data, 0)) {
- DEBUG(0,(api_net_req_chal: Failed to unmarshall
NET_Q_REQ_CHAL.\n));
- return False;
- }
-
- r_u.status = _net_req_chal(p, q_u, r_u);
-
- /* store the response in the SMB stream */
- if(!net_io_r_req_chal(, r_u, rdata, 0)) {
- DEBUG(0,(api_net_req_chal: Failed to marshall
NET_R_REQ_CHAL.\n));
- return False;
- }
-
- return True;
+ return proxy_netr_call(p, NDR_NETR_SERVERREQCHALLENGE);
}
/*
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index d9fcbeb..acf694b 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -34,12 +34,12 @@ extern userdom_struct current_user_info;
init_net_r_req_chal:
*/
-static void init_net_r_req_chal(NET_R_REQ_CHAL *r_c,
-DOM_CHAL *srv_chal, NTSTATUS status)
+static void init_net_r_req_chal(struct netr_Credential *r,
+ DOM_CHAL *srv_chal)
{
DEBUG(6,(init_net_r_req_chal: %d\n, __LINE__));
- memcpy(r_c-srv_chal.data, srv_chal-data, sizeof(srv_chal-data));
- r_c-status = status;
+
+ memcpy(r-data, srv_chal-data, sizeof(r-data));
}
/*
@@ -305,10 +305,11 @@ static NTSTATUS get_md4pw(char *md4pw, char *mach_acct,
uint16 sec_chan_type)
}
/*
- _net_req_chal
+ _netr_ServerReqChallenge
*/
-NTSTATUS _net_req_chal(pipes_struct *p, NET_Q_REQ_CHAL *q_u, NET_R_REQ_CHAL
*r_u)
+NTSTATUS _netr_ServerReqChallenge(pipes_struct *p,
+ struct netr_ServerReqChallenge *r)
{
if (!p-dc) {
p-dc = TALLOC_ZERO_P(p-pipe_state_mem_ctx, struct dcinfo);
@@ -316,23 +317,22 @@ NTSTATUS _net_req_chal(pipes_struct *p, NET_Q_REQ_CHAL
*q_u, NET_R_REQ_CHAL *r_u
return NT_STATUS_NO_MEMORY;
}
} else {
- DEBUG(10,(_net_req_chal: new challenge requested. Clearing old
state.\n));
+ DEBUG(10,(_netr_ServerReqChallenge: new challenge requested.
Clearing old state.\n));
ZERO_STRUCTP(p-dc);
}
- rpcstr_pull(p-dc-remote_machine,
- q_u-uni_logon_clnt.buffer,
- sizeof(fstring),q_u-uni_logon_clnt.uni_str_len*2,0);
+ fstrcpy(p-dc-remote_machine, r-in.computer_name);
/* Save the client challenge to the server. */
- memcpy(p-dc-clnt_chal.data, q_u-clnt_chal.data,
sizeof(q_u-clnt_chal.data));
+ memcpy(p-dc-clnt_chal.data, r-in.credentials-data,
+ sizeof(r-in.credentials-data));
/* Create a server challenge for the client */
/* Set this to a random value. */
generate_random_buffer(p-dc-srv_chal.data, 8);
/* set up the LSA REQUEST CHALLENGE response */
- init_net_r_req_chal(r_u, p-dc-srv_chal, NT_STATUS_OK);
+ init_net_r_req_chal(r-out.credentials, p-dc-srv_chal);
p-dc-challenge_sent = True;
@@ -1200,16 +1200,6 @@ NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
/
/
-NTSTATUS
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2195-g782ad12
The branch, v3-2-test has been updated
via 782ad12e3c100cf74ca0bc353379efe90da69b98 (commit)
via d16af5105d307ebb88190176d7f89971d0f40351 (commit)
from ef424319410b7a29ecdfefca53b7e9704beb6139 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 782ad12e3c100cf74ca0bc353379efe90da69b98
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 14:12:29 2008 +0100
Re-run make idl.
Guenther
commit d16af5105d307ebb88190176d7f89971d0f40351
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 12:29:24 2008 +0100
Fix IDL for netr_LogonControl2.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_netlogon.c |2 +-
source/librpc/gen_ndr/cli_netlogon.h |2 +-
source/librpc/gen_ndr/ndr_netlogon.c | 25 +++--
source/librpc/gen_ndr/netlogon.h |2 +-
source/librpc/idl/netlogon.idl |2 +-
5 files changed, 23 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_netlogon.c
b/source/librpc/gen_ndr/cli_netlogon.c
index de04c21..f355856 100644
--- a/source/librpc/gen_ndr/cli_netlogon.c
+++ b/source/librpc/gen_ndr/cli_netlogon.c
@@ -745,7 +745,7 @@ NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client
*cli,
const char *logon_server,
uint32_t function_code,
uint32_t level,
- union netr_CONTROL_DATA_INFORMATION data,
+ union netr_CONTROL_DATA_INFORMATION *data,
union netr_CONTROL_QUERY_INFORMATION *query,
WERROR *werror)
{
diff --git a/source/librpc/gen_ndr/cli_netlogon.h
b/source/librpc/gen_ndr/cli_netlogon.h
index 4aa0f9f..0b6ed86 100644
--- a/source/librpc/gen_ndr/cli_netlogon.h
+++ b/source/librpc/gen_ndr/cli_netlogon.h
@@ -127,7 +127,7 @@ NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client
*cli,
const char *logon_server,
uint32_t function_code,
uint32_t level,
- union netr_CONTROL_DATA_INFORMATION data,
+ union netr_CONTROL_DATA_INFORMATION *data,
union netr_CONTROL_QUERY_INFORMATION *query,
WERROR *werror);
NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
diff --git a/source/librpc/gen_ndr/ndr_netlogon.c
b/source/librpc/gen_ndr/ndr_netlogon.c
index b12a347..624c9ac 100644
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -10166,8 +10166,11 @@ static enum ndr_err_code
ndr_push_netr_LogonControl2(struct ndr_push *ndr, int f
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r-in.function_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-in.level));
- NDR_CHECK(ndr_push_set_switch_value(ndr, r-in.data,
r-in.function_code));
- NDR_CHECK(ndr_push_netr_CONTROL_DATA_INFORMATION(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.data));
+ if (r-in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
+ NDR_CHECK(ndr_push_set_switch_value(ndr, r-in.data,
r-in.function_code));
+ NDR_CHECK(ndr_push_netr_CONTROL_DATA_INFORMATION(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.data));
}
if (flags NDR_OUT) {
if (r-out.query == NULL) {
@@ -10184,6 +10187,7 @@ static enum ndr_err_code
ndr_pull_netr_LogonControl2(struct ndr_pull *ndr, int f
{
uint32_t _ptr_logon_server;
TALLOC_CTX *_mem_save_logon_server_0;
+ TALLOC_CTX *_mem_save_data_0;
TALLOC_CTX *_mem_save_query_0;
if (flags NDR_IN) {
ZERO_STRUCT(r-out);
@@ -10208,8 +10212,14 @@ static enum ndr_err_code
ndr_pull_netr_LogonControl2(struct ndr_pull *ndr, int f
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
r-in.function_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-in.level));
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r-in.data,
r-in.function_code));
- NDR_CHECK(ndr_pull_netr_CONTROL_DATA_INFORMATION(ndr,
NDR_SCALARS|NDR_BUFFERS, r-in.data));
+ if (ndr-flags LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r-in.data);
+ }
+ _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r-in.data, LIBNDR_FLAG_REF_ALLOC);
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2196-ga4c773d
The branch, v3-2-test has been updated via a4c773de0fbd303f633e120e817b4c88fcff2064 (commit) from 782ad12e3c100cf74ca0bc353379efe90da69b98 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit a4c773de0fbd303f633e120e817b4c88fcff2064 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 14:43:56 2008 +0100 Link in libnetapi as shared or static library (same mechanism as talloc). This, too, can be turned to static linking by providing the configure parameter --with-static-libs=netapi. Michael --- Summary of changes: source/Makefile.in | 24 +-- source/configure.in | 77 ++- 2 files changed, 53 insertions(+), 48 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 5302fce..c42b3c3 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -144,11 +144,15 @@ PIDDIR = @piddir@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ + LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@ [EMAIL PROTECTED]@ -LIBNETAPI=bin/libnetapi.a @LIBNETAPI_SHARED@ + [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ +LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@ FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) FLAGS2 = @@ -206,7 +210,7 @@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ -SHLIBS = libtalloc @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ @LIBNETAPI@ +SHLIBS = libtalloc @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ libnetapi PAM_MODULES = @PAM_MODULES@ @@ -803,7 +807,7 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \ $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \ $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \ - $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ + $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \ $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ @@ -1254,7 +1258,7 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ - $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @WINBIND_LIBS@ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @echo Linking $@ @@ -1473,13 +1477,13 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED@ +$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBWBCLIENT_SHARED@ $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER) -bin/libnetapi.a: $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) @@ -1888,7 +1892,7 @@ install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSSPNEGO@ inst installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \ installlibtalloc \ @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ \ - @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ @INSTALL_LIBNETAPI@ + @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBWBCLIENT@ installlibnetapi install-everything: install installmodules @@ -1981,8 +1985,8 @@ installlibwbclient: installdirs libwbclient installlibnetapi: installdirs libnetapi @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) bin/[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR) - -$(INSTALLLIBCMD_A) bin/libnetapi.a $(DESTDIR)$(LIBDIR) + -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET) $(DESTDIR)$(LIBDIR) + -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLCMD) -m
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2198-g4321d5a
The branch, v3-2-test has been updated
via 4321d5aba7ec808aee473c1123027f14bfa19f19 (commit)
from 198768a83242cca3f03d839598200d794bb11606 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4321d5aba7ec808aee473c1123027f14bfa19f19
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Feb 13 14:53:34 2008 +0100
Remove --enable-libwbclient-shared , use --with-static-libs=libwbclient
instead.
Use the more general mechanism.
The enable_developer-check is preserved, of course.
Michael
---
Summary of changes:
source/configure.in | 12 +---
1 files changed, 5 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index a22979e..9b3f5b9 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -6272,13 +6272,11 @@ if test x$HAVE_WINBIND = xno; then
WINBIND_WINS_NSS=
fi
-BUILD_LIBWBCLIENT_SHARED=yes
-
-AC_ARG_ENABLE(libwbclient-shared,
-[AS_HELP_STRING([--enable-libwbclient-shared], [Build libwbclient as shared
object (default=yes, \no\ only for --enable-developer)])],
- [if eval test x$enable_developer = xyes -a x$enable_libwbclient_shared
= xno ; then
- BUILD_LIBWBCLIENT_SHARED=no
- fi])
+if test x$enable_developer = xyes -a x$LINK_LIBWBCLIENT = xSTATIC ;
then
+ BUILD_LIBWBCLIENT_SHARED=no
+else
+ BUILD_LIBWBCLIENT_SHARED=yes
+fi
if test $BLDSHARED = true -a x$HAVE_WINBIND = xyes -a
x$BUILD_LIBWBCLIENT_SHARED = xyes; then
NSS_MODULES=${WINBIND_NSS} ${WINBIND_WINS_NSS}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-800-g0c5539e
The branch, v4-0-test has been updated via 0c5539e5fedd4123f61d50ee29acdc5a5f0faf76 (commit) via 3ec4bce0b64764e364aedea2800eed296805c51e (commit) from a496abc4042a98835d485769e0972826da161984 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test - Log - commit 0c5539e5fedd4123f61d50ee29acdc5a5f0faf76 Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Wed Feb 13 16:20:23 2008 +0100 torture/eventlog: the NTSTATUS of dcerpc_ functions is the same as r.out.result metze commit 3ec4bce0b64764e364aedea2800eed296805c51e Author: Stefan Metzmacher [EMAIL PROTECTED] Date: Wed Feb 13 14:52:53 2008 +0100 torture/eventlog: fix crash bugs! This bug was introduced in 92b8bde561277a6b83048ce003cc29ff1b380255 and this shows that we need to be very, very careful in changing idl elements from scalars to [ref] pointers! metze --- Summary of changes: source/torture/rpc/eventlog.c | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/torture/rpc/eventlog.c b/source/torture/rpc/eventlog.c index 047146e..feeeb93 100644 --- a/source/torture/rpc/eventlog.c +++ b/source/torture/rpc/eventlog.c @@ -67,11 +67,14 @@ static bool test_GetNumRecords(struct torture_context *tctx, struct dcerpc_pipe struct eventlog_GetNumRecords r; struct eventlog_CloseEventLog cr; struct policy_handle handle; + uint32_t number = 0; if (!get_policy_handle(tctx, p, handle)) return false; + ZERO_STRUCT(r); r.in.handle = handle; + r.out.number = number; torture_assert_ntstatus_ok(tctx, dcerpc_eventlog_GetNumRecords(p, tctx, r), @@ -98,6 +101,7 @@ static bool test_ReadEventLog(struct torture_context *tctx, if (!get_policy_handle(tctx, p, handle)) return false; + ZERO_STRUCT(r); r.in.offset = 0; r.in.handle = handle; r.in.flags = EVENTLOG_BACKWARDS_READ|EVENTLOG_SEQUENTIAL_READ; @@ -107,11 +111,15 @@ static bool test_ReadEventLog(struct torture_context *tctx, struct eventlog_Record rec; struct ndr_pull *ndr; enum ndr_err_code ndr_err; + uint32_t sent_size = 0; + uint32_t real_size = 0; /* Read first for number of bytes in record */ r.in.number_of_bytes = 0; r.out.data = NULL; + r.out.sent_size = sent_size; + r.out.real_size = real_size; status = dcerpc_eventlog_ReadEventLogW(p, tctx, r); @@ -119,8 +127,6 @@ static bool test_ReadEventLog(struct torture_context *tctx, break; } - torture_assert_ntstatus_ok(tctx, status, ReadEventLog failed); - torture_assert_ntstatus_equal(tctx, r.out.result, NT_STATUS_BUFFER_TOO_SMALL, ReadEventLog failed); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-804-gb14d61a
The branch, v4-0-test has been updated
via b14d61a3b8055b7a8172e18e5bd69e7cab6eacdb (commit)
via 86f88eb7b51377344eebf0b6fabad0f5459b3f45 (commit)
via 5572bf854d935f3fc526a38378d23791da249f0f (commit)
via aea50426366dbe971d25d2a948db57885ce224b9 (commit)
from 0c5539e5fedd4123f61d50ee29acdc5a5f0faf76 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit b14d61a3b8055b7a8172e18e5bd69e7cab6eacdb
Merge: 86f88eb7b51377344eebf0b6fabad0f5459b3f45
0c5539e5fedd4123f61d50ee29acdc5a5f0faf76
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 17:03:49 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
v4-0-trivial
commit 86f88eb7b51377344eebf0b6fabad0f5459b3f45
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 17:01:37 2008 +0100
Never build .so versions of tdb/talloc from Samba 4 itself. Rather,
use shared library versions if they are provided by the system.
This puts talloc and tdb in a similar situation as popt:
the system version is used if provided but if it's not there or if it
is too old, we use our internal version statically.
commit 5572bf854d935f3fc526a38378d23791da249f0f
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 16:24:25 2008 +0100
Ignore pidl Makefile, which is autogenerated.
commit aea50426366dbe971d25d2a948db57885ce224b9
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 02:28:41 2008 +0100
Add simple test for ETT_FIELD.
---
Summary of changes:
.gitignore |1 +
source/configure.ac |2 --
source/lib/talloc/config.mk |4 +---
source/lib/tdb/config.mk|4 +---
source/pidl/tests/wireshark-conf.pl |5 -
5 files changed, 7 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index e51be50..a8c1f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+source/pidl/Makefile
source/mkconfig.mk
source/test-results
source/lib/gencache/gencache.h
diff --git a/source/configure.ac b/source/configure.ac
index f7251f5..0a59e41 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -40,7 +40,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc = 1.1.0,
[
m4_include(lib/talloc/libtalloc.m4)
SMB_INCLUDE_MK(lib/talloc/config.mk)
- AC_CONFIG_FILES(lib/talloc/talloc.pc)
]
)
@@ -49,7 +48,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb = 1.1.0,
[
m4_include(lib/tdb/libtdb.m4)
SMB_INCLUDE_MK(lib/tdb/config.mk)
- AC_CONFIG_FILES(lib/tdb/tdb.pc)
]
)
diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 540a05d..af1b590 100644
--- a/source/lib/talloc/config.mk
+++ b/source/lib/talloc/config.mk
@@ -1,8 +1,6 @@
[LIBRARY::LIBTALLOC]
-VERSION = 1.2.0
-SO_VERSION = 1
+OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = talloc.o
-PC_FILE = talloc.pc
MANPAGE = talloc.3
CFLAGS = -Ilib/talloc
PUBLIC_HEADERS = talloc.h
diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index 820c55e..89d6af9 100644
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -1,9 +1,7 @@
# Start SUBSYSTEM LIBTDB
[LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = tdb.pc
+OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = \
common/tdb.o common/dump.o common/io.o common/lock.o \
common/open.o common/traverse.o common/freelist.o \
diff --git a/source/pidl/tests/wireshark-conf.pl
b/source/pidl/tests/wireshark-conf.pl
index d6fe315..c06ac16 100755
--- a/source/pidl/tests/wireshark-conf.pl
+++ b/source/pidl/tests/wireshark-conf.pl
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests = 47;
+use Test::More tests = 48;
use FindBin qw($RealBin);
use lib $RealBin;
use Util;
@@ -164,6 +164,9 @@ test_errors(nofile:1: no dissectorname specified\n,
test_errors(nofile:1: incomplete HF_FIELD command\n,
sub { parse_conf(HF_FIELD hf_idx\n); });
+test_errors(nofile:1: incomplete ETT_FIELD command\n,
+ sub { parse_conf(ETT_FIELD\n); });
+
is_deeply(parse_conf(TYPE winreg_String dissect_myminregstring(); FT_STRING
BASE_DEC 0 0 0 2\n), {
types = {
winreg_String = {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2197-g198768a
The branch, v3-2-test has been updated via 198768a83242cca3f03d839598200d794bb11606 (commit) from a4c773de0fbd303f633e120e817b4c88fcff2064 (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test - Log - commit 198768a83242cca3f03d839598200d794bb11606 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Feb 13 15:10:53 2008 +0100 Use --with-static-libs=libtalloc instead of --with-static-libs=talloc for consistency (and similar for all other examples). Michael --- Summary of changes: source/configure.in |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/configure.in b/source/configure.in index 34b6465..a22979e 100644 --- a/source/configure.in +++ b/source/configure.in @@ -5146,7 +5146,7 @@ fi # appears in the --with-static-libs configure option. # # Example: -# --with-static-libs=talloc makes use of libtalloc.a instead +# --with-static-libs=libtalloc makes use of libtalloc.a instead # of linking the dynamic variant with -ltalloc. # # NOTE: This option only affects libraries that we do not only build @@ -5161,7 +5161,7 @@ AC_ARG_WITH([static-libs], [AS_IF([test $withval], [for lib in `echo $withval | sed -e 's/,/ /g'` ; do [lib=`echo $lib | tr '[a-z]' '[A-Z]'`] - eval LIB_$lib=STATIC + eval LINK_$lib=STATIC done], [])], []) @@ -5196,7 +5196,7 @@ samba_cv_with_libtalloc=yes if test x$samba_cv_with_libtalloc = xyes -a $BLDSHARED = true; then LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET AC_MSG_RESULT(yes) - if test x$LIB_TALLOC = xSTATIC ; then + if test x$LINK_LIBTALLOC = xSTATIC ; then LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET else LIBTALLOC_LIBS=-ltalloc @@ -5240,7 +5240,7 @@ samba_cv_with_libnetapi=yes if test x$samba_cv_with_libnetapi = xyes -a $BLDSHARED = true; then LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET AC_MSG_RESULT(yes) - if test x$LIB_NETAPI = xSTATIC ; then + if test x$LINK_LIBNETAPI = xSTATIC ; then LIBNETAPI_STATIC=$LIBNETAPI_STATIC_TARGET else LIBNETAPI_LIBS=-lnetapi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-805-gaf9e042
The branch, v4-0-test has been updated via af9e0421529104d2583c58f7723abe8612e78f53 (commit) from b14d61a3b8055b7a8172e18e5bd69e7cab6eacdb (commit) http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test - Log - commit af9e0421529104d2583c58f7723abe8612e78f53 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Feb 13 17:42:10 2008 +0100 Allow tdb.mk and talloc.mk to be included at the same time. --- Summary of changes: source/lib/talloc/Makefile.in |4 ++-- source/lib/talloc/talloc.mk |8 source/lib/tdb/Makefile.in|6 +++--- source/lib/tdb/tdb.mk | 14 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/talloc/Makefile.in b/source/lib/talloc/Makefile.in index f5d1cd1..07b8fd4 100644 --- a/source/lib/talloc/Makefile.in +++ b/source/lib/talloc/Makefile.in @@ -28,8 +28,8 @@ all:: showflags $(EXTRA_TARGETS) include $(tallocdir)/rules.mk include $(tallocdir)/talloc.mk -$(SOLIB): $(LIBOBJ) - $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @[EMAIL PROTECTED](SONAME) +$(TALLOC_SOLIB): $(LIBOBJ) + $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @[EMAIL PROTECTED](TALLOC_SONAME) check: test diff --git a/source/lib/talloc/talloc.mk b/source/lib/talloc/talloc.mk index 590adc7..d7a0e0d 100644 --- a/source/lib/talloc/talloc.mk +++ b/source/lib/talloc/talloc.mk @@ -1,9 +1,9 @@ TALLOC_OBJ = $(tallocdir)/talloc.o -SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION) -SONAME = libtalloc.$(SHLIBEXT).1 +TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION) +TALLOC_SONAME = libtalloc.$(SHLIBEXT).1 -all:: libtalloc.a $(SOLIB) testsuite +all:: libtalloc.a $(TALLOC_SOLIB) testsuite testsuite:: $(LIBOBJ) testsuite.o $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS) @@ -28,7 +28,7 @@ install:: all doc:: talloc.3 talloc.3.html clean:: - rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html + rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html test:: testsuite ./testsuite diff --git a/source/lib/tdb/Makefile.in b/source/lib/tdb/Makefile.in index 4a95fdb..090bb6e 100644 --- a/source/lib/tdb/Makefile.in +++ b/source/lib/tdb/Makefile.in @@ -37,11 +37,11 @@ default: all include $(tdbdir)/tdb.mk include $(tdbdir)/rules.mk -all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) +all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) install:: all -$(SOLIB): $(TDB_OBJ) - $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @[EMAIL PROTECTED](SONAME) +$(TDB_SOLIB): $(TDB_OBJ) + $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @[EMAIL PROTECTED](TDB_SONAME) check: test diff --git a/source/lib/tdb/tdb.mk b/source/lib/tdb/tdb.mk index d0f9815..0e53927 100644 --- a/source/lib/tdb/tdb.mk +++ b/source/lib/tdb/tdb.mk @@ -5,8 +5,8 @@ PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT) PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT) ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) -SONAME = libtdb.$(SHLIBEXT).1 -SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION) +TDB_SONAME = libtdb.$(SHLIBEXT).1 +TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION) TDB_LIB = libtdb.a @@ -25,12 +25,12 @@ bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB) bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB) $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb -test:: bin/tdbtorture$(EXEEXT) $(SONAME) +test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME) $(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT) clean:: rm -f test.db test.tdb torture.tdb test.gdbm - rm -f $(SONAME) $(SOLIB) libtdb.a libtdb.$(SHLIBEXT) + rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT) rm -f $(ALL_PROGS) tdb.pc build-python:: _tdb.$(SHLIBEXT) @@ -74,13 +74,13 @@ installheaders:: installdirs installlibs:: all installdirs cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig - cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir) + cp libtdb.a $(TDB_SOLIB) $(DESTDIR)$(libdir) libtdb.a: $(TDB_OBJ) ar -rv libtdb.a $(TDB_OBJ) -libtdb.$(SHLIBEXT): $(SOLIB) +libtdb.$(SHLIBEXT): $(TDB_SOLIB) ln -fs $ $@ -$(SONAME): $(SOLIB) +$(TDB_SONAME): $(TDB_SOLIB) ln -fs $ $@ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-806-ga44af7c
The branch, v4-0-test has been updated
via a44af7c3872e900e1ea0da74ef796213030e29ac (commit)
from af9e0421529104d2583c58f7723abe8612e78f53 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit a44af7c3872e900e1ea0da74ef796213030e29ac
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 18:59:57 2008 +0100
Put soversions and versions for libraries with a hard-coded version in the
generated .mk file.
Move CPPFLAGS to be generated entirely inside configure.ac (simplifies
makefile.pm).
---
Summary of changes:
source/build/smb_build/makefile.pm | 35 +++
source/configure.ac| 19 +++
2 files changed, 22 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/makefile.pm
b/source/build/smb_build/makefile.pm
index 50a16c5..3df1b56 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -45,8 +45,6 @@ sub new($$$)
$self-output(\n);
$self-output(\n);
- $self-_prepare_compiler_linker();
-
if (!$self-{automatic_deps}) {
$self-output(ALL_PREDEP = proto\n);
$self-output(.NOTPARALLEL:\n);
@@ -62,36 +60,6 @@ sub output($$)
$self-{output} .= $text;
}
-sub _prepare_compiler_linker($)
-{
- my ($self) = @_;
-
- my $builddir_headers = ;
- my $libdir;
- my $extra_link_flags = ;
-
- if ($self-{config}-{USESHARED} eq true) {
- $libdir = \$(builddir)/bin/shared;
- $extra_link_flags = -Wl,-rpath-link,\$(builddir)/bin/shared;
- } else {
- $libdir = \$(builddir)/bin/static;
- }
-
- if (!(abs_path($self-{config}-{srcdir}) eq
abs_path($self-{config}-{builddir}))) {
- $builddir_headers= -I\$(builddir)/include -I\$(builddir)
-I\$(builddir)/lib ;
- }
-
- $self-output( __EOD__
-
-CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib
-I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4
-DHAVE_CONFIG_H $self-{config}-{CPPFLAGS}
-
-INSTALL_LINK_FLAGS=$extra_link_flags
-
-INTERN_LDFLAGS = -L$libdir
-__EOD__
-);
-}
-
sub _prepare_mk_files($)
{
my $self = shift;
@@ -251,6 +219,9 @@ sub SharedLibrary($$)
my $has_static_lib = 0;
+ $self-output($ctx-{NAME}_SOVERSION = $ctx-{SO_VERSION}\n) if
(defined($ctx-{SO_VERSION}));
+ $self-output($ctx-{NAME}_VERSION = $ctx-{VERSION}\n) if
(defined($ctx-{VERSION}));
+
push (@{$self-{shared_libs}},
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
push (@{$self-{installable_shared_libs}},
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
diff --git a/source/configure.ac b/source/configure.ac
index 0a59e41..17925df 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -138,6 +138,25 @@ for d in build/smb_build bin include ; do
test -d ${builddir}/$d || AS_MKDIR_P(${builddir}/$d)
done
+AC_SUBST(INTERN_LDFLAGS)
+AC_SUBST(INSTALL_LINK_FLAGS)
+if test $USESHARED = true;
+then
+ INTERN_LDFLAGS=-L\${builddir}/bin/shared
+ INSTALL_LINK_FLAGS=-Wl,-rpath-link,\${builddir}/bin/shared;
+else
+ INTERN_LDFLAGS=-L\${builddir}/bin/static
+fi
+
+builddir_headers=
+
+if test x$ac_abs_srcdir != x$ac_abs_builddir
+then
+ builddir_headers=-I\$(builddir)/include -I\$(builddir)
-I\$(builddir)/lib ;
+fi
+
+CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib
-I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4
-DHAVE_CONFIG_H $CPPFLAGS
+
echo configure: creating build/smb_build/config.pm
cat build/smb_build/config.pmCEOF
# config.pm - Autogenerate by configure. DO NOT EDIT!
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-808-g92dbbc4
The branch, v4-0-test has been updated
via 92dbbc479032ae3d0cf4b2b9e64291128185cf9c (commit)
via 2dce9e4e0d5ba8785fdee3daba91e6c9f4a32040 (commit)
from a44af7c3872e900e1ea0da74ef796213030e29ac (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit 92dbbc479032ae3d0cf4b2b9e64291128185cf9c
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 21:05:58 2008 +0100
Fix corner case.
commit 2dce9e4e0d5ba8785fdee3daba91e6c9f4a32040
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Feb 13 21:03:01 2008 +0100
Use more variables in generated data.mk.
---
Summary of changes:
source/build/smb_build/header.pm |1 +
source/build/smb_build/main.pl | 16 +---
source/build/smb_build/makefile.pm | 35 ++-
source/build/smb_build/output.pm |7 ---
4 files changed, 40 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/header.pm b/source/build/smb_build/header.pm
index b524649..93240f1 100644
--- a/source/build/smb_build/header.pm
+++ b/source/build/smb_build/header.pm
@@ -82,4 +82,5 @@ sub create_smb_build_h($$)
print __FILE__.: creating $file\n;
}
+
1;
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index ff54021..a85eab3 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -63,16 +63,15 @@ foreach my $key (values %$OUTPUT) {
if (defined($key-{PC_FILE})) {
push(@{$mkenv-{pc_files}}, $key-{BASEDIR}/$key-{PC_FILE});
}
- $mkenv-SharedLibrary($key) if ($key-{TYPE} eq LIBRARY) and
+ $mkenv-SharedLibraryPrimitives($key) if ($key-{TYPE} eq LIBRARY) and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
if ($key-{TYPE} eq LIBRARY and
${$key-{OUTPUT_TYPE}}[0] eq SHARED_LIBRARY) {
$shared_libs_used = 1;
}
- $mkenv-SharedModule($key) if ($key-{TYPE} eq MODULE or
+ $mkenv-SharedModulePrimitives($key) if ($key-{TYPE} eq MODULE or
$key-{TYPE}
eq PYTHON) and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
- $mkenv-Binary($key) if grep(/BINARY/, @{$key-{OUTPUT_TYPE}});
$mkenv-PythonFiles($key) if defined($key-{PYTHON_FILES});
$mkenv-Manpage($key) if defined($key-{MANPAGE});
$mkenv-Header($key) if defined($key-{PUBLIC_HEADERS});
@@ -80,6 +79,17 @@ foreach my $key (values %$OUTPUT) {
defined($key-{PUBLIC_PROTO_HEADER});
}
+foreach my $key (values %$OUTPUT) {
+ next unless defined $key-{OUTPUT_TYPE};
+
+ $mkenv-SharedLibrary($key) if ($key-{TYPE} eq LIBRARY) and
+ grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
+ $mkenv-SharedModule($key) if ($key-{TYPE} eq MODULE or
+ $key-{TYPE}
eq PYTHON) and
+ grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
+ $mkenv-Binary($key) if grep(/BINARY/, @{$key-{OUTPUT_TYPE}});
+}
+
$mkenv-write(data.mk);
header::create_smb_build_h($OUTPUT, include/build.h);
diff --git a/source/build/smb_build/makefile.pm
b/source/build/smb_build/makefile.pm
index 3df1b56..9c5ae9e 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -134,6 +134,13 @@ sub Integrated($$)
$self-_prepare_list($ctx, LINK_FLAGS);
}
+sub SharedModulePrimitives($$)
+{
+ my ($self,$ctx) = @_;
+
+ #FIXME
+}
+
sub SharedModule($$)
{
my ($self,$ctx) = @_;
@@ -213,25 +220,27 @@ __EOD__
$self-output(\n);
}
-sub SharedLibrary($$)
+sub SharedLibraryPrimitives($$)
{
my ($self,$ctx) = @_;
- my $has_static_lib = 0;
-
$self-output($ctx-{NAME}_SOVERSION = $ctx-{SO_VERSION}\n) if
(defined($ctx-{SO_VERSION}));
$self-output($ctx-{NAME}_VERSION = $ctx-{VERSION}\n) if
(defined($ctx-{VERSION}));
- push (@{$self-{shared_libs}},
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
- push (@{$self-{installable_shared_libs}},
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
-
- $has_static_lib = 1 if grep(/STATIC_LIBRARY/, @{$ctx-{OUTPUT_TYPE}});
-
- if (not $has_static_lib) {
+ if (not grep(/STATIC_LIBRARY/, @{$ctx-{OUTPUT_TYPE}})) {
$self-output($ctx-{TYPE}_$ctx-{NAME}_OUTPUT =
$ctx-{OUTPUT}\n);
$self-_prepare_list($ctx, OBJ_LIST);
$self-_prepare_list($ctx, FULL_OBJ_LIST);
}
+}
+
+sub SharedLibrary($$)
+{
+ my ($self,$ctx) = @_;
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2203-gf0c6668
The branch, v3-2-test has been updated
via f0c66688588a4e62c4a250b0d21a0fe14bbc5099 (commit)
via c58be24cd43092e5ebf7aa84f167a5cc8344edfc (commit)
via 8d3e7e8bb067b9e0aab79bc460647e8a6176102e (commit)
via a67062f0bee9477b5988a3ce796af81407fc (commit)
via da951e278c5253b0d23145790c817b2f01ac47ef (commit)
from 4321d5aba7ec808aee473c1123027f14bfa19f19 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit f0c66688588a4e62c4a250b0d21a0fe14bbc5099
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 22:55:44 2008 +0100
Add some netr_NETLOGON_INFO init functions.
Guenther
commit c58be24cd43092e5ebf7aa84f167a5cc8344edfc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 22:54:43 2008 +0100
Fix logonctrl2 command in rpcclient.
Guenther
commit 8d3e7e8bb067b9e0aab79bc460647e8a6176102e
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 17:57:57 2008 +0100
Move some lsa init routines around.
Guenther
commit a67062f0bee9477b5988a3ce796af81407fc
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 23:00:36 2008 +0100
Re-run make idl.
Guenther
commit da951e278c5253b0d23145790c817b2f01ac47ef
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 16:46:23 2008 +0100
Fix IDL for netr_ServerPasswordSet.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_netlogon.c |6 +-
source/librpc/gen_ndr/cli_netlogon.h |6 +-
source/librpc/gen_ndr/ndr_netlogon.c | 38 +++---
source/librpc/gen_ndr/netlogon.h |4 +-
source/librpc/idl/netlogon.idl |6 +-
source/rpc_client/init_lsa.c | 40 +++
source/rpc_parse/parse_lsa.c | 40 ---
source/rpc_server/srv_netlog_nt.c| 46 +-
source/rpcclient/cmd_netlogon.c | 70 ++---
9 files changed, 181 insertions(+), 75 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_netlogon.c
b/source/librpc/gen_ndr/cli_netlogon.c
index f355856..7efcae2 100644
--- a/source/librpc/gen_ndr/cli_netlogon.c
+++ b/source/librpc/gen_ndr/cli_netlogon.c
@@ -314,9 +314,9 @@ NTSTATUS rpccli_netr_ServerPasswordSet(struct
rpc_pipe_client *cli,
const char *account_name,
enum netr_SchannelType
secure_channel_type,
const char *computer_name,
- struct netr_Authenticator credential,
- struct samr_Password new_password,
- struct netr_Authenticator
*return_authenticator)
+ struct netr_Authenticator *credential,
+ struct netr_Authenticator
*return_authenticator,
+ struct samr_Password *new_password)
{
struct netr_ServerPasswordSet r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_netlogon.h
b/source/librpc/gen_ndr/cli_netlogon.h
index 0b6ed86..f07c429 100644
--- a/source/librpc/gen_ndr/cli_netlogon.h
+++ b/source/librpc/gen_ndr/cli_netlogon.h
@@ -52,9 +52,9 @@ NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client
*cli,
const char *account_name,
enum netr_SchannelType
secure_channel_type,
const char *computer_name,
- struct netr_Authenticator credential,
- struct samr_Password new_password,
- struct netr_Authenticator
*return_authenticator);
+ struct netr_Authenticator *credential,
+ struct netr_Authenticator
*return_authenticator,
+ struct samr_Password *new_password);
NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *logon_server,
diff --git a/source/librpc/gen_ndr/ndr_netlogon.c
b/source/librpc/gen_ndr/ndr_netlogon.c
index 624c9ac..d31e19a 100644
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -8864,8 +8864,14 @@ static enum ndr_err_code
ndr_push_netr_ServerPasswordSet(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.computer_name, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2204-g4bd02aa
The branch, v3-2-test has been updated
via 4bd02aa6cdfdfd8f3b678fc81a0a1bd70cef9a67 (commit)
from f0c66688588a4e62c4a250b0d21a0fe14bbc5099 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4bd02aa6cdfdfd8f3b678fc81a0a1bd70cef9a67
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 23:06:09 2008 +0100
Use pidl for _netr_LogonControl2.
Guenther
---
Summary of changes:
source/rpc_server/srv_netlog.c| 24 +---
source/rpc_server/srv_netlog_nt.c | 77 -
2 files changed, 51 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index 1b23cd8..791752c 100644
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -226,29 +226,7 @@ static bool api_net_trust_dom_list(pipes_struct *p)
static bool api_net_logon_ctrl2(pipes_struct *p)
{
- NET_Q_LOGON_CTRL2 q_u;
- NET_R_LOGON_CTRL2 r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
-
- /* grab the lsa netlogon ctrl2 query... */
- if(!net_io_q_logon_ctrl2(, q_u, data, 0)) {
- DEBUG(0,(api_net_logon_ctrl2: Failed to unmarshall
NET_Q_LOGON_CTRL2.\n));
- return False;
- }
-
- r_u.status = _net_logon_ctrl2(p, q_u, r_u);
-
- if(!net_io_r_logon_ctrl2(, r_u, rdata, 0)) {
- DEBUG(0,(net_reply_logon_ctrl2: Failed to marshall
NET_R_LOGON_CTRL2.\n));
- return False;
- }
-
- return True;
+ return proxy_netr_call(p, NDR_NETR_LOGONCONTROL2);
}
/*
diff --git a/source/rpc_server/srv_netlog_nt.c
b/source/rpc_server/srv_netlog_nt.c
index 2c52ba8..3cfab78 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -125,29 +125,29 @@ static void send_sync_message(void)
}
/*
- net_reply_logon_ctrl2:
+ _netr_LogonControl2
*/
-NTSTATUS _net_logon_ctrl2(pipes_struct *p, NET_Q_LOGON_CTRL2 *q_u,
NET_R_LOGON_CTRL2 *r_u)
+WERROR _netr_LogonControl2(pipes_struct *p,
+ struct netr_LogonControl2 *r)
{
uint32 flags = 0x0;
uint32 pdc_connection_status = 0x0;
uint32 logon_attempts = 0x0;
uint32 tc_status;
- fstring servername, domain, dc_name, dc_name2;
+ fstring dc_name, dc_name2;
struct sockaddr_storage dc_ss;
-
- /* this should be \\global_myname() */
- unistr2_to_ascii(servername, q_u-uni_server_name, sizeof(servername));
-
- r_u-status = NT_STATUS_OK;
+ const char *domain = NULL;
+ struct netr_NETLOGON_INFO_1 *info1;
+ struct netr_NETLOGON_INFO_2 *info2;
+ struct netr_NETLOGON_INFO_3 *info3;
tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
fstrcpy( dc_name, );
- switch ( q_u-function_code ) {
+ switch (r-in.function_code) {
case NETLOGON_CONTROL_TC_QUERY:
- unistr2_to_ascii(domain, q_u-info.info6.domain,
sizeof(domain));
+ domain = r-in.data-domain;
if ( !is_trusted_domain( domain ) )
break;
@@ -164,7 +164,7 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p,
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
break;
case NETLOGON_CONTROL_REDISCOVER:
- unistr2_to_ascii(domain, q_u-info.info6.domain,
sizeof(domain));
+ domain = r-in.data-domain;
if ( !is_trusted_domain( domain ) )
break;
@@ -182,19 +182,52 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p,
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
default:
/* no idea what this should be */
- DEBUG(0,(_net_logon_ctrl2: unimplemented function
level [%d]\n,
- q_u-function_code));
+ DEBUG(0,(_netr_LogonControl2: unimplemented function
level [%d]\n,
+ r-in.function_code));
+ return WERR_UNKNOWN_LEVEL;
}
/* prepare the response */
- init_net_r_logon_ctrl2( r_u, q_u-query_level, flags,
- pdc_connection_status, logon_attempts, tc_status, dc_name );
+ switch (r-in.level) {
+ case 1:
+ info1 = TALLOC_ZERO_P(p-mem_ctx, struct
netr_NETLOGON_INFO_1);
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2205-gc94538e
The branch, v3-2-test has been updated
via c94538e742e469e4afc6e30d9d99951fda6dd219 (commit)
from 4bd02aa6cdfdfd8f3b678fc81a0a1bd70cef9a67 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit c94538e742e469e4afc6e30d9d99951fda6dd219
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Feb 13 23:12:42 2008 +0100
Remove unused marshalling for NET_LOGON_CTRL and NET_LOGON_CTRL2.
Guenther
---
Summary of changes:
source/include/rpc_netlogon.h| 81 ---
source/rpc_client/cli_netlogon.c | 32 ---
source/rpc_parse/parse_net.c | 432 --
3 files changed, 0 insertions(+), 545 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index f2802b8..f8c9fc5 100644
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -317,87 +317,6 @@ typedef struct netlogon_3_info {
/
-/* NET_Q_LOGON_CTRL - LSA Netr Logon Control */
-
-typedef struct net_q_logon_ctrl_info {
- uint32 ptr;
- UNISTR2 uni_server_name;
- uint32 function_code;
- uint32 query_level;
-} NET_Q_LOGON_CTRL;
-
-/* NET_R_LOGON_CTRL - LSA Netr Logon Control */
-
-typedef struct net_r_logon_ctrl_info {
- uint32 switch_value;
- uint32 ptr;
-
- union {
- NETLOGON_INFO_1 info1;
- } logon;
-
- NTSTATUS status;
-} NET_R_LOGON_CTRL;
-
-
-typedef struct ctrl_data_info_5 {
- uint32 function_code;
-
- uint32 ptr_domain;
- UNISTR2 domain;
-} CTRL_DATA_INFO_5;
-
-typedef struct ctrl_data_info_6 {
- uint32 function_code;
-
- uint32 ptr_domain;
- UNISTR2 domain;
-} CTRL_DATA_INFO_6;
-
-
-/
- Logon Control2 Query
-
- query_level 0x1 - pdc status
- query_level 0x3 - number of logon attempts.
-
- /
-
-/* NET_Q_LOGON_CTRL2 - LSA Netr Logon Control 2 */
-typedef struct net_q_logon_ctrl2_info {
- uint32 ptr; /* undocumented buffer pointer */
- UNISTR2 uni_server_name; /* server name, starting with two '\'s
*/
-
- uint32 function_code;
- uint32 query_level;
- union {
- CTRL_DATA_INFO_5 info5;
- CTRL_DATA_INFO_6 info6;
- } info;
-} NET_Q_LOGON_CTRL2;
-
-/***
- Logon Control Response
-
- switch_value is same as query_level in request
- ***/
-
-/* NET_R_LOGON_CTRL2 - response to LSA Logon Control2 */
-typedef struct net_r_logon_ctrl2_info {
- uint32 switch_value; /* 0x1, 0x3 */
- uint32 ptr;
-
- union
- {
- NETLOGON_INFO_1 info1;
- NETLOGON_INFO_2 info2;
- NETLOGON_INFO_3 info3;
-
- } logon;
-
- NTSTATUS status; /* return code */
-} NET_R_LOGON_CTRL2;
-
/* NEG_FLAGS */
typedef struct neg_flags_info {
uint32 neg_flags; /* negotiated flags */
diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index a6167bb..d28df3c 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -347,38 +347,6 @@ NTSTATUS rpccli_netlogon_setup_creds(struct
rpc_pipe_client *cli,
return NT_STATUS_OK;
}
-/* Logon Control 2 */
-
-NTSTATUS rpccli_netlogon_logon_ctrl2(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
- uint32 query_level)
-{
- prs_struct qbuf, rbuf;
- NET_Q_LOGON_CTRL2 q;
- NET_R_LOGON_CTRL2 r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- fstring server;
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Initialise input parameters */
-
- slprintf(server, sizeof(fstring)-1, %s, cli-cli-desthost);
- init_net_q_logon_ctrl2(q, server, query_level);
-
- /* Marshall data and send request */
-
- CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_LOGON_CTRL2,
- q, r,
- qbuf, rbuf,
- net_io_q_logon_ctrl2,
- net_io_r_logon_ctrl2,
- NT_STATUS_UNSUCCESSFUL);
-
- result = r.status;
- return result;
-}
-
/* Sam synchronisation */
NTSTATUS rpccli_netlogon_sam_sync(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 257f461..8105ac5 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -47,438 +47,6 @@ static bool net_io_neg_flags(const char *desc, NEG_FLAGS
*neg,
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2206-g85ca2c9
The branch, v3-2-test has been updated
via 85ca2c9edb9ac54d3fa18d6b343a73dda1d48040 (commit)
from c94538e742e469e4afc6e30d9d99951fda6dd219 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 85ca2c9edb9ac54d3fa18d6b343a73dda1d48040
Author: Michael Adam [EMAIL PROTECTED]
Date: Thu Feb 14 00:09:17 2008 +0100
Try and fix the Darwin build with dynamic libs.
Golly gosh, this one took me quite some time to figure out!
Hopefully, I did not introduce any typos copying...
Michael
---
Summary of changes:
source/configure.in |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 9b3f5b9..25f52e4 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1974,7 +1974,9 @@ DSO_EXPORTS=
*darwin*) AC_DEFINE(DARWINOS,1,[Whether the host os is
Darwin/MacOSX])
BLDSHARED=true
- LDSHFLAGS=-bundle -flat_namespace -undefined suppress
+ LDSHFLAGS=-dynamiclib -flat_namespace -undefined
suppress
+ CFLAGS=$CFLAGS -fno-common
+ SHLD=\${CC}
SHLIBEXT=dylib
MODULE_EXPORTS=-exported_symbols_list
\$(srcdir)/exports/modules-darwin.syms
SHLIBEXT=dylib
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2209-g07e5138
The branch, v3-2-test has been updated
via 07e5138ad960bce8569ea593ca9a1b4fbf2b1048 (commit)
via debf51aa966d1f243894d458069346a60c76714b (commit)
via d4744fe33fa99152f414e6e3a048eb9479f3d2b2 (commit)
from 85ca2c9edb9ac54d3fa18d6b343a73dda1d48040 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 07e5138ad960bce8569ea593ca9a1b4fbf2b1048
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:16:03 2008 +0100
Use pidl for _lsa_EnumAccounts.
Guenther
commit debf51aa966d1f243894d458069346a60c76714b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:07:54 2008 +0100
Re-run make idl.
Guenther
commit d4744fe33fa99152f414e6e3a048eb9479f3d2b2
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:08:40 2008 +0100
Fix IDL for lsa_EnumAccounts.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_lsa.c |4 +-
source/librpc/gen_ndr/cli_lsa.h |4 +-
source/librpc/idl/lsa.idl |6 ++--
source/rpc_server/srv_lsa.c | 23 +-
source/rpc_server/srv_lsa_nt.c | 50 ++
5 files changed, 32 insertions(+), 55 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_lsa.c b/source/librpc/gen_ndr/cli_lsa.c
index 27ed572..5b277ca 100644
--- a/source/librpc/gen_ndr/cli_lsa.c
+++ b/source/librpc/gen_ndr/cli_lsa.c
@@ -471,8 +471,8 @@ NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle,
uint32_t *resume_handle,
-uint32_t num_entries,
-struct lsa_SidArray *sids)
+struct lsa_SidArray *sids,
+uint32_t num_entries)
{
struct lsa_EnumAccounts r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_lsa.h b/source/librpc/gen_ndr/cli_lsa.h
index ddcd161..3e1a844 100644
--- a/source/librpc/gen_ndr/cli_lsa.h
+++ b/source/librpc/gen_ndr/cli_lsa.h
@@ -53,8 +53,8 @@ NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle,
uint32_t *resume_handle,
-uint32_t num_entries,
-struct lsa_SidArray *sids);
+struct lsa_SidArray *sids,
+uint32_t num_entries);
NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle,
diff --git a/source/librpc/idl/lsa.idl b/source/librpc/idl/lsa.idl
index 305bab3..6eb96a8 100644
--- a/source/librpc/idl/lsa.idl
+++ b/source/librpc/idl/lsa.idl
@@ -297,9 +297,9 @@ import security.idl;
[public] NTSTATUS lsa_EnumAccounts (
[in] policy_handle *handle,
- [in,out] uint32 *resume_handle,
- [in,range(0,8192)] uint32 num_entries,
- [out]lsa_SidArray *sids
+ [in,out,ref] uint32 *resume_handle,
+ [out,ref]lsa_SidArray *sids,
+ [in,range(0,8192)] uint32 num_entries
);
diff --git a/source/rpc_server/srv_lsa.c b/source/rpc_server/srv_lsa.c
index f48a397..a3fe00c 100644
--- a/source/rpc_server/srv_lsa.c
+++ b/source/rpc_server/srv_lsa.c
@@ -185,28 +185,7 @@ static bool api_lsa_priv_get_dispname(pipes_struct *p)
static bool api_lsa_enum_accounts(pipes_struct *p)
{
- LSA_Q_ENUM_ACCOUNTS q_u;
- LSA_R_ENUM_ACCOUNTS r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- if(!lsa_io_q_enum_accounts(, q_u, data, 0)) {
- DEBUG(0,(api_lsa_enum_accounts: failed to unmarshall
LSA_Q_ENUM_ACCOUNTS.\n));
- return False;
- }
-
- r_u.status = _lsa_enum_accounts(p, q_u, r_u);
-
- /* store the response in the SMB stream */
- if(!lsa_io_r_enum_accounts(, r_u, rdata, 0)) {
- DEBUG(0,(api_lsa_enum_accounts: Failed to marshall
LSA_R_ENUM_ACCOUNTS.\n));
- return False;
- }
-
- return True;
+ return proxy_lsa_call(p, NDR_LSA_ENUMACCOUNTS);
}
/***
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 3cf8396..097b505 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++
Build status as of Thu Feb 14 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-02-13 00:01:02.0 + +++ /home/build/master/cache/broken_results.txt 2008-02-14 00:00:49.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Feb 13 00:00:02 2008 +Build status as of Thu Feb 14 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -14,9 +14,9 @@ rsync31 14 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 31 18 0 +samba_3_2_test 31 20 0 samba_4_0_test 29 29 0 smb-build29 3 0 -talloc 31 9 0 +talloc 31 29 0 tdb 31 16 0
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2211-g8c476ad
The branch, v3-2-test has been updated
via 8c476ad51622f76bf8f03f6255369b8e19f24a72 (commit)
via bdbcfa4419a54b98ea577b0052894ddaa06890ce (commit)
from 07e5138ad960bce8569ea593ca9a1b4fbf2b1048 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 8c476ad51622f76bf8f03f6255369b8e19f24a72
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:34:34 2008 +0100
Remove unused marshalling for LSA_ENUM_ACCOUNTS.
Guenther
commit bdbcfa4419a54b98ea577b0052894ddaa06890ce
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:32:56 2008 +0100
Use rpccli_lsa_EnumAccounts() in net and rpcclient.
Guenther
---
Summary of changes:
source/include/rpc_lsa.h | 16
source/rpc_client/cli_lsarpc.c | 56 --
source/rpc_parse/parse_lsa.c | 84
source/rpcclient/cmd_lsarpc.c | 16 ---
source/utils/net_rpc_rights.c | 55 ++
5 files changed, 39 insertions(+), 188 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 724a980..46a01d5 100644
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -495,22 +495,6 @@ typedef struct
} LSA_R_REMOVE_ACCT_RIGHTS;
-/* LSA_Q_ENUM_ACCOUNTS */
-typedef struct lsa_q_enum_accounts
-{
- POLICY_HND pol; /* policy handle */
- uint32 enum_context;
- uint32 pref_max_length;
-} LSA_Q_ENUM_ACCOUNTS;
-
-/* LSA_R_ENUM_ACCOUNTS */
-typedef struct lsa_r_enum_accounts
-{
- uint32 enum_context;
- LSA_SID_ENUM sids;
- NTSTATUS status;
-} LSA_R_ENUM_ACCOUNTS;
-
typedef struct lsa_q_enumprivsaccount
{
POLICY_HND pol; /* policy handle */
diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index c42938d..20a0fe2 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -452,62 +452,6 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client
*cli,
return result;
}
-/** Enumerate list of SIDs */
-
-NTSTATUS rpccli_lsa_enum_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-POLICY_HND *pol, uint32 *enum_ctx, uint32
pref_max_length,
-uint32 *num_sids, DOM_SID **sids)
-{
- prs_struct qbuf, rbuf;
- LSA_Q_ENUM_ACCOUNTS q;
- LSA_R_ENUM_ACCOUNTS r;
- NTSTATUS result;
- int i;
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
-init_lsa_q_enum_accounts(q, pol, *enum_ctx, pref_max_length);
-
- CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_ENUM_ACCOUNTS,
- q, r,
- qbuf, rbuf,
- lsa_io_q_enum_accounts,
- lsa_io_r_enum_accounts,
- NT_STATUS_UNSUCCESSFUL);
-
- result = r.status;
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- if (r.sids.num_entries==0)
- goto done;
-
- /* Return output parameters */
-
- *sids = TALLOC_ARRAY(mem_ctx, DOM_SID, r.sids.num_entries);
- if (!*sids) {
- DEBUG(0, ((cli_lsa_enum_sids): out of memory\n));
- result = NT_STATUS_UNSUCCESSFUL;
- goto done;
- }
-
- /* Copy across names and sids */
-
- for (i = 0; i r.sids.num_entries; i++) {
- sid_copy((*sids)[i], r.sids.sid[i].sid);
- }
-
- *num_sids= r.sids.num_entries;
- *enum_ctx = r.enum_context;
-
- done:
-
- return result;
-}
-
/** Enumerate user privileges
*
* @param cli Handle on an initialised SMB connection */
diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c
index b8a0b03..6a80bb2 100644
--- a/source/rpc_parse/parse_lsa.c
+++ b/source/rpc_parse/parse_lsa.c
@@ -1207,90 +1207,6 @@ bool lsa_io_r_lookup_names4(const char *desc,
LSA_R_LOOKUP_NAMES4 *out, prs_stru
return True;
}
-/*
- initialise a LSA_Q_ENUM_ACCOUNTS structure
-*/
-void init_lsa_q_enum_accounts(LSA_Q_ENUM_ACCOUNTS *trn, POLICY_HND *hnd,
uint32 enum_context, uint32 pref_max_length)
-{
- memcpy(trn-pol, hnd, sizeof(trn-pol));
-
- trn-enum_context = enum_context;
- trn-pref_max_length = pref_max_length;
-}
-
-/***
-reads or writes a structure.
-/
-bool lsa_io_q_enum_accounts(const char *desc, LSA_Q_ENUM_ACCOUNTS *in,
prs_struct *ps, int depth)
-{
- if (in == NULL)
- return False;
-
- prs_debug(ps, depth, desc, lsa_io_q_enum_accounts);
- depth++;
-
- if (!smb_io_pol_hnd(, in-pol, ps, depth))
- return False;
-
- if(!prs_uint32(enum_context , ps, depth,
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2213-g4e3357a
The branch, v3-2-test has been updated
via 4e3357ac3a1b0adac1744a71f997e3442e0e4209 (commit)
via 2ab1167e156e989f4b60fcb4dbc7d7eefc64bed0 (commit)
from 8c476ad51622f76bf8f03f6255369b8e19f24a72 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4e3357ac3a1b0adac1744a71f997e3442e0e4209
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:53:42 2008 +0100
Fix typo.
Guenther
commit 2ab1167e156e989f4b60fcb4dbc7d7eefc64bed0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Feb 14 01:45:07 2008 +0100
Remove accidential commit.
Guenther
---
Summary of changes:
source/rpc_server/srv_lsa_nt.c |6 +++---
source/rpcclient/cmd_netlogon.c |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 097b505..275f3d9 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -1424,10 +1424,10 @@ NTSTATUS _lsa_EnumPrivs(pipes_struct *p,
if ( enum_context = num_privs )
return NT_STATUS_NO_MORE_ENTRIES;
-
- DEBUG(10,(_lsa_enum_privs: enum_context:%d total entries:%d\n,
+
+ DEBUG(10,(_lsa_EnumPrivs: enum_context:%d total entries:%d\n,
enum_context, num_privs));
-
+
if (!find_policy_by_hnd(p, r-in.handle, (void **)(void *)handle))
return NT_STATUS_INVALID_HANDLE;
diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 0efee84..ac27d38 100644
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -32,7 +32,7 @@ static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client
*cli,
uint32_t level = 1;
union netr_CONTROL_DATA_INFORMATION data;
union netr_CONTROL_QUERY_INFORMATION query;
- const char *domain = BER;
+ const char *domain = lp_workgroup();
if (argc 5) {
fprintf(stderr, Usage: %s logon_server function_code
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-812-g309cf40
The branch, v4-0-test has been updated
via 309cf408e01c36e2a12ed2d1462f2bbe407d4597 (commit)
via 9a139c35b7f1326616d26ce13bbdc7d6b22cd9b5 (commit)
via 52d7972d95ddc19d22a4187b4d4428a6c3ed32d5 (commit)
via ca6d9be6cb6a403a81b18fa6e9a6a0518d7f0f68 (commit)
from 92dbbc479032ae3d0cf4b2b9e64291128185cf9c (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit 309cf408e01c36e2a12ed2d1462f2bbe407d4597
Merge: 9a139c35b7f1326616d26ce13bbdc7d6b22cd9b5
92dbbc479032ae3d0cf4b2b9e64291128185cf9c
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 13:37:37 2008 +1100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
v4-0-test
commit 9a139c35b7f1326616d26ce13bbdc7d6b22cd9b5
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 12:50:11 2008 +1100
we need to refuse a root_fid in rename on SMB but not SMB2
commit 52d7972d95ddc19d22a4187b4d4428a6c3ed32d5
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 12:30:31 2008 +1100
Fixed SMB2 rename operations from Vista clients
We needed a flag in bufinfo to mark packets as SMB2, as it seems that
SMB2 uses a different format for the RenameInformation buffer than SMB
does
Also handle the fact that SMB2 clients give the full path to the
target file in the rename, not a relative path
commit ca6d9be6cb6a403a81b18fa6e9a6a0518d7f0f68
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 10:12:33 2008 +1100
Convert SMB and SMB2 code to use a common buffer handling structure
This converts our SMB and SMB2 code to use a common structure struct
request_bufinfo for information on the buffer bounds of a packet,
alignment information and string handling. This allows us to use a
common backend for SMB and SMB2 code, while still using all the same
string and blob handling functions.
Up to now we had been passing a NULL req handle into these common
routines from the SMB2 side of the server, which meant that we failed
any operation which did a bounds checked string extraction (such as a
RenameInformation setinfo call, which is what Vista uses for renaming
files)
There is still some more work to be done on this - for example we can
now remove many of the SMB2 specific buffer handling functions that we
had, and use the SMB ones.
---
Summary of changes:
source/libcli/raw/clisession.c| 20
source/libcli/raw/clitransport.c |4 +-
source/libcli/raw/clitree.c |6 +-
source/libcli/raw/interfaces.h|2 +-
source/libcli/raw/libcliraw.h |4 +-
source/libcli/raw/rawfile.c |4 +-
source/libcli/raw/rawioctl.c |2 +-
source/libcli/raw/rawnegotiate.c | 10 ++--
source/libcli/raw/rawreadwrite.c |6 +-
source/libcli/raw/rawrequest.c| 53 --
source/libcli/raw/rawsearch.c |2 +-
source/libcli/raw/request.h | 19 ++-
source/libcli/raw/smb_signing.c |6 +-
source/libcli/smb2/request.c | 15 +
source/libcli/smb2/smb2.h |5 ++
source/libcli/smb2/transport.c|2 +
source/ntvfs/posix/pvfs_setfileinfo.c | 41 +-
source/smb_server/blob.c | 41 --
source/smb_server/smb/negprot.c |2 +-
source/smb_server/smb/nttrans.c |6 +-
source/smb_server/smb/receive.c |6 ++
source/smb_server/smb/reply.c | 94
source/smb_server/smb/request.c | 64 ++-
source/smb_server/smb/search.c| 12 ++--
source/smb_server/smb/trans2.c| 24
source/smb_server/smb2/fileinfo.c |2 +-
source/smb_server/smb2/negprot.c |2 +
source/smb_server/smb2/receive.c | 20 +++
source/smb_server/smb2/tcon.c |2 +
source/smb_server/smb_server.h|4 +-
30 files changed, 300 insertions(+), 180 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libcli/raw/clisession.c b/source/libcli/raw/clisession.c
index 617131c..55cb3ef 100644
--- a/source/libcli/raw/clisession.c
+++ b/source/libcli/raw/clisession.c
@@ -177,9 +177,9 @@ NTSTATUS smb_raw_sesssetup_recv(struct smbcli_request *req,
parms-old.out.action = SVAL(req-in.vwv, VWV(2));
p = req-in.data;
if (p) {
- p += smbcli_req_pull_string(req, mem_ctx,
parms-old.out.os, p, -1, STR_TERMINATE);
- p += smbcli_req_pull_string(req, mem_ctx,
parms-old.out.lanman, p, -1, STR_TERMINATE);
- p += smbcli_req_pull_string(req, mem_ctx,
parms-old.out.domain, p, -1, STR_TERMINATE);
+ p +=
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-126-g99c5baf
The branch, v3-0-test has been updated
via 99c5baf380c05a3852b6df6bb1eddf1ae080ccdf (commit)
from 3eb2d427a9319199e862e6f6af5db32de6330b34 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-0-test
- Log -
commit 99c5baf380c05a3852b6df6bb1eddf1ae080ccdf
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Feb 13 19:21:12 2008 -0800
Fix obscure bug where if client sends us the krb5 part
of a SPNEGO packet we could drop into the NTLMSSP
part of the processing. This fix only for 3.0.28a,
I have a proper SPNEGO negotiate fix for 3.2.
Jeremy
---
Summary of changes:
source/smbd/sesssetup.c |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index d9a5262..4fe3ac3 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -710,6 +710,15 @@ static int reply_spnego_negotiate(connection_struct *conn,
}
#endif
+ if (got_kerberos_mechanism) {
+ invalidate_intermediate_vuid(vuid);
+ DEBUG(3,(reply_spnego_negotiate: network
+ misconfiguration, client sent us a
+ krb5 ticket and kerberos security
+ not enabled));
+ return ERROR_NT(NT_STATUS_LOGON_FAILURE);
+ }
+
if (*auth_ntlmssp_state) {
auth_ntlmssp_end(auth_ntlmssp_state);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-814-g3aaa2e8
The branch, v4-0-test has been updated
via 3aaa2e86d94675c6c68d66d75292c3e34bfbc81b (commit)
from f6cdf3f1177f63d80be757f007eb15380839b4f5 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit 3aaa2e86d94675c6c68d66d75292c3e34bfbc81b
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 17:11:36 2008 +1100
updated SMB2 code for getinfo according to WSPP docs
- Updated getinfo structures and field names
- also updated the protocol revision number handling to reflect
new docs
---
Summary of changes:
source/libcli/smb2/connect.c |2 +-
source/libcli/smb2/getinfo.c | 45 ++--
source/libcli/smb2/request.c | 27 ++
source/libcli/smb2/smb2.h |3 ++
source/libcli/smb2/smb2_calls.h | 24 ++-
source/smb_server/smb2/fileinfo.c | 42 --
source/smb_server/smb2/negprot.c |9 ---
source/torture/smb2/scan.c| 15 +++-
8 files changed, 109 insertions(+), 58 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libcli/smb2/connect.c b/source/libcli/smb2/connect.c
index 535df11..85ddafc 100644
--- a/source/libcli/smb2/connect.c
+++ b/source/libcli/smb2/connect.c
@@ -133,7 +133,7 @@ static void continue_socket(struct composite_context *creq)
state-negprot.in.security_mode = 0;
state-negprot.in.capabilities = 0;
unix_to_nt_time(state-negprot.in.start_time, time(NULL));
- dialects[0] = 0;
+ dialects[0] = SMB2_DIALECT_REVISION;
state-negprot.in.dialects = dialects;
req = smb2_negprot_send(transport, state-negprot);
diff --git a/source/libcli/smb2/getinfo.c b/source/libcli/smb2/getinfo.c
index 0665dd4..e9f4714 100644
--- a/source/libcli/smb2/getinfo.c
+++ b/source/libcli/smb2/getinfo.c
@@ -30,21 +30,27 @@
struct smb2_request *smb2_getinfo_send(struct smb2_tree *tree, struct
smb2_getinfo *io)
{
struct smb2_request *req;
+ NTSTATUS status;
- req = smb2_request_init_tree(tree, SMB2_OP_GETINFO, 0x28, false, 0);
+ req = smb2_request_init_tree(tree, SMB2_OP_GETINFO, 0x28, true,
+io-in.blob.length);
if (req == NULL) return NULL;
- /* this seems to be a bug, they use 0x29 but only send 0x28 bytes */
- SSVAL(req-out.body, 0x00, 0x29);
-
- SSVAL(req-out.body, 0x02, io-in.level);
- SIVAL(req-out.body, 0x04, io-in.max_response_size);
- SIVAL(req-out.body, 0x08, io-in.unknown1);
- SIVAL(req-out.body, 0x0C, io-in.unknown2);
- SIVAL(req-out.body, 0x10, io-in.flags);
- SIVAL(req-out.body, 0x14, io-in.flags2);
+ SCVAL(req-out.body, 0x02, io-in.info_type);
+ SCVAL(req-out.body, 0x03, io-in.info_class);
+ SIVAL(req-out.body, 0x04, io-in.output_buffer_length);
+ SIVAL(req-out.body, 0x0C, io-in.reserved);
+ SIVAL(req-out.body, 0x08, io-in.input_buffer_length);
+ SIVAL(req-out.body, 0x10, io-in.additional_information);
+ SIVAL(req-out.body, 0x14, io-in.getinfo_flags);
smb2_push_handle(req-out.body+0x18, io-in.file.handle);
+ /* this blob is used for quota queries */
+ status = smb2_push_o32s32_blob(req-out, 0x08, io-in.blob);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(req);
+ return NULL;
+ }
smb2_transport_send(req);
return req;
@@ -116,15 +122,17 @@ struct smb2_request *smb2_getinfo_file_send(struct
smb2_tree *tree, union smb_fi
}
ZERO_STRUCT(b);
- b.in.max_response_size = 0x1;
- b.in.file.handle = io-generic.in.file.handle;
- b.in.level = smb2_level;
+ b.in.info_type= smb2_level 0xFF;
+ b.in.info_class = smb2_level 8;
+ b.in.output_buffer_length = 0x1;
+ b.in.input_buffer_length = 0;
+ b.in.file.handle = io-generic.in.file.handle;
if (io-generic.level == RAW_FILEINFO_SEC_DESC) {
- b.in.flags = io-query_secdesc.in.secinfo_flags;
+ b.in.additional_information =
io-query_secdesc.in.secinfo_flags;
}
if (io-generic.level == RAW_FILEINFO_SMB2_ALL_EAS) {
- b.in.flags2 = io-all_eas.in.continue_flags;
+ b.in.getinfo_flags = io-all_eas.in.continue_flags;
}
return smb2_getinfo_send(tree, b);
@@ -172,9 +180,10 @@ struct smb2_request *smb2_getinfo_fs_send(struct smb2_tree
*tree, union smb_fsin
}
ZERO_STRUCT(b);
- b.in.max_response_size = 0x1;
- b.in.file.handle = io-generic.handle;
- b.in.level = smb2_level;
+ b.in.output_buffer_length = 0x1;
+ b.in.file.handle
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-813-gf6cdf3f
The branch, v4-0-test has been updated
via f6cdf3f1177f63d80be757f007eb15380839b4f5 (commit)
from 309cf408e01c36e2a12ed2d1462f2bbe407d4597 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -
commit f6cdf3f1177f63d80be757f007eb15380839b4f5
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Feb 14 14:54:21 2008 +1100
A better way to handle the different format of RenameInformation in SMB2
We now define a separate info level RAW_SFILEINFO_RENAME_INFORMATION_SMB2
and set that level when handling SMB2 packets. This makes the parsers
clearer.
---
Summary of changes:
source/libcli/raw/interfaces.h|5 +++-
source/libcli/raw/rawsetfileinfo.c| 11 +
source/libcli/smb2/setinfo.c |6 +
source/ntvfs/posix/pvfs_setfileinfo.c |3 ++
source/smb_server/blob.c | 38 +---
source/smb_server/smb2/fileinfo.c |5
6 files changed, 54 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libcli/raw/interfaces.h b/source/libcli/raw/interfaces.h
index 16db17d..24e8ad4 100644
--- a/source/libcli/raw/interfaces.h
+++ b/source/libcli/raw/interfaces.h
@@ -902,7 +902,10 @@ enum smb_setfileinfo_level {
RAW_SFILEINFO_1029= SMB_SFILEINFO_1029,
RAW_SFILEINFO_1032= SMB_SFILEINFO_1032,
RAW_SFILEINFO_1039= SMB_SFILEINFO_1039,
- RAW_SFILEINFO_1040= SMB_SFILEINFO_1040
+ RAW_SFILEINFO_1040= SMB_SFILEINFO_1040,
+
+ /* cope with breakage in SMB2 */
+ RAW_SFILEINFO_RENAME_INFORMATION_SMB2 =
SMB_SFILEINFO_RENAME_INFORMATION|0x8000,
};
/* union used in setfileinfo() and setpathinfo() calls */
diff --git a/source/libcli/raw/rawsetfileinfo.c
b/source/libcli/raw/rawsetfileinfo.c
index a9a1a35..f1e4ee3 100644
--- a/source/libcli/raw/rawsetfileinfo.c
+++ b/source/libcli/raw/rawsetfileinfo.c
@@ -75,6 +75,16 @@ bool smb_raw_setfileinfo_passthru(TALLOC_CTX *mem_ctx,
SIVAL(blob-data, 8, len - 2);
return true;
+ case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
+ NEED_BLOB(20);
+ SIVAL(blob-data, 0, parms-rename_information.in.overwrite);
+ SBVAL(blob-data, 8, parms-rename_information.in.root_fid);
+ len = smbcli_blob_append_string(NULL, mem_ctx, blob,
+
parms-rename_information.in.new_name,
+ STR_UNICODE|STR_TERMINATE);
+ SIVAL(blob-data, 16, len - 2);
+ return true;
+
case RAW_SFILEINFO_POSITION_INFORMATION:
NEED_BLOB(8);
SBVAL(blob-data, 0, parms-position_information.in.position);
@@ -229,6 +239,7 @@ static bool smb_raw_setinfo_backend(struct smbcli_tree
*tree,
case RAW_SFILEINFO_UNIX_LINK:
case RAW_SFILEINFO_UNIX_HLINK:
+ case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
break;
}
diff --git a/source/libcli/smb2/setinfo.c b/source/libcli/smb2/setinfo.c
index d942568..a6e22d9 100644
--- a/source/libcli/smb2/setinfo.c
+++ b/source/libcli/smb2/setinfo.c
@@ -92,6 +92,12 @@ struct smb2_request *smb2_setinfo_file_send(struct smb2_tree
*tree, union smb_se
ZERO_STRUCT(b);
b.in.level = smb2_level;
b.in.file.handle = io-generic.in.file.handle;
+
+ /* change levels so the parsers know it is SMB2 */
+ if (io-generic.level == RAW_SFILEINFO_RENAME_INFORMATION) {
+ io-generic.level = RAW_SFILEINFO_RENAME_INFORMATION_SMB2;
+ }
+
if (!smb_raw_setfileinfo_passthru(tree, io-generic.level, io,
b.in.blob)) {
return NULL;
}
diff --git a/source/ntvfs/posix/pvfs_setfileinfo.c
b/source/ntvfs/posix/pvfs_setfileinfo.c
index ce97787..9c78699 100644
--- a/source/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source/ntvfs/posix/pvfs_setfileinfo.c
@@ -64,6 +64,7 @@ static uint32_t pvfs_setfileinfo_access(union smb_setfileinfo
*info)
break;
case RAW_SFILEINFO_RENAME_INFORMATION:
+ case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
needed = SEC_STD_DELETE;
break;
@@ -382,6 +383,7 @@ NTSTATUS pvfs_setfileinfo(struct ntvfs_module_context
*ntvfs,
break;
case RAW_SFILEINFO_RENAME_INFORMATION:
+ case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
return pvfs_setfileinfo_rename(pvfs, req, h-name,
info);
@@ -579,6 +581,7 @@ NTSTATUS pvfs_setpathinfo(struct ntvfs_module_context
*ntvfs,
return NT_STATUS_OK;
case RAW_SFILEINFO_RENAME_INFORMATION:
