Re: [Samba] samba pdc and notebook in domain
On Wed, 09 Aug 2006 18:58:25 +0200, Gary Dale [EMAIL PROTECTED] wrote: bob_bipbip wrote: hello, when my computer's client is not connected to network (and so cannot connect to pdc), they are not able to log in, they have a message telling us that the system can't log in because the domain is unavailable, how to permit people to log in even if they are not connected to network? --Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ --To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Tell them to log in locally. The Windows login screen has a pulldown list that lets them select which domain to log into. One option is the local computer. ... and they will not use their profile -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem in Copying File?
Hi, my name is Yuen-Siong Cheng, i have installed CentOS into my server and i wan to run the Samba service. I have create the personal folder(only onwer can access this folder only) and public folder(sharing folder, all users can access this folder). Now, that is a problem i faced, the condition is like that, i'm using window XP now, from the network place then i click on view workgroup conputer, i can see the server then i click on it but no folder inside there. Then i tried to search the server, can search the server then i click into it then i can see all the folders that i created before. Can u tell me what's the problem?? The other problem is when i tried to copy file to the owner folder, then it works whereas when i tried to copy file to public (i have set the full permission from the samba server) then cannot run?? Could you help me to solve these problems?? Thanks... Regard Yuen-Siong Cheng Tricera Systems Sdn Bhd Send instant messages to your online friends http://uk.messenger.yahoo.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] intranet could match the fileserver
Please we have samba installed since long time on the system. For an unknown reason, we are unable to connect via intranet from PC to one fileserver while we can see the second fileserver (using samba facilities ) from same PCs. From these PCs we can connect to network drives. Although, samba was stopped and restarted unfortunately we are suffering with the same trouble. Please advice about the action to be taken. Best regards Tamusa CENAERO -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Replacing Windows account with local account.
OK, I'm stumped. I have a Samba server (v3.0.20a) with security=DOMAIN and using winbind to authenticate non-local users against a W2K domain controller. This setup happily serves out home directories and about six other shares. I need to add a local UNIX account for a formerly Windows only user. When I try useradd I get: user username exists. This makes sense becasue of winbind. What I cannot figure out is how 'erase' him so I can create a local user account. I've read thru the man ages but I can't see how to do this. -- Stephen Carville -- polluting the ranks of skeptics since 1995. --- As democracy is perfected, the office of president represents, more and more closely, the inner soul of the people. On some great and glorious day the plain folks of the land will reach their heart's desire at last and the White House will be adorned by a downright moron. -- H. L. Mencken -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Password Chat/Sync problems with 3.0.23
Hi, Following an upgrade to 3.0.23, it appears that my UNIX password sync/chat is no longer working (although I can't confirm it wasn't broken in 3.0.21, it was working before). The XP clients throw up a no permission to change password error when the users attempt to renew passwords. I've carefully checked my password chat script and it appears to be OK. The logs files show: snip . [2006/08/11 12:26:14, 3] smbd/chgpasswd.c:chgpasswd(462) chgpasswd: Password change (as_root=Yes) for user: tester [2006/08/11 12:26:14, 3] smbd/chgpasswd.c:findpty(105) pty: try to open ptyp0, line was /dev/ptyXX [2006/08/11 12:26:14, 3] smbd/chgpasswd.c:findpty(105) pty: try to open ptyp1, line was /dev/ptyp0 [2006/08/11 12:26:14, 3] smbd/chgpasswd.c:chat_with_program(351) chat_with_program: Cannot Allocate pty for password change: tester . /snip relevant portion of smb.conf is: snip passdb backend = tdbsam passwd program = /root/smbpass.sh %u passwd chat = *Password* %n\n *Password* %n\n *Changed* %n\n passwd chat debug = yes unix password sync = Yes username map = /usr/local/etc/samba/smbusers /snip I've tried to simplify my password chat script to the simplest possible variation for test purposes: #!/bin/sh /usr/bin/passwd -l $1 echo Password Changed Thanks in advance... Rob -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] HELP -- Problem with access list on samba 3.0.23b but not on 3.0.20c PDC
I am using samba with NO windbind and a configuration file that has worked for years stopped working at 3.0.23b. The affect was that my [netlogon] area was not being executed. I do have an access list for this share, but any share containing the syntax was failing. The specific line: valid users = @users, hplab, hpmtr, hpytr But I did notice that write/admin user lines were treated similarly. I have a local group called users, and so the manual page states that @users calls in the UNIX users. This syntax seems not to do the right thing in 3.0.23b. Other shares using @unix-groupname fail as well. Since this is a PRODUCTION PDC, this prevents me from upgrading to 3.0.23b. HELP! I have a limited level 10 dump and will send the configuration file over if requested. == M. D. Parker Systems Administrator General Atomics / Electromagnetic Systems +1 858 455 2877 [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] FW: HELP -- Problem with access list on samba 3.0.23b but not on 3.0.20c PDC
-Original Message- From: M. D. Parker [mailto:[EMAIL PROTECTED] Sent: Thursday, August 10, 2006 9:02 AM To: 'samba@lists.samba.org' Subject: HELP -- Problem with access list on samba 3.0.23b but not on 3.0.20c PDC I am using samba with NO windbind and a configuration file that has worked for years stopped working at 3.0.23b. The affect was that my [netlogon] area was not being executed. I do have an access list for this share, but any share containing the syntax was failing. The specific line: valid users = @users, hplab, hpmtr, hpytr But I did notice that write/admin user lines were treated similarly. I have a local group called users, and so the manual page states that @users calls in the UNIX users. This syntax seems not to do the right thing in 3.0.23b. Other shares using @unix-groupname fail as well. Since this is a PRODUCTION PDC, this prevents me from upgrading to 3.0.23b. HELP! I have a limited level 10 dump and will send the configuration file over if requested. == M. D. Parker Systems Administrator General Atomics / Electromagnetic Systems +1 858 455 2877 [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] new problem: PDC is not member of own domain?
Wolfgang Ratzka пишет: Mike A. Kuznetsov schrieb: Yes, I tried it and PDC successfully joined DOMAIN But it didn't help restarted winbind after that? Yes. But it didn't help -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] IIS cache and change notify timeout...
Hi ho there... Environment: IIS 6.0 with everything mapped to aspnet_isapi.dll and the webiste files on a Debian Sarge Samba 3.0.23a-1 server. Problem: When a file is changed on the Samba server, IIS keeps serving the old content as long as you keep requesting the file. What I know so far: Because everything is mapped to aspnet_isapi.dll, everything is cached in the kernel-mode-cache on the Windows machine. When changing the change notify timeout to 5 seconds it takes 5 seconds for the content to change... BUT!!! But when I don't wait 5 seconds en keep refreshing/requesting the page every 2 seconds, the content never changes?!?! Only when I stop refreshing for at least the time set as the change notify timeout, the content will be updated... Any advice on this? If not I'm affraid I'll have to set the change notify timeout to 1 second which is quit costly for my system (if I understand correctly that is)... Regards, Sander -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Replacing Windows account with local account.
Stephen Carville wrote: Stephen Carville wrote: OK, I'm stumped. I have a Samba server (v3.0.20a) with security=DOMAIN and using winbind to authenticate non-local users against a W2K domain controller. This setup happily serves out home directories and about six other shares. I need to add a local UNIX account for a formerly Windows only user. When I try useradd I get: user username exists. This makes sense becasue of winbind. What I cannot figure out is how 'erase' him so I can create a local user account. I've read thru the man ages but I can't see how to do this. I'm thinking I can comment out the windbind in /etc/nswitch.conf, create a unix user, set up the mappng in smbusers, then uncomment winbind. I'll try that Monday. -- Stephen I believe that simply stopping the winbind daemon for the duration will achieve the same thing. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Printers authentication in WinXP
I need some information, for in these days I cannot verify. Is there (still) a bug in Windows XP Home and Professional which doesn't allow the authentication to share a printer if there is no user with password? So, it wouldn't be possible to share printer in a public, anonymous way... Thanx MS -- linux user no.: 353546 machine no.: 299353 public key at: http://keyserver.linux.it -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] OS/2 client crash on Find Close2 - Solved
On 09.08.2006, at 13:46, Andreas Taegener wrote: On 08.08.2006, at 11:19, Andreas Paulick wrote: Andreas Taegener schrieb: Hello, I have just migrated an old OS/2 file server to a Linux box with Samba 3.0.23a. Now the OS/2 clients crash from time to time. I found a way to reproduce/force the crash using PMMail and did some experiments. The popuplog.os2 on the clients (Warp4 and eComStation) always names a sys3175 in pmshell.exe / doscall1.dll. Using Ethereal and comparing the network traffic between a) a client and the Samba server and b) the same client and an OS/2 server (in this setup the client doesn't crash) I found at least one difference in the SMB protocol. It is the Find Close2 Response SMB message. [snip] The sys 3175 in pmshell at accesses sounds to me like broken EA-Support. Especially Pmmail and WPSWizard struggles at the loss of EAs. The only solution I have found so far is a downgrade to Samba 3.0.18? (I dont know the exact the last working version) where the EAs still works. I looked at the EA stuff and you might be right. There is a difference in the logs regarding the EAs of PMMAIL.INI (OS/2 ini format). I have sent Guenther some log files. Maybe he finds something. The problem is solved. The real reason for the crash was a problem with the handling of EAs. Find_Close2 was just some coincedence, sorry. Jeremy and kukks have analyzed it and created a patch which solved the problem. Many thanks Jeremy and kukks. Regards Andreas -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] append to path from login script?
I'm wondering if there is a way to add a network share (either UNC or mapped drive) to the path of a user when they login? for example have a directory \\smbserver\apps and put putty.exe in there.. so that when I sit down at a machine I will always have putty in the path.. Is that possible? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] append to path from login script?
On Mon, 14 Aug 2006 11:36:48 -0400 B. Cook [EMAIL PROTECTED] wrote: I'm wondering if there is a way to add a network share (either UNC or mapped drive) to the path of a user when they login? for example have a directory \\smbserver\apps and put putty.exe in there.. so that when I sit down at a machine I will always have putty in the path.. Is that possible? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba It seems more related to how to do an Windows script. Look for some resouce about this. Good luck. -- Miguel Da Silva. Servicio de Informatica. Facultad de Ciencias. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] append to path from login script?
B. Cook wrote: I'm wondering if there is a way to add a network share (either UNC or mapped drive) to the path of a user when they login? for example have a directory \\smbserver\apps and put putty.exe in there.. so that when I sit down at a machine I will always have putty in the path.. Is that possible? The user's path is %path% in Windows. A command like: SET path=%path%;\\smbserver\apps should work. Of course, if you have the share mapped to a drive letter, you should use that instead (shorter and gives an extra layer of redirection, in case you change the server). -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] append to path from login script?
just do windows key + r, \\smbserver\apps\putty.exe or install wpkg and have it copy putty.exe to all users\desktop B. Cook wrote: I'm wondering if there is a way to add a network share (either UNC or mapped drive) to the path of a user when they login? for example have a directory \\smbserver\apps and put putty.exe in there.. so that when I sit down at a machine I will always have putty in the path.. Is that possible? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] append to path from login script?
I make this that way, in the logon script: After mapping the network drive. ... path | find R:\Util; nul if errorlevel 1 echo Verificando a variavel de ambiente path NAO DEFINIDA if not errorlevel 1 goto path_ok \\%SERVIDOR%\netlogon\winset.exe PATH=R:\Util;%PATH% if errorlevel 1 echo Definindo a variavel de ambiente path .. ERRO if not errorlevel 1 echo Definindo a variavel de ambiente path .. OK :path_ok echo Verificando a variavel de ambiente path JA DEFINIDA ... I dont remeber where I got the winset.exe utility, its needed to redefine the environmnet variables outside the shell executing the logon script. Edmundo Valle Neto B. Cook escreveu: I'm wondering if there is a way to add a network share (either UNC or mapped drive) to the path of a user when they login? for example have a directory \\smbserver\apps and put putty.exe in there.. so that when I sit down at a machine I will always have putty in the path.. Is that possible? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Connection scripts with the 'prexec' clause
Hi all, I am running Samba 3.0.20B on an AIX server with SECURITY=USER using an LDAP backend.I am looking for a way to capture the actual username(%USER_NAME%) that the client user is logged onto his individual workstation with and compare it with the user(%u) they are connecting with the share as.If they are different, I want to reject the user's connection. After doing some reading, it appears that a connection script with the 'preexec' clause is the way to go but the Samba environment variables only can intrepret client's hostname, netbios name, and ip address. Is there a way for me to capture the client's logon id(%USERNAME%) or accomplish this task another way? Thanks in advance, Maurice Forte -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Connecting multiple places
Hello, i have somehow to connect samba installations on two places. Site A and site B will be connected via a VPN tunnel. However the link between these two places is so low (and I predict it to be so unstable) that I cannot use Samba over the VPN (roaming profiles, homes etc.). The users are mixed between those places and i cannot distinguish here who will be where. On site A there is already a Samba domain A running with the MySQL passdb backend (i really know what i am doing here). So I need a link between two samba installations. How to establish this? First of all i think it is useful to replicate the password database between the two places via the means of the DBMS. (Which should work fine in theory, in practice i hope it will). How to handle the Samba? Shall i choose the same domain names? With this setup: How do i force clients on site A to use the Samba on site A and clients on site B to use the Samba on site B to not waste bandwidth? Or should i choose a different domain name on site B but use the same database as backend? Will this work? What about the SID? I hope somehow can give me some hints how to handle such a situation. Mario -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Connection scripts with the 'prexec' clause
On Monday 14 August 2006 14:57, Maurice Forte wrote: Hi all, I am running Samba 3.0.20B on an AIX server with SECURITY=USER using an LDAP backend.I am looking for a way to capture the actual username(%USER_NAME%) that the client user is logged onto his individual workstation with and compare it with the user(%u) they are connecting with the share as.If they are different, I want to reject the user's connection. After doing some reading, it appears that a connection script with the 'preexec' clause is the way to go but the Samba environment variables only can intrepret client's hostname, netbios name, and ip address. Is there a way for me to capture the client's logon id(%USERNAME%) or accomplish this task another way? Thanks in advance, Maurice Forte I believe you can use LDAP to handle the security measures you are talking about. I don't know how to set LDAP to do that but someone in a LDAP forum should. However, keep in mind such a scheme may cause an issue if you have users working on a shared project that is kept in one, or both, of their users folders on the server. You should allow users the option to let other users access their files if need be. Again I have no clue how to setup LDAP to handle this but I believe it can be done. --Shaun -- It isn't about it being free. Rather its about the freedom it brings. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] building of libnss_wins.so
It appears that nsswitch/libnss_wins.so doesn't get built when the configure option --without-winbind is specified. Is this not useful when not using winbind? I thought it would allow a wins lookup for hosts on a Samba PDC regardless of whether or not winbind was being used. Thanks. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems printing lanscape on SAMBA advertized printers
Hi, I'm having a problem with some model of HP printers (specifically 5Ms and 8100s) not printing landscape when accessed via SAMBA (version 3.0.14a-2). The problem is actually visible in print preview on the windows box. But have the same computer print to the printer directly and there's no problem. I'm presuming this has something to do with the way SAMBA interfaces with the windows drivers. Drivers are installed the easy way by unzipping them on a PC, and letting windows actually upload the driver to the server. I'm truly baffled and so I hope someone else has seen this problem and gotten through it. Thanks, Rob -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] wbinfo: Client not found in Kerberos database
Hi, I'm trying to get winbind going per: http://samba.org/samba/docs/man/Samba3-HOWTO/winbind.html I get as far as joining the domain with: # net join -U Administrator Administrator's password: realm must be set in in smb.conf for ADS join to succeed. ADS join did not work, falling back to RPC... Joined domain MYDOMAIN. Winbind starts fine, but when I try to get users or groups: # wbinfo -u Error looking up domain users A look at the log shows: libads/kerberos.c:ads_kinit_password(164) kerberos_kinit_password host/[EMAIL PROTECTED] failed: Client not found in Kerberos database nsswitch/winbindd_ads.c:ads_cached_connection(109) ads_connect for domain MYDOMAIN failed: Client not found in Kerberos database Some querying shows: # wbinfo --domain-info=MYDOMAIN Name : MYDOMAIN Alt_Name : MYDOMAIN.LOCAL SID : S-1-5-21-1309917255-3401098517-287287619 Active Directory : Yes Native: No Primary : Yes Sequence : -1 # wbinfo --sequence SOURCE : 1 BUILTIN : 1 MYDOMAIN : DISCONNECTED Noting the DISCONNECTED I tried to join the domain with: # net ads join -U Administrator Administrator's password: realm must be set in in smb.conf for ADS join to succeed. I asked my sysadmin what our realm is, but he didn't know what I was referring to. I suggested it might have something to do with Kerberos, and he said we're using ActiveDirectory without Kerberos. The last time I used Samba was pre-AD days, and I'm at a loss as to how to troubleshoot this further? Thanks, Ian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Client/server test harness - Crucible 1.6
On Mon, 2006-08-07 at 18:57 -0700, Bryce Harrington wrote: Hi all, At OLS last month I presented about doing automated client/server testing of NFSv4. In and after that talk there was some discussion with Steve French about using the same framework for testing Samba, so I thought it might be worthwhile to post about the framework on this list. We've also just put out a new 1.6 release of Crucible; I've attached the release notice below. Steve French pointed out that most of the work done for automating the testing of NFS can be reused for testing any other filesystem, so I would love to explore how to use this for testing Samba. You would do well to repost this to the samba-technical list, for more developer attention. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. http://redhat.com signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] wbinfo: Client not found in Kerberos database
On Mon, 2006-08-14 at 17:48 -0700, Ian Brandt wrote: # net ads join -U Administrator Administrator's password: realm must be set in in smb.conf for ADS join to succeed. and probably you better configure also krb5.conf accordingly I asked my sysadmin what our realm is, but he didn't know what I was referring to. I suggested it might have something to do with Kerberos, and he said we're using ActiveDirectory without Kerberos. There exist no such thing like AD without Kerberos, in windows the REALM is the same as the AD DNS Domain. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Rejecting auth request from client error after power outage
We had a power failure in our small test lab and the samba server crashed after the UPS shutdown procedure didn't work quite like it was supposed to. Upon reboot, the services started fine but none of our 3 XP test machines were able to login to the Samba PDC. The Samba logs showed the following... _net_auth2: creds_server_check failed. Rejecting auth request from client FLUENT02 machine account FLUENT02$ No problems at all in the previous 6 months with the same setup other than an older samba version, even surviving a few power outages along the way. Since this is a testing setup I tried restoring all the samba files in /etc/samba and /var/lib/samba from last night when everything was working and then restarting the services but we still couldn't login. Finally just removed and readded the machines to the domain. Is there something obvious that I missed? I would have thought that restoring the files would have worked but no luck unless I missed a critical file or something. Like I said, this is a testing/staging area so it was no big deal but I'd like to find out if there's an easier way than readding all the machines in case it happens to our production server. We're a pretty small shop with only 23 client machines but I do the admin stuff plus my engineering duties so I try to be prepared as best I can for disaster but apparently I failed this time! And I will test the UPS shutdown procedure so hopefully this won't happen again. Fedora Core 4 Samba 3.0.23b using tdbsam -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Rejecting auth request from client error after power outage
On Mon, Aug 14, 2006 at 10:06:49PM -0500, Mark wrote: _net_auth2: creds_server_check failed. Rejecting auth request from client FLUENT02 machine account FLUENT02$ That looks like a problem with machine account verification. Can you try rebooting a client and seeing it it gets it back in sync ? Fedora Core 4 Samba 3.0.23b using tdbsam What backend filesystem are you using the the tdbsam files ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: svn commit: samba r17526 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/modules setup
Andrew,
I do not think this is the right way to do what you aim for.
I'd like you to revert the change and instead build a module, to be used
with the ldap backend, that will remove or change these attributes. This
will make it work even if someone sets them by hands with an explicit
add/modify operation and will leave the rest of code simpler (as it is
now).
I may integrate the operational/objectguid functionality in the schema
module later on, so you would need to change this code anyway.
Simo.
On Mon, 2006-08-14 at 00:59 +, [EMAIL PROTECTED] wrote:
Author: abartlet
Date: 2006-08-14 00:59:57 + (Mon, 14 Aug 2006)
New Revision: 17526
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17526
Log:
Move timestamp generation into the objectGUID module. It probably
needs to be renamed (operation_add?).
This allows me to match the behaviour and substitute with the
entryUUID module for remote LDAP connections.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
branches/SAMBA_4_0/source/lib/ldb/modules/operational.c
branches/SAMBA_4_0/source/setup/provision
branches/SAMBA_4_0/source/setup/provision_partitions.ldif
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
2006-08-13 23:58:04 UTC (rev 17525)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
2006-08-14 00:59:57 UTC (rev 17526)
@@ -50,6 +50,35 @@
return NULL;
}
+/*
+ add a time element to a record
+*/
+static int add_time_element(struct ldb_message *msg, const char *attr,
time_t t)
+{
+ struct ldb_message_element *el;
+ char *s;
+
+ if (ldb_msg_find_element(msg, attr) != NULL) {
+ return 0;
+ }
+
+ s = ldb_timestring(msg, t);
+ if (s == NULL) {
+ return -1;
+ }
+
+ if (ldb_msg_add_string(msg, attr, s) != 0) {
+ return -1;
+ }
+
+ el = ldb_msg_find_element(msg, attr);
+ /* always set as replace. This works because on add ops, the flag
+is ignored */
+ el-flags = LDB_FLAG_MOD_REPLACE;
+
+ return 0;
+}
+
/* add_record: add objectGUID attribute */
static int objectguid_add(struct ldb_module *module, struct ldb_request *req)
{
@@ -60,6 +89,7 @@
struct GUID guid;
NTSTATUS nt_status;
int ret;
+ time_t t = time(NULL);
ldb_debug(module-ldb, LDB_DEBUG_TRACE, objectguid_add_record\n);
@@ -82,6 +112,7 @@
/* we have to copy the message as the caller might have it as a const */
down_req-op.add.message = msg = ldb_msg_copy_shallow(down_req,
req-op.add.message);
if (msg == NULL) {
+ talloc_free(down_req);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -91,14 +122,22 @@
nt_status = ndr_push_struct_blob(v, msg, guid,
(ndr_push_flags_fn_t)ndr_push_GUID);
if (!NT_STATUS_IS_OK(nt_status)) {
- return -1;
+ talloc_free(down_req);
+ return LDB_ERR_OPERATIONS_ERROR;
}
ret = ldb_msg_add_value(msg, objectGUID, v);
if (ret) {
+ talloc_free(down_req);
return ret;
}
+ if (add_time_element(msg, whenCreated, t) != 0 ||
+ add_time_element(msg, whenChanged, t) != 0) {
+ talloc_free(down_req);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
ldb_set_timeout_from_prev_req(module-ldb, req, down_req);
/* go on with the call chain */
@@ -113,6 +152,54 @@
return ret;
}
+/* modify_record: update timestamps */
+static int objectguid_modify(struct ldb_module *module, struct ldb_request
*req)
+{
+ struct ldb_request *down_req;
+ struct ldb_message *msg;
+ int ret;
+ time_t t = time(NULL);
+
+ ldb_debug(module-ldb, LDB_DEBUG_TRACE, objectguid_add_record\n);
+
+ /* do not manipulate our control entries */
+ if (ldb_dn_is_special(req-op.add.message-dn)) {
+ return ldb_next_request(module, req);
+ }
+
+ down_req = talloc(req, struct ldb_request);
+ if (down_req == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ *down_req = *req;
+
+ /* we have to copy the message as the caller might have it as a const */
+ down_req-op.mod.message = msg = ldb_msg_copy_shallow(down_req,
req-op.mod.message);
+ if (msg == NULL) {
+ talloc_free(down_req);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ if (add_time_element(msg, whenChanged, t) != 0) {
+ talloc_free(down_req);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ldb_set_timeout_from_prev_req(module-ldb, req, down_req);
svn commit: samba r17531 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2006-08-14 07:40:18 + (Mon, 14 Aug 2006)
New Revision: 17531
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17531
Log:
fix whitespaces
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_path.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_path.m42006-08-14 03:28:25 UTC
(rev 17530)
+++ branches/SAMBA_4_0/source/build/m4/check_path.m42006-08-14 07:40:18 UTC
(rev 17531)
@@ -26,7 +26,7 @@
logfilebase=${localstatedir}/log/samba
privatedir=${localstatedir}/lib/samba/private
sysconfdir=${sysconfdir}/samba
- modulesdir=${libdir}/samba
+modulesdir=${libdir}/samba
datadir=${datadir}/samba
includedir=${includedir}/samba-4.0
winbindd_socket_dir=${localstatedir}/run/samba/winbind_pipe
svn commit: samba r17532 - in branches/SAMBA_4_0/source/lib/tdb/common: .
Author: metze Date: 2006-08-14 09:52:58 + (Mon, 14 Aug 2006) New Revision: 17532 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17532 Log: merge from SAMBA_3_0 Revision: 17460 First step at fixing the build breakage with the groupmapping test. On Linux, F_RDLCK is defined to 0, for example NetBSD has it at 1. Still does not work fully though. Still investigating. metze Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c === --- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 07:40:18 UTC (rev 17531) +++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 09:52:58 UTC (rev 17532) @@ -261,6 +261,7 @@ if (tdb_unlock_record(tdb, tdb-travlocks.off) != 0) return tdb_null; tdb-travlocks.off = tdb-travlocks.hash = 0; + tdb-travlocks.lock_rw = F_RDLCK; if (tdb_next_lock(tdb, tdb-travlocks, rec) = 0) return tdb_null;
svn commit: samba r17533 - in branches/SAMBA_4_0/source/param: .
Author: metze Date: 2006-08-14 09:58:50 + (Mon, 14 Aug 2006) New Revision: 17533 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17533 Log: add missing include, so that socket options = TCP_NODELY as default can work... metze Modified: branches/SAMBA_4_0/source/param/loadparm.c Changeset: Modified: branches/SAMBA_4_0/source/param/loadparm.c === --- branches/SAMBA_4_0/source/param/loadparm.c 2006-08-14 09:52:58 UTC (rev 17532) +++ branches/SAMBA_4_0/source/param/loadparm.c 2006-08-14 09:58:50 UTC (rev 17533) @@ -59,6 +59,7 @@ #include pstring.h #include system/time.h #include system/locale.h +#include system/network.h /* needed for TCP_NODELAY */ #include librpc/gen_ndr/svcctl.h #include librpc/gen_ndr/samr.h #include smb_server/smb_server.h
svn commit: samba r17536 - in branches/SAMBA_3_0/source/libads: .
Author: vlendec
Date: 2006-08-14 12:54:37 + (Mon, 14 Aug 2006)
New Revision: 17536
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17536
Log:
Add a debug message citing the reason why an LDAP connection failed, inspired
by Christian M Ambach [EMAIL PROTECTED].
Volker
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 12:42:46 UTC (rev
17535)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 12:54:37 UTC (rev
17536)
@@ -65,6 +65,11 @@
ldp = ldap_open(server, port);
+ if (ldp == NULL) {
+ DEBUG(2,(Could not open LDAP connection to %s:%d: %s\n,
+server, port, strerror(errno)));
+ }
+
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
alarm(0);
svn commit: samba r17537 - in branches/SAMBA_4_0/source/include/system: .
Author: metze Date: 2006-08-14 13:10:53 + (Mon, 14 Aug 2006) New Revision: 17537 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17537 Log: if we replace inet_ntoa() we need a prototype of rep_inet_ntoa... metze Modified: branches/SAMBA_4_0/source/include/system/network.h Changeset: Modified: branches/SAMBA_4_0/source/include/system/network.h === --- branches/SAMBA_4_0/source/include/system/network.h 2006-08-14 12:54:37 UTC (rev 17536) +++ branches/SAMBA_4_0/source/include/system/network.h 2006-08-14 13:10:53 UTC (rev 17537) @@ -70,6 +70,7 @@ #endif #ifdef REPLACE_INET_NTOA +char *rep_inet_ntoa(struct in_addr ip); #define inet_ntoa rep_inet_ntoa #endif
svn commit: samba r17538 - in branches/SAMBA_4_0/source/torture/libnet: .
Author: metze
Date: 2006-08-14 14:53:38 + (Mon, 14 Aug 2006)
New Revision: 17538
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17538
Log:
this function should be static...
metze
Modified:
branches/SAMBA_4_0/source/torture/libnet/libnet_user.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_user.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2006-08-14
13:10:53 UTC (rev 17537)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2006-08-14
14:53:38 UTC (rev 17538)
@@ -307,7 +307,7 @@
continue; \
}
-void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r, int
num_changes)
+static void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r,
int num_changes)
{
enum fields { account_name = 0, full_name, description, home_directory,
home_drive,
comment, logon_script, profile_path, acct_expiry,
allow_password_change,
svn commit: samba r17539 - in branches/SAMBA_4_0/source: lib/crypto script/tests torture/local
Author: metze
Date: 2006-08-14 14:56:21 + (Mon, 14 Aug 2006)
New Revision: 17539
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17539
Log:
add HMAC-MD5 test code based on the example values from rfc 2104, 2202
metze
Added:
branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c
Modified:
branches/SAMBA_4_0/source/script/tests/test_local.sh
branches/SAMBA_4_0/source/torture/local/config.mk
branches/SAMBA_4_0/source/torture/local/local.c
Changeset:
Added: branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c
===
--- branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c 2006-08-14 14:53:38 UTC
(rev 17538)
+++ branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c 2006-08-14 14:56:21 UTC
(rev 17539)
@@ -0,0 +1,99 @@
+/*
+ Unix SMB/CIFS implementation.
+ HMAC MD5 tests
+ Copyright (C) Stefan Metzmacher 2006
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include includes.h
+#include lib/crypto/crypto.h
+
+struct torture_context;
+
+static DATA_BLOB data_blob_repeat_byte(uint8_t byte, size_t length)
+{
+ DATA_BLOB b = data_blob(NULL, length);
+ memset(b.data, byte, length);
+ return b;
+}
+
+/*
+ This uses the test values from rfc 2104, 2202
+*/
+BOOL torture_local_crypto_hmacmd5(struct torture_context *torture)
+{
+ BOOL ret = True;
+ uint32_t i;
+ struct {
+ DATA_BLOB key;
+ DATA_BLOB data;
+ DATA_BLOB md5;
+ } testarray[] = {
+ {
+ .key= data_blob_repeat_byte(0x0b, 16),
+ .data = data_blob_string_const(Hi There),
+ .md5=
strhex_to_data_blob(9294727a3638bb1c13f48ef8158bfc9d)
+ },{
+ .key= data_blob_string_const(Jefe),
+ .data = data_blob_string_const(what do ya want for
nothing?),
+ .md5=
strhex_to_data_blob(750c783e6ab0b503eaa86e310a5db738)
+ },{
+ .key= data_blob_repeat_byte(0xaa, 16),
+ .data = data_blob_repeat_byte(0xdd, 50),
+ .md5=
strhex_to_data_blob(56be34521d144c88dbb8c733f0e8b3f6)
+ },{
+ .key=
strhex_to_data_blob(0102030405060708090a0b0c0d0e0f10111213141516171819),
+ .data = data_blob_repeat_byte(0xcd, 50),
+ .md5=
strhex_to_data_blob(697eaf0aca3a3aea3a75164746ffaa79)
+ },{
+ .key= data_blob_repeat_byte(0x0c, 16),
+ .data = data_blob_string_const(Test With Truncation),
+ .md5=
strhex_to_data_blob(56461ef2342edc00f9bab995690efd4c)
+ },{
+ .key= data_blob_repeat_byte(0xaa, 80),
+ .data = data_blob_string_const(Test Using Larger Than
Block-Size Key - Hash Key First),
+ .md5=
strhex_to_data_blob(6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd)
+ },{
+ .key= data_blob_repeat_byte(0xaa, 80),
+ .data = data_blob_string_const(Test Using Larger Than
Block-Size Key
+and Larger Than One
Block-Size Data),
+ .md5=
strhex_to_data_blob(6f630fad67cda0ee1fb1f562db3aa53e)
+ }
+ };
+
+ for (i=0; i ARRAY_SIZE(testarray); i++) {
+ HMACMD5Context ctx;
+ uint8_t md5[16];
+ int e;
+
+ hmac_md5_init_rfc2104(testarray[i].key.data,
testarray[i].key.length, ctx);
+ hmac_md5_update(testarray[i].data.data,
testarray[i].data.length, ctx);
+ hmac_md5_final(md5, ctx);
+
+ e = memcmp(testarray[i].md5.data,
+ md5,
+ MIN(testarray[i].md5.length, sizeof(md5)));
+ if (e != 0) {
+ printf(hmacmd5 test[%u]: failed\n, i);
+ dump_data(0, testarray[i].key.data,
testarray[i].key.length);
+ dump_data(0, testarray[i].data.data,
testarray[i].data.length);
+ dump_data(0, testarray[i].md5.data,
testarray[i].md5.length);
+ dump_data(0, md5, sizeof(md5));
+ ret = False;
+ }
+ }
+
+ return ret;
+}
Modified:
svn commit: samba r17540 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-08-14 16:35:56 + (Mon, 14 Aug 2006) New Revision: 17540 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17540 Log: store command line args of selftest.sh in local vars as $0,$1,$2,$3 may change in side the script or included scripts. This fixes the usage of SOCKET_WRAPPER on non linux systems (tested on IRIX 6.4) metze Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh === --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-08-14 14:56:21 UTC (rev 17539) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-08-14 16:35:56 UTC (rev 17540) @@ -7,17 +7,22 @@ exit fi +ARG0=$0 +ARG1=$1 +ARG2=$2 +ARG3=$3 + if [ -z $TORTURE_MAXTIME ]; then TORTURE_MAXTIME=600 fi OLD_PWD=`pwd` -PREFIX=$1 +PREFIX=$ARG1 PREFIX=`echo $PREFIX | sed s+//+/+` export PREFIX # allow selection of the test lists -TESTS=$2 +TESTS=$ARG2 if [ $TESTS = all ]; then TLS_ENABLED=yes @@ -29,7 +34,7 @@ LD_LIBRARY_PATH=$OLD_PWD/bin:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -incdir=`dirname $0` +incdir=`dirname $ARG0` echo -n PROVISIONING... . $incdir/mktestsetup.sh $PREFIX || exit 1 echo DONE @@ -37,14 +42,16 @@ PATH=bin:$PATH export PATH -DO_SOCKET_WRAPPER=$3 +DO_SOCKET_WRAPPER=$ARG3 if [ x$DO_SOCKET_WRAPPER = xSOCKET_WRAPPER ];then SOCKET_WRAPPER_DIR=$PREFIX/sw export SOCKET_WRAPPER_DIR echo SOCKET_WRAPPER_DIR=$SOCKET_WRAPPER_DIR +else + echo NOT USING SOCKET_WRAPPER fi -incdir=`dirname $0` +incdir=`dirname $ARG0` . $incdir/test_functions.sh SMBD_TEST_FIFO=$PREFIX/smbd_test.fifo @@ -94,8 +101,8 @@ kill `cat $PIDDIR/smbd.pid` END=`date` -echo START: $START ($0); -echo END: $END ($0); +echo START: $START ($ARG0); +echo END: $END ($ARG0); # if there were any valgrind failures, show them count=`find $PREFIX -name 'valgrind.log*' | wc -l` @@ -109,4 +116,4 @@ done fi -teststatus $0 $failed +teststatus $ARG0 $failed
svn commit: samba r17541 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/smbd SAMBA_3_0_23/source/include
Author: jra
Date: 2006-08-14 16:53:14 + (Mon, 14 Aug 2006)
New Revision: 17541
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17541
Log:
When returning a trans2 request, if the max data
bytes returned is less than the amount we want
to send, return what we can and set STATUS_BUFFER_OVERFLOW
(doserror ERRDOS,ERRbufferoverflow). Required by
OS/2 to handle EA's that are too large. It's hard
to test this in Samba4 smbtorture as the max data
bytes returned is hard coded at 0x (as it is
in the Samba3 client libraries also). I used a
custom version of Samba4 smbtorture to test this
out. Might add a max data bytes param to make
this testable in the build farm. Confirmed by
Guenter Kukkukk (sambaos2) [EMAIL PROTECTED]
and Andreas Taegener [EMAIL PROTECTED]
that this fixes the issue.
Jeremy.
Modified:
branches/SAMBA_3_0/source/include/doserr.h
branches/SAMBA_3_0/source/smbd/blocking.c
branches/SAMBA_3_0/source/smbd/error.c
branches/SAMBA_3_0/source/smbd/trans2.c
branches/SAMBA_3_0_23/source/include/doserr.h
Changeset:
Modified: branches/SAMBA_3_0/source/include/doserr.h
===
--- branches/SAMBA_3_0/source/include/doserr.h 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/include/doserr.h 2006-08-14 16:53:14 UTC (rev
17541)
@@ -44,6 +44,7 @@
#define ERRnomem 8 /* Out of memory */
#define ERRbadmem 9 /* Invalid memory block address */
#define ERRbadenv 10 /* Invalid environment */
+#define ERRbadformat 11 /* Bad Format */
#define ERRbadaccess 12 /* Invalid open mode */
#define ERRbaddata 13 /* Invalid data (only from ioctl call) */
#define ERRres 14 /* reserved */
@@ -60,6 +61,7 @@
#define ERRfilexists 80 /* File in operation already exists */
#define ERRinvalidparam 87
#define ERRcannotopen 110 /* Cannot open the file specified */
+#define ERRbufferoverflow 111
#define ERRinsufficientbuffer 122
#define ERRinvalidname 123 /* Invalid name */
#define ERRunknownlevel 124
Modified: branches/SAMBA_3_0/source/smbd/blocking.c
===
--- branches/SAMBA_3_0/source/smbd/blocking.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/blocking.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -458,7 +458,8 @@
construct_reply_common(inbuf, outbuf);
SCVAL(outbuf,smb_com,SMBtrans2);
SSVAL(params,0,0);
- send_trans2_replies(outbuf, max_send, params, 2, NULL, 0);
+ /* Fake up max_data_bytes here - we know it fits. */
+ send_trans2_replies(outbuf, max_send, params, 2, NULL, 0, 0x);
return True;
}
Modified: branches/SAMBA_3_0/source/smbd/error.c
===
--- branches/SAMBA_3_0/source/smbd/error.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/error.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -81,9 +81,8 @@
If the override errors are set they take precedence over any passed in values.
/
-int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus,
int line, const char *file)
+void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS
ntstatus, int line, const char *file)
{
- int outsize = set_message(outbuf,0,0,True);
BOOL force_nt_status = False;
BOOL force_dos_status = False;
@@ -125,6 +124,11 @@
eclass,
ecode));
}
+}
+int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus,
int line, const char *file)
+{
+ int outsize = set_message(outbuf,0,0,True);
+ error_packet_set(outbuf, eclass, ecode, ntstatus, line, file);
return outsize;
}
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -573,7 +573,8 @@
char *params,
int paramsize,
char *pdata,
- int datasize)
+ int datasize,
+ int max_data_bytes)
{
/* As we are using a protocol LANMAN1 then the max_send
variable must have been set in the sessetupX call.
@@ -594,6 +595,18 @@
set_message(outbuf,10,0,True);
+ /* Modify the data_to_send and datasize and set the error if
+ we're trying to send more than max_data_bytes. We still send
+ the part of the packet(s) that fit. Strange, but needed
+ for OS/2. */
+
+ if (max_data_bytes 0 datasize max_data_bytes) {
+ DEBUG(5,(send_trans2_replies: max_data_bytes %d exceeded by
svn commit: linux-cifs-client r69 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: jra Date: 2006-08-14 22:30:06 + (Mon, 14 Aug 2006) New Revision: 69 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=linux-cifs-clientrev=69 Log: Roll back the header_assemble changes to try and keep closer to the git tree. Jeremy. Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c branches/linux-converged-for-old-kernels/fs/cifs/connect.c branches/linux-converged-for-old-kernels/fs/cifs/misc.c branches/linux-converged-for-old-kernels/fs/cifs/transport.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h === --- branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h 2006-08-14 22:30:06 UTC (rev 69) @@ -76,7 +76,6 @@ extern int map_smb_to_linux_error(struct smb_hdr *smb); extern void header_assemble(struct smb_hdr *, char /* command */ , const struct cifsTconInfo *, - __u16 mid, int /* length of fixed section (word count) in two byte units */); extern int small_smb_init_no_tc(const int smb_cmd, const int wct, struct cifsSesInfo *ses, Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c === --- branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c 2006-08-14 22:30:06 UTC (rev 69) @@ -211,8 +211,7 @@ return -ENOMEM; } - header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon, - tcon ? GetNextMid(tcon-ses-server) : 0, wct); + header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,wct); if(tcon != NULL) cifs_stats_inc(tcon-num_smbs_sent); @@ -356,7 +355,7 @@ *response_buf = *request_buf; header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon, - tcon ? GetNextMid(tcon-ses-server) : 0, wct /*wct */ ); + wct /*wct */ ); if(tcon != NULL) cifs_stats_inc(tcon-num_smbs_sent); Modified: branches/linux-converged-for-old-kernels/fs/cifs/connect.c === --- branches/linux-converged-for-old-kernels/fs/cifs/connect.c 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/connect.c 2006-08-14 22:30:06 UTC (rev 69) @@ -2118,8 +2118,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses-server), 13 /* wct */ ); + NULL /* no tCon exists yet */ , 13 /* wct */ ); + smb_buffer-Mid = GetNextMid(ses-server); pSMB-req_no_secext.AndXCommand = 0xFF; pSMB-req_no_secext.MaxBufferSize = cpu_to_le16(ses-server-maxBuf); pSMB-req_no_secext.MaxMpxCount = cpu_to_le16(ses-server-maxReq); @@ -2410,8 +2411,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses-server), 12 /* wct */ ); + NULL /* no tCon exists yet */ , 12 /* wct */ ); + smb_buffer-Mid = GetNextMid(ses-server); pSMB-req.hdr.Flags2 |= SMBFLG2_EXT_SEC; pSMB-req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); @@ -2743,8 +2745,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses-server), 12 /* wct */ ); + NULL /* no tCon exists yet */ , 12 /* wct */ ); + smb_buffer-Mid = GetNextMid(ses-server); pSMB-req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); pSMB-req.hdr.Flags2 |= SMBFLG2_EXT_SEC; pSMB-req.AndXCommand = 0xFF; @@ -3131,8 +3134,9 @@ smb_buffer_response = smb_buffer; header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, - NULL /*no tid */ , GetNextMid(ses-server), 4 /*wct */ ); + NULL /*no tid */ , 4 /*wct */ ); + smb_buffer-Mid = GetNextMid(ses-server); smb_buffer-Uid = ses-Suid; pSMB = (TCONX_REQ *) smb_buffer; pSMBr = (TCONX_RSP *) smb_buffer_response; Modified: branches/linux-converged-for-old-kernels/fs/cifs/misc.c === --- branches/linux-converged-for-old-kernels/fs/cifs/misc.c 2006-08-11 22:04:45 UTC (rev
Build status as of Tue Aug 15 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-08-14 00:00:27.0 + +++ /home/build/master/cache/broken_results.txt 2006-08-15 00:00:20.0 + @@ -1,18 +1,18 @@ -Build status as of Mon Aug 14 00:00:01 2006 +Build status as of Tue Aug 15 00:00:02 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 ccache 22 4 0 -distcc 23 2 0 +distcc 22 2 0 lorikeet-heimdal 0 0 0 ppp 12 0 0 rsync27 2 0 samba0 0 0 samba-docs 0 0 0 -samba4 35 18 3 -samba_3_031 5 0 +samba4 35 18 4 +samba_3_031 7 0 smb-build20 20 0 -talloc 14 4 0 -tdb 22 8 0 +talloc 16 4 0 +tdb 23 8 0
svn commit: samba r17544 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: abartlet Date: 2006-08-15 00:31:39 + (Tue, 15 Aug 2006) New Revision: 17544 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17544 Log: Add execute bit to js script. Andrew Bartlett Modified: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js Changeset: Property changes on: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js ___ Name: svn:executable + *
svn commit: samba r17545 - in branches/SAMBA_4_0/testdata/samba3: .
Author: abartlet
Date: 2006-08-15 02:18:32 + (Tue, 15 Aug 2006)
New Revision: 17545
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17545
Log:
I forgot to commit this file, a source file for the the samba3sam
tests, by mkhl.
Andrew Bartlett
Added:
branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif
Changeset:
Added: branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif
===
--- branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif 2006-08-15
00:31:39 UTC (rev 17544)
+++ branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif 2006-08-15
02:18:32 UTC (rev 17545)
@@ -0,0 +1,201 @@
+dn: @INDEXLIST
[EMAIL PROTECTED]: name
[EMAIL PROTECTED]: sAMAccountName
[EMAIL PROTECTED]: objectSid
[EMAIL PROTECTED]: objectClass
[EMAIL PROTECTED]: objectCategory
[EMAIL PROTECTED]: member
[EMAIL PROTECTED]: uidNumber
[EMAIL PROTECTED]: gidNumber
[EMAIL PROTECTED]: unixName
[EMAIL PROTECTED]: privilege
[EMAIL PROTECTED]: nCName
+
+dn: @ATTRIBUTES
+userPrincipalName: CASE_INSENSITIVE
+servicePrincipalName: CASE_INSENSITIVE
+dnsDomain: CASE_INSENSITIVE
+dnsRoot: CASE_INSENSITIVE
+nETBIOSName: CASE_INSENSITIVE
+cn: CASE_INSENSITIVE
+dc: CASE_INSENSITIVE
+name: CASE_INSENSITIVE
+dn: CASE_INSENSITIVE
+sAMAccountName: CASE_INSENSITIVE
+objectClass: CASE_INSENSITIVE
+sambaPassword: HIDDEN
+krb5Key: HIDDEN
+ntPwdHash: HIDDEN
+sambaNTPwdHistory: HIDDEN
+lmPwdHash: HIDDEN
+sambaLMPwdHistory: HIDDEN
+createTimestamp: HIDDEN
+modifyTimestamp: HIDDEN
+groupType: INTEGER
+sAMAccountType: INTEGER
+systemFlags: INTEGER
+userAccountControl: INTEGER
+
+dn: @SUBCLASSES
+top: domain
+top: person
+top: group
+domain: domainDNS
+domain: builtinDomain
+person: organizationalPerson
+organizationalPerson: user
+user: computer
+template: userTemplate
+template: groupTemplate
+
+dn: @KLUDGEACL
+passwordAttribute: sambaPassword
+passwordAttribute: ntPwdHash
+passwordAttribute: sambaNTPwdHistory
+passwordAttribute: lmPwdHash
+passwordAttribute: sambaLMPwdHistory
+passwordAttribute: krb5key
+
+# the rootDSE module looks in this record for its base data
+dn: cn=ROOTDSE
+subschemaSubentry: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN}
+dsServiceName: CN=NTDS
Settings,CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,${BASEDN}
+defaultNamingContext: ${BASEDN}
+rootDomainNamingContext: ${BASEDN}
+configurationNamingContext: CN=Configuration,${BASEDN}
+schemaNamingContext: CN=Schema,CN=Configuration,${BASEDN}
+supportedLDAPVersion: 3
+dnsHostName: ${DNSNAME}
+ldapServiceName: ${DNSDOMAIN}:[EMAIL PROTECTED]
+serverName:
CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site,CN=Sites,CN=Configuration,${BASEDN}
+domainFunctionality: 0
+forestFunctionality: 0
+domainControllerFunctionality: 2
+isSynchronized: TRUE
+vendorName: Samba Team (http://samba.org)
+vendorVersion: ${VERSION}
+
+dn: CN=Templates
+objectClass: top
+objectClass: container
+cn: Templates
+description: Container for SAM account templates
+instanceType: 4
+showInAdvancedViewOnly: TRUE
+systemFlags: 2348810240
+objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
+isCriticalSystemObject: TRUE
+
+###
+# note! the template users must not match normal searches. Be careful
+# with what classes you put them in
+###
+
+dn: CN=TemplateUser,CN=Templates
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateUser
+instanceType: 4
+userAccountControl: 514
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+pwdLastSet: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306368
+objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN}
+
+dn: CN=TemplateComputer,CN=Templates
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateComputer
+instanceType: 4
+userAccountControl: 4098
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+pwdLastSet: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306369
+objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN}
+
+dn: CN=TemplateTrustingDomain,CN=Templates
+objectClass: top
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateTrustingDomain
+instanceType: 4
+userAccountControl: 2080
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306370
+
+dn: CN=TemplateGroup,CN=Templates
+objectClass: top
+objectClass: Template
+objectClass: groupTemplate
+cn: TemplateGroup
+instanceType: 4
+groupType: -2147483646
+sAMAccountType: 268435456
+objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN}
+
+# Currently this isn't used, we don't have a way to detect it
svn commit: samba r17546 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: abartlet
Date: 2006-08-15 02:24:19 + (Tue, 15 Aug 2006)
New Revision: 17546
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17546
Log:
Test the loading of per-partition modules.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/testprogs/ejs/ldb.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/ldb.js
===
--- branches/SAMBA_4_0/testprogs/ejs/ldb.js 2006-08-15 02:18:32 UTC (rev
17545)
+++ branches/SAMBA_4_0/testprogs/ejs/ldb.js 2006-08-15 02:24:19 UTC (rev
17546)
@@ -82,7 +82,7 @@
{
ok = ldb.add(
dn: @MODULES
[EMAIL PROTECTED]: rootdse,operational,objectguid,rdn_name,partition
[EMAIL PROTECTED]: rootdse,operational,rdn_name,partition
dn: cn=ROOTDSE
defaultNamingContext: cn=Test
@@ -95,6 +95,7 @@
replicateEntries: @SUBCLASSES
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
+modules: cn=PartTest:objectguid
);
}
@@ -238,9 +239,9 @@
assert(res7.length == 0);
var res8 = ldb.search(x=11, cn=sub,cn=parttest, ldb.SCOPE_DEFAULT,
attrs);
- assert(res8[0].objectGUID != undefined);
- assert(res8[0].createTimestamp != undefined);
- assert(res8[0].whenCreated != undefined);
+
+ assert(res8[0].objectGUID == undefined); /* The objectGUID module is
not loaded here */
+ assert(res8[0].uSNCreated != undefined);
assert(res8[0].name == x11);
assert(res8[0].cn == x11);
svn commit: samba r17547 - in branches/SAMBA_4_0: source/script/tests testprogs/ejs
Author: abartlet
Date: 2006-08-15 02:25:10 + (Tue, 15 Aug 2006)
New Revision: 17547
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17547
Log:
Add test by mkhl for some of our variable substituion behaviour.
Andrew Bartlett
Added:
branches/SAMBA_4_0/testprogs/ejs/base.js
Modified:
branches/SAMBA_4_0/source/script/tests/test_ejs.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-15 02:24:19 UTC
(rev 17546)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-15 02:25:10 UTC
(rev 17547)
@@ -21,6 +21,8 @@
PATH=bin:$PATH
export PATH
+testit base.js $SCRIPTDIR/base.js || failed=`expr $failed + 1`
+
for f in samr.js echo.js; do
testit $f $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD ||
failed=`expr $failed + 1`
done
Added: branches/SAMBA_4_0/testprogs/ejs/base.js
===
--- branches/SAMBA_4_0/testprogs/ejs/base.js2006-08-15 02:24:19 UTC (rev
17546)
+++ branches/SAMBA_4_0/testprogs/ejs/base.js2006-08-15 02:25:10 UTC (rev
17547)
@@ -0,0 +1,15 @@
+#!/bin/sh
+exec smbscript $0 ${1+$@}
+libinclude(base.js);
+
+var obj = new Object();
+obj.FOO = foo;
+obj.BAR = bar;
+var str1 = ${FOO}:${BAR};
+var str2 = ${FOO}:${BAR} ; // note the space after the brace
+var sub1 = substitute_var(str1, obj);
+var sub2 = substitute_var(str2, obj);
+
+assert(str1 + == str2);
+assert(sub1 + == sub2);
+exit(0);
Property changes on: branches/SAMBA_4_0/testprogs/ejs/base.js
___
Name: svn:executable
+ *
svn commit: samba r17548 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet
Date: 2006-08-15 02:39:38 + (Tue, 15 Aug 2006)
New Revision: 17548
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17548
Log:
It is a good idea to commit the fix (from mkhl) before the test that
shows the need for...
Martin Kuhl writes:
The ejs function `substitute_var' returns `undefined' when the first
argument ends in a pattern that should be substituted.
For that reason, the second assertion fails in the following test-case:
,
| libinclude(base.js);
|
| var obj = new Object();
| obj.FOO = foo;
| obj.BAR = bar;
| var str1 = ${FOO}:${BAR};
| var str2 = ${FOO}:${BAR} ; // note the space after the brace
| var sub1 = substitute_var(str1, obj);
| var sub2 = substitute_var(str2, obj);
|
| assert(str1 + == str2);
| assert(sub1 + == sub2);
`
The problem is that the function `split' returns a single-element
array in both cases:
a) the string to split doesn't contain the split pattern
b) the string ends with the split pattern
To work around this, the following patch tests this condition and
returns `undefined' only if the string to split (`list[i]') really
didn't contain a closing brace.
Modified:
branches/SAMBA_4_0/source/scripting/libjs/base.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/base.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/base.js 2006-08-15 02:25:10 UTC
(rev 17547)
+++ branches/SAMBA_4_0/source/scripting/libjs/base.js 2006-08-15 02:39:38 UTC
(rev 17548)
@@ -72,7 +72,7 @@
var i;
for (i=1;ilist.length;i++) {
var list2 = split(}, list[i], 1);
- if (list2.length 2) {
+ if ((list2.length 2) (list2[0] + } != list[i])) {
return undefined;
}
var key = list2[0];
