[Samba] Did a recent Samba upgrade change something to lose connection with iptables enabled?
Hello, I am still a newbie to Linux, but I can find my ways around as long as I have help. For some reason if I leave my iptables enabled, I will lose my Samba share connection after a few minutes. Of course, then iptables disabled, I have no problems. I am using Debian with Kernel 2.6.14-K7. Is this normal? Thank you in advance. :) -- Ever watch ants just crawling around? They walk in that single straight line, a long, a long, long mile of ants. Sometimes they will walk over and pick up their dead friends and carry those around. I'm pretty sure it's because they can get in the carpool lane and pass up that line. --Ellen DeGeneres /\___/\ / /\ /\ \ Phillip (Ant) @ http://antfarm.ma.cx (Personal Web Site) | |o o| | Ant's Quality Foraged Links (AQFL): http://aqfl.net \ _ / E-mail: [EMAIL PROTECTED] or [EMAIL PROTECTED] ( ) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Question regarding Samba rights
Where did samba store information regarding user privilege? It seems stored locally to server where the net rpc rights grant command runs on. Do I need to runs same commands to all domain controllers? --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba + openldap + kerberos + pam
On Wed, 2006-08-23 at 11:30 -0400, Karen R McArthur wrote: RedHat enterprise v4 openldap 2.2.13-4 cyrus-sasl 2.1.19-5.EL4 samba 3.0.10-1.4E.9 krb-libs 1.3.4-27 server1: openldap and kerberos server server2: samba server We have openldap working as posix source for all of our *nix logins - with passwords stored in kerberos accessed via sasl. We have an exiting samba server running on redhat for macintosh/windows user access to network storage. Our passwords are stored in smbpasswd. Access works fine in this configuration. We would like to centralize this authentication and have samba read it's passwords from ldap/kerberos. I assume the errors are because I do not have sambaLMPassword or sambaNTPassword stored in my ldap database. I do not want to do this. How do I set up samba to read all access from pam (as in the smbclient) and not require storage of passwords in ldap? The only way not to duplicate the password info is to have the KDC use the Samba passwords. It is *not possible* to use encrypted passwords (which these clients expect) and PAM. Heimdal can read the Samba password database, and I have operated a site on this basis. 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] Open space
Here is my smb.conf, it still doesn't work... :( Any ideas? Sorry for the hustle, Shlomi -Original Message- From: Per Qvindesland [mailto:[EMAIL PROTECTED] Sent: Friday, August 25, 2006 2:03 PM To: Shlomi Levi Cc: samba@lists.samba.org Subject: Re: [Samba] Open space Hello Shlomi, your programming should look like the following: [programming] comment = Programming folder, previouly known as G path = /programming read only = No guest ok = Yes public = yes writable = yes printable = no create mask = 0777 Well at least it works for me :) Regards Per Shlomi Levi wrote: Hi, I am trying to create a share on samba that will be writable to all users. I followed the example on smb.conf, but with no success. The [homes] sharing works fine (and this is a restricted share). Bellow is the output of testparm: Load smb config files from /etc/samba/smb.conf Processing section [homes] Processing section [printers] Processing section [programming] Loaded services file OK. Server role: ROLE_STANDALONE Press enter to see a dump of your service definitions [global] workgroup = SHLNET server string = Samba Server passwd program = /usr/bin/passwd %u username map = /etc/samba/smbusers unix password sync = Yes log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = /etc/printcap dns proxy = No cups options = raw [homes] comment = Home Directories read only = No browseable = No [printers] comment = All Printers path = /var/spool/samba guest ok = Yes printable = Yes browseable = No [programming] comment = Programming folder, previouly known as G path = /programming read only = No guest ok = Yes And these are the permissions of the directory: drwxrwxrwt 3 root root 4096 May 20 23:11 /programming Where did I go wrong? Shlomi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] W2K workstation not disconnecting without a reset
Hi, Trying to be simple and direct. My last email didn't get answers. Thank you and best regards. Problem: --- W2K workstations remains connected do samba server at port 139, even after logoff, and this causes: false wtmp information and no possibility do control (even no fail proof) simultaneous logins. Workaround ( not acceptable ) -- Reset the workstations. A lot of them. Environment: --- Slackware 10.2 ( kernel 2.4.31 ) Samba 3.0.23b ( from www.samba.org ) OpenLdap 2.3.24 NFS server sharing /home in the same server. Relevant tried and readings --- (1) http://us5.samba.org/samba/docs/man/Samba-HOWTO-Collection/diagnosis.html (2) Mailing lists, with several search criteria. (3) http://us5.samba.org/samba/docs/man/Samba-HOWTO-Collection/AdvancedNetworkManagement.html#id2628488 (4) Tips from Internet -- [1] net use * /d /y, when executing logoff ( W2K workstations ) [2] smb ports = 139 ( smb.conf ) [3] SaveConnections = no ( regedit, all keys changed from yes to no ) [4] Enabling and disabling utmp = yes ( smb.conf ) [5] Enabling and disabling deadtime = 0 ( smb.conf, tried 1, 2, 3 ) [6] Enabling and disabling keep alive = 300 ( smb.conf ) [7] No firewall/bridge filter blocking connections between W2K/Samba. (5) tcpdump shows stations remains connected to server port 139, after logoff, even with SaveConnections = no and net use * /d /y. (6) lsof, confirms that connections to port 139 (7) log level = 2 -Available a 451 lines ( one single logon/logoff logging time ), I am not sure about sending to list, because there are no Errors I have seen. Should I send it anyway? (8) smb.conf [global] workgroup = MYDOMAIN server string = Samba Server %v netbios name = sambaserver netbios aliases = sambaserver dos charset = CP850 display charset = ISO8859-1 unix charset = ISO8859-1 encrypt passwords = Yes passwd program = /usr/local/sbin/smbldap-passwd -u %u passwd chat = *New*password* %n\n *Retype*new*password* %n\n passwd chat debug = yes unix password sync = yes log file = /var/log/samba/samba.%m max log size = 100 preserve case = yes short preserve case = yes default case = lower time server = yes max connections = 0 deadtime = 1 keepalive = 300 utmp = yes smb ports = 139 log level = 2 security = user hosts allow = 127.0.0.1 192.168.0 192.168.1 printcap name = /etc/printcap browseable = no pid directory = /var/run/ printing = lprng max log size = 5000 passdb backend = ldapsam:ldaps://ldap.mydomain.com ldap admin dn = cn=smbuseratldap,ou=DSA,dc=mydomain,dc=com ldap suffix = dc=mydomain,dc=com ldap group suffix = ou=groups ldap user suffix = ou=people ldap machine suffix = ou=machines ldap idmap suffix = ou=Idmap ldap passwd sync = yes idmap uid = 1-2 idmap gid = 1-2 ldap delete dn = yes ldap ssl = on socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 interfaces = eth0, lo bind interfaces only = yes local master = yes os level = 20 domain master = yes preferred master = yes domain logons = yes logon script = everybody.bat logon path = \\%L\Profiles\%U wins support = yes dns proxy = no add machine script = /usr/local/sbin/smbldap-useradd -t8 -w %u add user script = /usr/local/sbin/smbldap-useradd -m %u delete user script = /usr/local/sbin/smbldap-userdel %u add group script = /usr/local/sbin/smbldap-groupadd -p %g add user to group script = /usr/local/sbin/smbldap-groupmod -m %u % g delete user from group script = /usr/local/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/local/sbin/smbldap-usermod -g %g %u ## [Profiles] # # Disabled preexec exactly because the problem reported # # root preexec = /bin/fechar.sh %U %m # root preexec close = yes # root postexec = /bin/change_perms.sh %U path = /profiles read only = no browseable = no create mask = 0600 directory mask = 0700 csc policy = disable force user = %U profile acls = yes ### [homes] comment = Home dirs browseable = no writable = yes public = no follow symlinks = no create mode = 0600 directory mode = 0700 invalid users = root bin daemon adm lp sync shutdown halt mail ftp rpc sshd gdm pop nobody ## [netlogon] comment = Network Logon Service valid users = %U path = /profiles/netlogon guest ok = no writable = no share modes = no force create mode = 0755 force directory mode = 0755 browseable = no # [tmp] comment = Temporary file path = /tmp read only = yes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Concern about 3.0.22-3.0.23b upgrade (algorithmic SIDs issue)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Michael Deutschmann wrote:
On Fri, 25 Aug 2006, you wrote:
If you are running a member server and using winbindd,
the SID allocation for domain users and groups does not
change.
I'm running as a lone Samba PDC, and -not-
using winbindd.
The RID algorithm in 3.0.23c will potentially impact you.
Have I already suggested testing the 3.02.3c-gwc patch
at http://www.samba.org/~jerryy/patches/ ? You might
want to get the patch and read over the release notes
at least.
You can use net groupmap to set up SIDs for groups
and 'pdbedit -a' to add users to the passdb (which
will give them an explicit SID in the machine's domain).
The relevant users are already in smbpasswd (how
else would they log in?).
If you have a user not in smbpasswd that owns a file,
and that file is copied to a client's NTFS partition,
the user SID will be S-1-22-1-${uid}. Whether this
is an issue for your environment or not is up to
you to decide. I'm just pointing it out.
cheers, jerry
=
Samba--- http://www.samba.org
Centeris --- http://www.centeris.com
What man is a man who does not make the world better? --Balian
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.4 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFE8HqiIR7qMdg1EfYRAv7IAKDRCrlz8LUFv/IZfXTpyphIBqhzXQCgrxzd
ZyN6XYUACeH7vjI2iBo6ujI=
=uWLd
-END PGP SIGNATURE-
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Question regarding Samba rights
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 beast wrote: Where did samba store information regarding user privilege? account_policy.tdb Do I need to runs same commands to all domain controllers? For now, yes. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.4 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFE8HuGIR7qMdg1EfYRAufCAKCfEh+kz5HRF8dr1TLXi+VVnS8Q0QCgwlPt VjkghonqwyGjHmMdqz4Uvv8= =vsDD -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] dos filemode not working (NT_STATUS_ACCESS_DENIED)
Jeremy Allison schrieb: On Fri, Aug 25, 2006 at 11:08:05PM +0200, Jan Lindner wrote: dear all, switching from 3.0.22 to 3.023b, we can't get the parameter dos filemode to work (giving members of a group with full control the ability to change the acl's). in previous versions we were using acl group control which served well (now marked deprecated). Symptoms and how to reproduce the problem please ? Jeremy. we want to delegate the right to change permissions of a subdirectory on a samba share to the members of a domain group. So as admin i create a directory on the share and make that group the primary group owner (full access,rwx,setgid) of the directory. Then, from a windows client, a member of that group connects to the share and tries to modify the permissions or add another group/user to the acls of the directory or a newly created file in it. It fails with a ACCESS DENIED message (samba log NT_STATUS_ACCESS_DENIED). Taking ownership doesn't work either. Using acl group control it works, but not with dos filemode. setup: [test] comment = testshare path = /media/samba/test public = no read only = no dos filemode = yes dos filetimes = yes veto files = /lost+found/ nt acl support = yes inherit acls = yes inherit permissions = yes map acl inherit = yes inherit owner = yes acl map full control = yes security mask = 0777 directory security mask = 0777 ea support = yes store dos attributes = yes map readonly = no map hidden = no map system = no map archive = no msdfs root = no -- Jan Lindner Ludwig-Maximilians-Universität München IT-Gruppe Geisteswissenschaften Geschwister-Scholl-Platz 1 80539 MÜNCHEN Tel.:(089) 2180-1394 Fax:(089) 2180-13543 mail:[EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Permission Problem --Windows or UNIX?
Stephen Carville wrote: I am using Samba 3.0.20a with winbindd on FC3 and all the shares except one are working. I keep getting a permison denied error for non-local users in certain directories. [snip] Thanks for everyone who helped me with this problem. I'm going to have to put into the box of stuff I cannot figure out to do with Samba 3 yet and Monday I'll just move this one share over to a Windows box. -- Stephen Carville [EMAIL PROTECTED] Unix and Network Admin Nationwide Totalflood 6033 W. Century Blvd Los Angeles, CA 90045 310-342-3602 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] migration strategy
I would like some advice on a migration strategy. Soon I will be migrating from a old samba 2.2 server PDC server to a new samba 3 server (on new hardware). I also wish to take this opportunity to rename the server which I understand will change the SID. What is the recommended method to achieve this without having to touch any of the workstations? Can I copy the old smbpasswd file to the new server and just manually recreate all the workstation trust accounts on the new server? Do I need to touch the user accounts? -- The contents of this email may be privileged and confidential, any unauthorised use of the contents is expressly prohibited. If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is prohibited and may be unlawful. PLAN Australia is not liable for the proper and complete transmission of the information contained in this communication, nor for any delay in its receipt. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Concern about 3.0.22-3.0.23b upgrade (algorithmic SIDs issue)
On Fri, 25 Aug 2006, you wrote: If you are running a member server and using winbindd, the SID allocation for domain users and groups does not change. I'm running as a lone Samba PDC, and -not- using winbindd. You can use net groupmap to set up SIDs for groups and 'pdbedit -a' to add users to the passdb (which will give them an explicit SID in the machine's domain). The relevant users are already in smbpasswd (how else would they log in?). So it would have just worked then? Michael Deutschmann [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] Non-root accounts cannot join the Samba PDC:s domain
to turn permissions on in samba.conf, then the net rpc rights grant syntax seem to be unstable. This doesn't work: net rpc rights grant username SeMachineAccountPrivilege You have to fully qualify names. That's not an unstable syntax It is inconsistent with other net commands. I.e: net rpc user info someuser where the name does not have to be fully qualified Instead of username you are supposed to use some DOMAIN/username syntax I haven't figured out. Howerver, I was able to allow everyone to join the domain with: net rpc rights grant Everybody SeMachineAccountPrivilege This is a security hole. I really would recommend against this. It's about the same as 'guest account = root'. Why? If it is, then how else do enable computers to join your domain? -- mvh Björn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Error was Permission denied
From: Dan [EMAIL PROTECTED] David, I run 'smbpasswd -a dsmith' and also 'smbpasswd -a dan'. I created a user dan because I thought that would maybe get it working, but it didn't help. With the creation of 'dan' the user on Windows and Linux are the same. Under map network drive you can specify a different user to login and as and I have tried both dsmith and dan. I have put a line 'username = dsmith' in the dan share and that didn't help either. I have also added both dan and dsmith to valid users, still didn't help. I tried changing security from 'user' to 'share' that didn't help. In fact I can see 'dan on samba server (localhost)' under 'My Network Places' . However I don't seem to be able to get to the files. All the best, Dan Dan, Don't fret. Samba is really a fire and forget solution. It works every time and there are no tricks -- really. I've used it since 2.02 on mandrake 7.2 since '01 and it simply -- just works. If you have created a smbpasswd entry for dan or dsmith, then that is no longer the problem. You say you are running Samba 3.0.23a-1.FC5.1 so the SID/GID problem with 3.0.23b shouldn't be your problem. (it is being worked and a patch is out). You have posted your smb.conf, and I don't see any problems with it. But, I don't know why you have username = dsmith in you share, ... it might be right, I just don't know. First, here is my global settings: [global] workgroup = RB_LAW server string = Samba %v map to guest = Bad User log level = 10 log file = /var/log/samba/log.%m max log size = 50 name resolve order = wins lmhosts bcast time server = Yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = cups show add printer wizard = No os level = 60 preferred master = Yes domain master = Yes dns proxy = No wins support = Yes hosts allow = 192.168.7., 192.168.6., 127., 66.76.63.60 Second, here is the way I do all my shares: [skyline] comment = Skyline Share path = /home/samba/skyline valid users = @skyline # (this is just an /etc/group group that has the users I want to have access to the share.) admin users = david# (me obviously) force group = skyline read only = No inherit permissions = Yes Here is the holy grail for diagnosing where the problem is: http://us5.samba.org/samba/docs/man/Samba-HOWTO-Collection/diagnosis.html The only thing that jumps out at me is your username= entry in the share. You can ping each maching right?? (by name and IP)(since you're using the IP in your smbclient test I presume this is OK) Your name resolution is working right?? (/etc/hosts; etc/resolve.conf or bind/dhcpd/dhcpcd) Just a shot in the dark, but what does route -n show?? Your smith workgroup is right on both machines -- right?? From XP can you use windows explorer to browse My Network Places - Entire Network - smith and see both computers?? And, if so, you can open the linux box and see the dan share -- right? That's about is for my guesswork. Really, work the diagnosis.html steps and report back which step gives you the problem. OH, ONE LAST STUPID GUESS, YOU ARE RESTARTING SMB AND NMB AFTER YOU CHANGE THE SMB.CONF FILE RIGHT /etc/rc.d/init.d/smb restart and /etc/rc.d/init.d/nmb restart (I don't know if FC splits them like SuSE or combines the init like RH/Mandriva) Good Luck -- Report back... At 06:35 AM 8/25/2006, you wrote: Dan, A guess, but back to the basics: (1) have you created an entry in the smbpasswd file for yourself? I presume your username on the linux box is 'dsmith.' So have you run 'smbpasswd -a dsmith' ? (2) is your XP login name and password the same as it is on the linux box? (3) you can always add 'valid users = dsmith' to your dan share These are only educated guesses. Dan wrote: Samba version Samba 3.0.23a-1.FC5.1 Linux Fedora 5 (localhost) User: dsmith 192.168.1.104 Windows XP SP2 with lastest updates (T2385) User: dan 192.168.1.100 Linksys 8 port router I have tried a few days on an off to get samba to work, but need some help. I found a couple problems with the checklist and fixed them. A couple problems I wasn't able to solve. Here are the problems: 1) smbclient //192.168.1.104/dan -Udsmith tree connect failed: NT_STATUS_BAD_NETWORK_NAME smbpasswd is set, both dsmith and dan testparm runs fine I have cleared allow hosts, specified allow hosts, etc. Have disable both firewalls, Linux and Windows. 2) nmblookup -d 2 '*' Linux box responds fine. Never have got a response from Windows. 3) cat T2385.log [2006/08/20 01:33:26, 0] smbd/service.c:make_connection_snum (911) '/home/dsmith' does not exist or permission denied when connecting to [dan] Error was Permission denied I have changed permissions on /home and /dsmith to 777.
svn commit: samba r17838 - in branches/SAMBA_4_0/source/script: .
Author: metze
Date: 2006-08-26 08:40:51 + (Sat, 26 Aug 2006)
New Revision: 17838
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17838
Log:
revert rev 17754
readd --always-create option to mkproto.pl
metze
Modified:
branches/SAMBA_4_0/source/script/mkproto.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===
--- branches/SAMBA_4_0/source/script/mkproto.pl 2006-08-26 02:53:45 UTC (rev
17837)
+++ branches/SAMBA_4_0/source/script/mkproto.pl 2006-08-26 08:40:51 UTC (rev
17838)
@@ -25,6 +25,7 @@
my $private_data = \$_private;
my $builddir = undef;
my $srcdir = undef;
+my $always_create = $ENV{MK_PROTO_ALWAYS_CREATE};
sub public($)
{
@@ -49,6 +50,7 @@
print --private-define=DEF Same as --define, but just for private
header\n;
print --srcdir=path Read files relative to this
directory\n;
print --builddir=pathWrite file relative to this
directory\n;
+ print --always-createAlways create new proto headers, even
if the content hasn't changed\n;
print --help Print this help message\n\n;
exit 0;
}
@@ -65,6 +67,7 @@
'private-define=s' = \$private_define,
'srcdir=s' = sub { my ($f,$v) = @_; $srcdir = $v; },
'builddir=s' = sub { my ($f,$v) = @_; $builddir = $v; },
+ 'always-create' = \$always_create,
'help' = \usage
) or exit(1);
@@ -238,12 +241,20 @@
print STDOUT $$private_data;
}
-mkpath(dirname($public_file), 0, 0755);
-open(PUBLIC, $public_file) or die(Can't open `$public_file': $!);
-print PUBLIC $$public_data;
-close(PUBLIC);
+my $old_public_data = file_load($public_file);
+my $old_private_data = file_load($private_file);
-if ($public_file ne $private_file) {
+if (defined($always_create) or not defined($old_public_data) or
($old_public_data ne $$public_data))
+{
+ mkpath(dirname($public_file), 0, 0755);
+ open(PUBLIC, $public_file) or die(Can't open `$public_file': $!);
+ print PUBLIC $$public_data;
+ close(PUBLIC);
+}
+
+if (($public_file ne $private_file) and (defined($always_create) or
+ not defined($old_private_data) or ($old_private_data ne
$$private_data))) {
+
mkpath(dirname($private_file), 0, 0755);
open(PRIVATE, $private_file) or die(Can't open `$private_file':
$!);
print PRIVATE $$private_data;
svn commit: samba r17839 - in branches/SAMBA_4_0: source/setup testprogs/ejs
Author: idra Date: 2006-08-26 15:38:01 + (Sat, 26 Aug 2006) New Revision: 17839 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17839 Log: do not reference possibleInferiors we have not extracted trim duplicate may attributes Modified: branches/SAMBA_4_0/source/setup/schema.ldif branches/SAMBA_4_0/testprogs/ejs/minschema.js Changeset: Sorry, the patch is too large (766 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17839
svn commit: samba r17840 - in branches/SAMBA_4_0/source/lib/replace: .
Author: vlendec
Date: 2006-08-26 16:19:22 + (Sat, 26 Aug 2006)
New Revision: 17840
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17840
Log:
A step towards building on Solaris which appears not to have strnlen.
Volker
Modified:
branches/SAMBA_4_0/source/lib/replace/config.m4
branches/SAMBA_4_0/source/lib/replace/replace.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===
--- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 15:38:01 UTC
(rev 17839)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 16:19:22 UTC
(rev 17840)
@@ -50,7 +50,7 @@
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strnlen strcasestr strtok_r mkdtemp)
AC_HAVE_DECL(setresuid, [#include unistd.h])
AC_HAVE_DECL(setresgid, [#include unistd.h])
AC_HAVE_DECL(errno, [#include errno.h])
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 15:38:01 UTC
(rev 17839)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 16:19:22 UTC
(rev 17840)
@@ -387,6 +387,20 @@
}
#endif
+#ifndef HAVE_STRNLEN
+/**
+ Some platforms don't have strnlen
+**/
+
+ size_t strnlen(const char *s, size_t n)
+{
+ size_t i;
+ for (i=0; in s[i] != '\0'; i++)
+ /* noop */ ;
+ return i;
+}
+#endif
+
#ifndef HAVE_WAITPID
int waitpid(pid_t pid,int *status,int options)
{
svn commit: samba r17841 - in branches/SAMBA_4_0/source/lib/replace: .
Author: vlendec
Date: 2006-08-26 16:44:10 + (Sat, 26 Aug 2006)
New Revision: 17841
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17841
Log:
Revert 17840, libldb.a defines strnlen. Sorry for the noise
Modified:
branches/SAMBA_4_0/source/lib/replace/config.m4
branches/SAMBA_4_0/source/lib/replace/replace.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===
--- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 16:19:22 UTC
(rev 17840)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 16:44:10 UTC
(rev 17841)
@@ -50,7 +50,7 @@
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strnlen strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
AC_HAVE_DECL(setresuid, [#include unistd.h])
AC_HAVE_DECL(setresgid, [#include unistd.h])
AC_HAVE_DECL(errno, [#include errno.h])
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 16:19:22 UTC
(rev 17840)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 16:44:10 UTC
(rev 17841)
@@ -387,20 +387,6 @@
}
#endif
-#ifndef HAVE_STRNLEN
-/**
- Some platforms don't have strnlen
-**/
-
- size_t strnlen(const char *s, size_t n)
-{
- size_t i;
- for (i=0; in s[i] != '\0'; i++)
- /* noop */ ;
- return i;
-}
-#endif
-
#ifndef HAVE_WAITPID
int waitpid(pid_t pid,int *status,int options)
{
svn commit: samba r17842 - in branches/SAMBA_4_0/source/lib: ldb/replace replace
Author: vlendec
Date: 2006-08-26 17:19:58 + (Sat, 26 Aug 2006)
New Revision: 17842
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17842
Log:
After talking to Simo, apply the next attempt to resolve the strnlen
problem. Timegm is the same. Simo says this is just a workaround, but it helps
for now. Feel free to revert.
Volker
Modified:
branches/SAMBA_4_0/source/lib/ldb/replace/replace.c
branches/SAMBA_4_0/source/lib/ldb/replace/timegm.c
branches/SAMBA_4_0/source/lib/replace/config.m4
branches/SAMBA_4_0/source/lib/replace/replace.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/ldb/replace/replace.c 2006-08-26 16:44:10 UTC
(rev 17841)
+++ branches/SAMBA_4_0/source/lib/ldb/replace/replace.c 2006-08-26 17:19:58 UTC
(rev 17842)
@@ -23,7 +23,7 @@
#include includes.h
#include ldb/include/includes.h
-#ifndef HAVE_STRNLEN
+#if !defined(HAVE_STRNLEN) !defined(_SAMBA_BUILD_)
/**
Some platforms don't have strnlen
**/
Modified: branches/SAMBA_4_0/source/lib/ldb/replace/timegm.c
===
--- branches/SAMBA_4_0/source/lib/ldb/replace/timegm.c 2006-08-26 16:44:10 UTC
(rev 17841)
+++ branches/SAMBA_4_0/source/lib/ldb/replace/timegm.c 2006-08-26 17:19:58 UTC
(rev 17842)
@@ -38,7 +38,7 @@
#include includes.h
#include ldb/include/includes.h
-#ifndef HAVE_TIMEGM
+#if !defined(HAVE_TIMEGM) !defined(_SAMBA_BUILD_)
static int is_leap(unsigned y)
{
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===
--- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 16:44:10 UTC
(rev 17841)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-08-26 17:19:58 UTC
(rev 17842)
@@ -50,7 +50,7 @@
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strnlen strcasestr strtok_r mkdtemp)
AC_HAVE_DECL(setresuid, [#include unistd.h])
AC_HAVE_DECL(setresgid, [#include unistd.h])
AC_HAVE_DECL(errno, [#include errno.h])
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 16:44:10 UTC
(rev 17841)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-08-26 17:19:58 UTC
(rev 17842)
@@ -387,6 +387,20 @@
}
#endif
+#ifndef HAVE_STRNLEN
+/**
+ Some platforms don't have strnlen
+**/
+
+ size_t strnlen(const char *s, size_t n)
+{
+ size_t i;
+ for (i=0; in s[i] != '\0'; i++)
+ /* noop */ ;
+ return i;
+}
+#endif
+
#ifndef HAVE_WAITPID
int waitpid(pid_t pid,int *status,int options)
{
@@ -519,3 +533,35 @@
return token;
}
#endif
+
+#if !defined(HAVE_TIMEGM)
+
+static int is_leap(unsigned y)
+{
+ y += 1900;
+ return (y % 4) == 0 ((y % 100) != 0 || (y % 400) == 0);
+}
+
+time_t timegm(struct tm *tm)
+{
+ static const unsigned ndays[2][12] ={
+ {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+ {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
+ time_t res = 0;
+ unsigned i;
+
+ for (i = 70; i tm-tm_year; ++i)
+ res += is_leap(i) ? 366 : 365;
+
+ for (i = 0; i tm-tm_mon; ++i)
+ res += ndays[is_leap(tm-tm_year)][i];
+ res += tm-tm_mday - 1;
+ res *= 24;
+ res += tm-tm_hour;
+ res *= 60;
+ res += tm-tm_min;
+ res *= 60;
+ res += tm-tm_sec;
+ return res;
+}
+#endif
svn commit: samba r17843 - in branches/SOC/sree: .
Author: sree
Date: 2006-08-26 17:51:20 + (Sat, 26 Aug 2006)
New Revision: 17843
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17843
Log:
Remove code in user_rename() in usermgmt.js that changes CN and
name of renamed user, as ldb.rename() now does that.
Enhance test_user_rename() tests to check all attributes for effect of
rename in test.js
Modified:
branches/SOC/sree/test.js
branches/SOC/sree/usermgmt.js
Changeset:
Modified: branches/SOC/sree/test.js
===
--- branches/SOC/sree/test.js 2006-08-26 17:19:58 UTC (rev 17842)
+++ branches/SOC/sree/test.js 2006-08-26 17:51:20 UTC (rev 17843)
@@ -43,10 +43,21 @@
function test_user_rename(sam)
{
+var names = new Array(CN, name, sAMAccountName);
print(Testing user_rename ... );
var ok = user_rename(sam, jrandomuser, jrurenamed);
-assert(ok);
+assert(ok);
+
+var results = user_get(sam, jrurenamed, names);
+assert(results != null);
+for(var i = 0; i names.length; i++)
+ {
+ var key = names[i];
+ printf(%s , key);
+ assert(results[key] == jrurenamed);
+ }
+
assert(user_rename(sam, jrurenamed, jrandomuser));
print(OK.\n);
Modified: branches/SOC/sree/usermgmt.js
===
--- branches/SOC/sree/usermgmt.js 2006-08-26 17:19:58 UTC (rev 17842)
+++ branches/SOC/sree/usermgmt.js 2006-08-26 17:51:20 UTC (rev 17843)
@@ -233,7 +233,8 @@
var newuser_dn = sprintf(CN=%s,CN=Users,%s,
newusername, sam.domain_dn);
-var replace_attrs = new Array(sAMAccountName, name);
+// this list should get shorter over time?
+var replace_attrs = new Array(sAMAccountName);
sam.ldb.transaction_start();
@@ -277,12 +278,7 @@
ldifmod = sprintf(dn: %s
changetype: modify
-delete: cn
-cn: %s
--
-add: cn
-cn: %s
-, newuser_dn, username, newusername); // cn is multi-valued
+, newuser_dn);
// the others are single-valued and can be replaced
for(var i = 0; i replace_attrs.length; i++)
svn commit: samba r17844 - in branches/SAMBA_4_0/source/lib/ldb/tools: .
Author: vlendec
Date: 2006-08-26 20:28:32 + (Sat, 26 Aug 2006)
New Revision: 17844
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17844
Log:
The AIX compiler thinks { } is a syntax error
Modified:
branches/SAMBA_4_0/source/lib/ldb/tools/convert.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/convert.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/convert.c 2006-08-26 17:51:20 UTC
(rev 17843)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/convert.c 2006-08-26 20:28:32 UTC
(rev 17844)
@@ -138,7 +138,8 @@
.equality = caseExactIA5Match,
.comment = IA5 String
},
- { }
+ { .Standard_OID = NULL
+ }
};
svn commit: samba r17845 - in branches/SAMBA_3_0/source/libaddns: .
Author: vlendec Date: 2006-08-26 20:56:49 + (Sat, 26 Aug 2006) New Revision: 17845 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17845 Log: Remove a Solaris warning Modified: branches/SAMBA_3_0/source/libaddns/dns.h Changeset: Modified: branches/SAMBA_3_0/source/libaddns/dns.h === --- branches/SAMBA_3_0/source/libaddns/dns.h2006-08-26 20:28:32 UTC (rev 17844) +++ branches/SAMBA_3_0/source/libaddns/dns.h2006-08-26 20:56:49 UTC (rev 17845) @@ -490,7 +490,7 @@ DNS_ERROR DNSOpen( char *nameserver, int32 dwType, HANDLE * phDNSServer ); int32 DNSReceiveBufferContext( HANDLE hDNSHandle, HANDLE hDNSRecvBuffer, int32 * pdwBytesRead ); int32 DNSCreateSendBuffer( HANDLE * phDNSSendBuffer ); -int32 DNSMarshallBuffer( HANDLE hDNSSendBuffer, uint8 * pDNSSendBuffer, int32 dwBufferSize, int32 * pdwBytesWritten );; +int32 DNSMarshallBuffer( HANDLE hDNSSendBuffer, uint8 * pDNSSendBuffer, int32 dwBufferSize, int32 * pdwBytesWritten ); int32 DNSSendBufferContext( HANDLE hDNSServer, HANDLE hSendBuffer, int32 * pdwBytesSent ); int32 DNSCreateReceiveBuffer( HANDLE * phDNSRecvBuffer ); int32 DNSUnmarshallBuffer( HANDLE hDNSRecvBuffer, uint8 * pDNSRecvBuffer, int32 dwBufferSize, int32 * pdwBytesRead );
svn commit: samba r17846 - in branches/SAMBA_4_0/source/libcli/security: .
Author: vlendec
Date: 2006-08-26 22:27:29 + (Sat, 26 Aug 2006)
New Revision: 17846
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17846
Log:
Ok, this is a patch that needs further discussion. On Solaris, snprintf seems
to be broken. The %lu modifies apparently can not cope with the high
bit==1. In dom_sid_string I added some printfs and got:
auth: 21
auth: 2666793276
auth: 679821296
auth: 2310223117
auth: 1206
sid=S-1-5-21-8446744072081377596-679821296-8446744071724807437-1206
The auth: values are direct printfs, the sid= is the resulting code from
dom_sid_string.
I could not reproduce it with a simple test program, and #ifdef'ing out
HAVE_SNPRINTF in config.h manually does not help either, probably because the
dynamic linker overwrites the symbol in lib/replace.
Checking it in because it fixes the RPC-SAMBA3-SHARESEC test directly on host
sunx, I would like to see whether it also fixes IRIX and AIX.
Volker
Modified:
branches/SAMBA_4_0/source/libcli/security/dom_sid.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/dom_sid.c
===
--- branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2006-08-26 20:56:49 UTC
(rev 17845)
+++ branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2006-08-26 22:27:29 UTC
(rev 17846)
@@ -285,7 +285,14 @@
(unsigned int)sid-sid_rev_num, (unsigned long)ia);
for (i = 0; i sid-num_auths; i++) {
- ofs += snprintf(ret + ofs, maxlen - ofs, -%lu, (unsigned
long)sid-sub_auths[i]);
+char *tmp = talloc_asprintf(mem_ctx, %lu,
+ (unsigned long)sid-sub_auths[i]);
+if (tmp == NULL) {
+talloc_free(ret);
+return NULL;
+}
+ofs += snprintf(ret + ofs, maxlen - ofs, -%s, tmp);
+talloc_free(tmp);
}
return ret;
svn commit: samba r17847 - in branches/SAMBA_3_0/source/utils: .
Author: vlendec
Date: 2006-08-26 22:59:58 + (Sat, 26 Aug 2006)
New Revision: 17847
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=17847
Log:
Dummy commit
Modified:
branches/SAMBA_3_0/source/utils/smbget.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/smbget.c
===
--- branches/SAMBA_3_0/source/utils/smbget.c2006-08-26 22:27:29 UTC (rev
17846)
+++ branches/SAMBA_3_0/source/utils/smbget.c2006-08-26 22:59:58 UTC (rev
17847)
@@ -388,7 +388,7 @@
offset_check = 0;
}
- readbuf = SMB_MALLOC(blocksize);
+ readbuf = (char *)SMB_MALLOC(blocksize);
/* Now, download all bytes from offset_download to the end */
for(curpos = offset_download; curpos remotestat.st_size;
curpos+=blocksize) {
Build status as of Sun Aug 27 00:00:01 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-08-26 00:00:05.0 + +++ /home/build/master/cache/broken_results.txt 2006-08-27 00:00:04.0 + @@ -1,19 +1,19 @@ -Build status as of Sat Aug 26 00:00:02 2006 +Build status as of Sun Aug 27 00:00:01 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 -ccache 31 6 0 -distcc 31 2 0 -ldb 27 6 0 +ccache 32 6 0 +distcc 32 2 0 +ldb 28 5 0 lorikeet-heimdal 1 0 0 -ppp 17 0 0 -rsync30 2 0 +ppp 18 0 0 +rsync31 3 0 samba0 0 0 samba-docs 0 0 0 -samba4 37 21 0 -samba_3_035 15 1 +samba4 38 17 1 +samba_3_036 16 1 smb-build24 24 0 -talloc 32 9 0 -tdb 30 5 0 +talloc 33 9 0 +tdb 31 5 0
