[Samba] Problem with nmbd
My Samba installation seems to work fine, except for the NetBIOS names part. When I use nmblookup, it appears to be using the wrong broadcast address and the log file for nmbd has constant 'Packet send failed, Host is down' messages. If I use nmblookup and force the broadcast address with -B, it seems to work. The docs seem to say you can specify a broadcast address in smb.conf, but I can't find information on the format needed. From what I can gather, the query needs to go to 10.0.0.0 and not 10.0.0.255 (as it is currently trying). How can I set that? Thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Mailing list netiquette reminder / update
Gentle susbscribers, This is a reminder to all samba mailing list subscribers that this list is moderated. Most of you know what that means, so for the benefit of those who are new to the list or who are not familiar with the mechanics of a mailing list please note the following: 1) Incoming messages are scanned and filtered by mailman to remove messages that may have objectionable content, are incorrectly addressed, or that are too large for general distribution. 2) For the benefit of our subscribers, posting to this list is restricted too subscribed email addresses. Postings from a return address other than your subscribed address will be redirected to the attention of the list moderators. 3) Over recent months the number of large message postings has increased. Distribution of large messages to thousands of users is costly in terms of network bandwidth usage. Some of our subscribers pay for their internet traffic volume. Please be aware that when a message with a 1 Megabyte attachment is sent to the list, you are generating many Gigabytes of mail traffic for samba.org - so keep in perspective the need to keep email messages short and to the point. 4) Recently there has been an increase is the number of seemingly legitimate message postings from mail clients that create defective message headers. Please use a mail client that creates headers that conform with appropriate RFC standards. All of the above lead to the following: a) More work for the moderators! b) Frustration by message posters whose messages are not directly making it to the list. c) More messages being rejected by the moderators as they apply the guidelines our subscribers have requested: Some of which result in emails wanting to know why their message was 'rejected', or worse - abuse for being 'obstructive'. I hope this reminder helps you to see the human side of list moderation - AND - how you can help assure the smooth operation of this mailing list. - John T. -- John H Terpstra -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] nss_wins: create_builtin_users: Failed to create Users
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Todd, I am getting the following error in /var/log/messages when an XP Pro client enters the network: nss_wins[8369]: [2009/04/06 15:17:23, 0] auth/auth_util.c:create_builtin_users(810) Apr 6 15:17:23 rn1 nss_wins[8369]: create_builtin_users: Failed to create Users This is a case of sharing code between things in Samba. The error messages originates normally from the user token creation where smbd attempts to create the BUILTIN\Administrators and BUILTIN\Users groups (only possible if the system is configured to support winbind nested groups). This is to mimic the adding of Domain Admins to the local Administrators group that happens on Windows hosts when they join a domain (or when you run dcpromo to create a domain controller). nss_wins does not use tokens (or has no need to I should say) and so really shouldn't be executing that code. But because of the the amount of shared code in Samba, you will see situations like this form time to time. Bottom line is that you can ignore the message from nss_wins. I think you have already discussed supported winbind nested groups using the idmap_uid and idmap_gid options. So I won't go into that. Hope this helps to explain things some. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ2zq+IR7qMdg1EfYRApT+AKCmIIGaoTiLEx/rYuyLRZcxgX+92ACdGoxt svrJcquOXx1rrz+SUFE2NgA= =rXgj -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Unable To Access Samba Share From Linux But Can From Windows
I have successfully installed Samba on several CentOS machines but I am having problems attaining complete success on a Ubuntu 8.04 machine. The Ubuntu machine's configuration file is very simple and looks like this: [global] server string = Samba Server security = USER workgroup = workgroup log file = /var/log/samba/%m.log max log size = 50 dns proxy = No [pamuser] comment = Secure User's Home Directory path = /home/secureuser valid users = secureuser read only = No [public] comment = Public file sharing space path = /home/public read only = No guest ok = Yes This machine's name is ubuntu and it is within a network with several other Windows machines and one CentOS machine. The pamuser is a passworded pam user. Samba runs successfully in this config except that I am unable to access the pamuser's share from the very same ubuntu machine using smbclient ubuntu\\pamuser. Instead, the following error message appears (after password dialog) : session setup failed: NT_STATUS_LOGON_FAILURE Otherwise, the above config works fine in that I can access the ubuntu pamuser share from the other Windows and CentOS machines and I can also access shares on these other machines from the ubuntu machine. Now, when I then change the security setting to security = SHARE then I am again able to access the pamuser ubuntu machine from all other Windows machines, however, I cannot access the pamuser share from the very same ubuntu machine or the CentOS machine. With security = SHARE I get a different error message as follows: tree connect failed: NT_STATUS_WRONG_PASSWORD So, in summary, with security = USER, I can access the pamuser share from everywhere (Windows and CentOS) except from the very ubuntu machine where the pamuser resides. Whereas, with security = SHARE, I can access the pamuser share from all Windows machines but not from the CentOS machine or the ubuntu machine where the pamuser resides. I have already spent the better part of two days trying to figure this out and I have googled it to death. I hope that a samba expert on this list can offer a solution. Many Thanks, Gordon Dickens -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Update on bugzilla.samba.org
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Fyi... We can into some db connection issues last night (about 10pm GMT-5 I think). This issue has been temporarily resolved, but I expect that we'll be taking the server offline for a short period sometime this week for further db maintenance. Also Deryck and I will be exploring some potential improvements to Samba's bugzilla service in the coming weeks. I'll try to keep everyone updated. cheers, jerry - -- = What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ20t1IR7qMdg1EfYRAv2HAJ47xw8Kn5co40X7do0UPcczvM2+LgCg5bPZ P10yo+Wy/Co8DuActPbosUQ= =imcZ -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] ntlm challenges not working
Hi there, I try to have a XP box using ntlm authentication when accessing a samba domain. In apache I have the following stanza: Location / AuthName NTLM Authentication thingy NTLMAuth on NTLMAuthHelper /opt/samba/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp NTLMBasicAuthoritative on AuthType NTLM require valid-user /Location In IE7 on the client I added the apache site to the list of intranet sites so windows should use ntlm to send its credentials. now when I access the apache site appache issues a challenge and announces it would accept ntlm. I checked that using whireshark, the relevant frame shows the following: Hypertext Transfer Protocol HTTP/1.1 401 Authorization Required\r\n Request Version: HTTP/1.1 Response Code: 401 Date: Tue, 07 Apr 2009 10:53:07 GMT\r\n Proxy-Authenticate: NTLM\r\n Proxy-Authenticate: NTLM\r\n Content-Length: 622 Keep-Alive: timeout=15, max=100\r\n Connection: Keep-Alive\r\n Content-Type: text/html; charset=iso-8859-1\r\n \r\n however windows does not answer at all. IE does nothing but issuing a authorization required error. Whireshark shows no more traffic. can anybody help me to resolve this? (I am really desperate.., having worked trough everyy tutorial I can find) robert -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] smbmount ignores noatime
When mounting a Windows share within Linux the noatime option seems to be ignored. I use the following command mount -tsmbfs -ousername=user,noatime //192.168.0.12/eclipse /mnt/tmp Each cat /mnt/tmp/testfile updates the last access time regardless if noatime specified or not. I'm running smbmount v2.0.7 on a old Suse production system, but I could reproduce the same behaviour with a current Ubuntu system using mount.cifs. So I assume I'm doing something wrong?! Any help in this matter would be highly appreciated... Thanks Daniel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Is it permissible to file bugs on old versions?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 06.04.2009 22:45, schrieb MargoAndTodd: Hi All, I am using CentOS 5.3 (Red Hat Enterprise Linux 5.3 clone). CentOS and RHEL being what they are, they always use old stuff to maintain enterprise stability. Is it permissible to file bugs on these old version, seeing as Samba is up to 3.3.3? (And, no, I can not upgrade until CentOS puts it in YUM.) I would file a bug against CentOS' packages... For the 5.x-version it will stay in 3.0.x, I think the next shift to 3.2/3.3 will be in CentOS6.. But why not use sernet's packages? I'm using them on 5 servers myself w/o problems. Cheers Matthias -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAknbd08ACgkQf3LySRiTg2wGUQCeInEzGLNrFEuQcXjEqI2LEFbR aD4AoIVwHmAwzrOk9oRd3knP5aJ4KKV5 =Ig45 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Impossible to join my samba server to active directory domain
Hello, I've configure a samba server but when I do net join I have error message. here is the result of net join -d4 -U Administrateur: [2009/04/07 17:29:02, 3] param/loadparm.c:lp_load_ex(8778) lp_load_ex: refreshing parameters [2009/04/07 17:29:02, 3] param/loadparm.c:init_globals(4621) Initialising global parameters [2009/04/07 17:29:02, 3] param/params.c:pm_process(569) params.c:pm_process() - Processing configuration file /etc/samba/smb.conf [2009/04/07 17:29:02, 3] param/loadparm.c:do_section(7441) Processing section [global] doing parameter workgroup = ROOV doing parameter server string = samba server doing parameter dns proxy = no doing parameter log file = /var/log/samba/log.%m doing parameter max log size = 1000 doing parameter syslog = 0 doing parameter panic action = /usr/share/samba/panic-action %d doing parameter security = ads doing parameter encrypt passwords = true doing parameter obey pam restrictions = yes doing parameter unix password sync = yes doing parameter pam password change = yes doing parameter winbind separator = / doing parameter idmap uid = 1-2 doing parameter idmap gid = 1-2 doing parameter template shell = /bin/bash doing parameter password server = abc-controler.roov.cg doing parameter winbind enum groups = yes doing parameter winbind enum users = yes doing parameter client use spnego = yes doing parameter winbind use default domain = yes [2009/04/07 17:29:02, 4] param/loadparm.c:lp_load_ex(8822) pm_process() returned Yes [2009/04/07 17:29:02, 2] lib/interface.c:add_interface(337) added interface eth0 ip=fe80::20d:60ff:fe1b:cd46%eth0 bcast=fe80:::::%eth0 netmask=::::: [2009/04/07 17:29:02, 2] lib/interface.c:add_interface(337) added interface eth0 ip=172.30.10.71 bcast=172.30.10.95 netmask=255.255.255.224 [2009/04/07 17:29:02, 3] libsmb/namequery.c:get_dc_list(1909) get_dc_list: preferred server list: , abc-controler.roov.cg [2009/04/07 17:29:02, 4] libsmb/namequery.c:get_dc_list(2042) get_dc_list: returning 1 ip addresses in an ordered list [2009/04/07 17:29:02, 4] libsmb/namequery.c:get_dc_list(2043) get_dc_list: 172.30.10.66:389 [2009/04/07 17:29:02, 1] libads/cldap.c:recv_cldap_netlogon(184) Failed to parse cldap reply [2009/04/07 17:29:02, 3] libads/ldap.c:ads_try_connect(203) ads_try_connect: CLDAP request 172.30.10.66 failed. [2009/04/07 17:29:02, 3] libads/dns.c:dns_send_req(343) ads_dns_lookup_srv: Failed to resolve _ldap._tcp.pdc._msdcs.ROOV (Success) [2009/04/07 17:29:02, 3] libads/dns.c:ads_dns_lookup_srv(413) ads_dns_lookup_srv: Failed to send DNS query (NT_STATUS_UNSUCCESSFUL) [2009/04/07 17:29:02, 3] libsmb/namequery.c:resolve_lmhosts(1162) resolve_lmhosts: Attempting lmhosts lookup for name ROOV0x1b [2009/04/07 17:29:02, 4] libsmb/namequery.c:startlmhosts(776) startlmhosts: Can't open lmhosts file /etc/samba/lmhosts. Error was No such file or directory [2009/04/07 17:29:02, 3] libsmb/namequery.c:resolve_wins(1026) resolve_wins: Attempting wins lookup for name ROOV0x1b [2009/04/07 17:29:02, 3] libsmb/namequery.c:resolve_wins(1030) resolve_wins: WINS server resolution selected and no WINS servers listed. [2009/04/07 17:29:02, 3] libsmb/namequery.c:name_resolve_bcast(953) name_resolve_bcast: Attempting broadcast lookup for name ROOV0x1b [2009/04/07 17:29:03, 1] utils/net.c:net_find_server(461) Unable to resolve PDC server address Unable to find a suitable server [2009/04/07 17:29:03, 1] utils/net_rpc.c:run_rpc_command(127) failed to make ipc connection: NT_STATUS_UNSUCCESSFUL [2009/04/07 17:29:03, 3] libads/dns.c:dns_send_req(343) ads_dns_lookup_srv: Failed to resolve_ldap._tcp.pdc._msdcs.ROOV (Success) [2009/04/07 17:29:03, 3] libads/dns.c:ads_dns_lookup_srv(413) ads_dns_lookup_srv: Failed to send DNS query (NT_STATUS_UNSUCCESSFUL) [2009/04/07 17:29:03, 3] libsmb/namequery.c:resolve_lmhosts(1162) resolve_lmhosts: Attempting lmhosts lookup for name ROOV0x1b [2009/04/07 17:29:03, 4] libsmb/namequery.c:startlmhosts(776) startlmhosts: Can't open lmhosts file /etc/samba/lmhosts. Error was No such file or directory [2009/04/07 17:29:03, 3] libsmb/namequery.c:resolve_wins(1026) resolve_wins: Attempting wins lookup for name ROOV0x1b [2009/04/07 17:29:03, 3] libsmb/namequery.c:resolve_wins(1030) resolve_wins: WINS server resolution selected and no WINS servers listed. [2009/04/07 17:29:03, 3] libsmb/namequery.c:name_resolve_bcast(953) name_resolve_bcast: Attempting broadcast lookup for name ROOV0x1b [2009/04/07 17:29:04, 1] utils/net.c:net_find_server(461) Unable to resolve PDC server address Unable to find a suitable server [2009/04/07 17:29:04, 2] utils/net.c:main(1172) return code = 1 I need your help please -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Impossible to join my samba server to active directory domain
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David N'DAKPAZE wrote: Hello, I've configure a samba server but when I do net join I have error message. here is the result of net join -d4 -U Administrateur: doing parameter workgroup = ROOV ... doing parameter security = ads You have no realm set in smb.conf. Unable to find a suitable server return code = 1 I need your help please cheers, jerry - -- = What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ25QsIR7qMdg1EfYRAoOWAKCPouEgyDzZGh8B8kMYu1A7c3j3hACfbNuX gH5bOYvPNTBlHYJcWCpxk7A= =OnCQ -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba PDC and Kerberos
Hi, This is with reference to kerberos mailing list ( http://mailman.mit.edu/pipermail/kerberos/2004-December/006868.html) on the Samba PDC and Kerberos. I am trying to make Samba PDC in a AD (LDAP + KRB) domain. Could you please answer few of my queries on the same issue. 1. Whats the problem with Samba 3 to work as PDC in an AD domain? 2. What has been fixed to make Samba 4 work as PDC in an AD domain? 3. When would Samba 4 be available? Also it would be really help full if you can direct me to release notes of Samba 4. Thanks! Regards, Shahid Shaikh. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] Solaris_build
OK, I started from scratch and downloaded Samba directly from samba.org, grabbing the latest - 3.3.3. This seems to have configured, make, and make installed correctly, or so I thought. However, when I try to start samba, I get the following: # smbd start ld.so.1: smbd: fatal: libtalloc.so: open failed: No such file or directory Killed # nmbd start ld.so.1: nmbd: fatal: libtalloc.so: open failed: No such file or directory Killed ld.so.1 does exist in several directories: /usr/lib/ld.so.1 /usr/lib/sparcv9/ld.so.1 /usr/local/lib/ld.so.1 /etc/lib/ld.so.1 /lib/sparcv9/ld.so.1 /lib/ld.so.1 And these directories are in my LD_LIBRARY_PATH. So now what? Gee, my head hurts... Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: jerry [mailto:je...@samba.org] Sent: Monday, April 06, 2009 3:07 PM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] Solaris_build -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jamen, c -lkrb5 /usr/bin/krb5-config: Unknown option `gssapi' -- use `--help' ... -- We are relying on the native solaris libs (Solaris 10, 5.10 sparc) That's your smoking gun. You could try temporarily renaming the /usr/bin/krb5-config and let the checks fallback tothe older style test. But I expect you'll hit issues here as well. The quickest way forward may be just to install the MIT libs and compile Samba using --with-krb5=base_dir Hope this helps. cheers, jerry - -- = What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ2mDHIR7qMdg1EfYRAubHAJ4iFcLduTc8/FH/bMdsuuZNMu2QVgCg1ods SPf7C+6sX4AAp2tanHGLX7A= =inAI -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Solaris_build
On Tue, Apr 07, 2009 at 03:43:12PM -0500, McGranahan, Jamen wrote: OK, I started from scratch and downloaded Samba directly from samba.org, grabbing the latest - 3.3.3. This seems to have configured, make, and make installed correctly, or so I thought. However, when I try to start samba, I get the following: # smbd start ld.so.1: smbd: fatal: libtalloc.so: open failed: No such file or directory Killed # nmbd start ld.so.1: nmbd: fatal: libtalloc.so: open failed: No such file or directory Killed ld.so.1 does exist in several directories: /usr/lib/ld.so.1 /usr/lib/sparcv9/ld.so.1 /usr/local/lib/ld.so.1 /etc/lib/ld.so.1 /lib/sparcv9/ld.so.1 /lib/ld.so.1 And these directories are in my LD_LIBRARY_PATH. So now what? Gee, my head hurts... Do you also have libtalloc.so with the correct symlinks in your LD_LIBRARY_PATH? That's what it does not find. Volker pgpLEdFPd3wvd.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Solaris_build
McGranahan, Jamen wrote: # smbd start ld.so.1: smbd: fatal: libtalloc.so: open failed: No such file or directory Killed # nmbd start ld.so.1: nmbd: fatal: libtalloc.so: open failed: No such file or directory Killed Use Solaris 'crle' to add /usr/local/samba/lib and you're Gold. -- Tim Evans, TKEvans.com, Inc.| 5 Chestnut Court UNIX System Admin Consulting| Owings Mills, MD 21117 http://www.tkevans.com/ | 443-394-3864 http://www.come-here.com/News/ | tkev...@tkevans.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-666-g7e6d6ee
The branch, v3-4-test has been updated
via 7e6d6eeff3e082d7223264c17cb27c2ab89df9aa (commit)
from 33eaa9accb90824ecc5c688326ba4c3c054f7e4a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7e6d6eeff3e082d7223264c17cb27c2ab89df9aa
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 16:23:27 2009 +1100
s3:kerberos Rework smb_krb5_unparse_name() to take a talloc context
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 574a6a8c350a4bab3f42f3f9cfb382db721d69b5)
---
Summary of changes:
source3/include/includes.h |7 ---
source3/libads/authdata.c|2 +-
source3/libads/kerberos.c|8
source3/libads/kerberos_keytab.c | 27 ++-
source3/libads/kerberos_verify.c |6 +++---
source3/libnet/libnet_keytab.c | 32 ++--
source3/libsmb/clikrb5.c | 23 ---
source3/smbd/sesssetup.c |8
source3/utils/ntlm_auth.c|6 ++
9 files changed, 54 insertions(+), 65 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4bf4b5c..248c326 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -900,9 +900,10 @@ krb5_error_code smb_krb5_parse_name(krb5_context context,
const char *name, /* in unix charset */
krb5_principal *principal);
-krb5_error_code smb_krb5_unparse_name(krb5_context context,
- krb5_const_principal principal,
- char **unix_name);
+krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
+ krb5_context context,
+ krb5_const_principal principal,
+ char **unix_name);
#ifndef HAVE_KRB5_SET_REAL_TIME
krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds,
int32_t microseconds);
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 9f0f68e..0032e9e 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -469,7 +469,7 @@ out:
data_blob_free(sesskey1);
data_blob_free(sesskey2);
- SAFE_FREE(client_princ_out);
+ TALLOC_FREE(client_princ_out);
return status;
}
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 52cb975..c476f59 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -545,7 +545,7 @@ krb5_principal
kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
/* look under the old key. If this fails, just use the
standard key */
- if (smb_krb5_unparse_name(context, host_princ, unparsed_name)
!= 0) {
+ if (smb_krb5_unparse_name(talloc_tos(), context, host_princ,
unparsed_name) != 0) {
return (krb5_principal)NULL;
}
if ((salt_princ_s =
kerberos_secrets_fetch_salting_principal(unparsed_name, enctype)) == NULL) {
@@ -558,7 +558,7 @@ krb5_principal
kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
ret_princ = NULL;
}
- SAFE_FREE(unparsed_name);
+ TALLOC_FREE(unparsed_name);
SAFE_FREE(salt_princ_s);
return ret_princ;
@@ -603,7 +603,7 @@ bool kerberos_secrets_store_salting_principal(const char
*service,
goto out;
}
- if (smb_krb5_unparse_name(context, princ, unparsed_name) != 0) {
+ if (smb_krb5_unparse_name(talloc_tos(), context, princ, unparsed_name)
!= 0) {
goto out;
}
@@ -623,7 +623,7 @@ bool kerberos_secrets_store_salting_principal(const char
*service,
SAFE_FREE(key);
SAFE_FREE(princ_s);
- SAFE_FREE(unparsed_name);
+ TALLOC_FREE(unparsed_name);
if (princ) {
krb5_free_principal(context, princ);
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 7c028cb..4fede25 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -64,7 +64,7 @@ int smb_krb5_kt_add_entry_ext(krb5_context context,
while(!krb5_kt_next_entry(context, keytab, kt_entry, cursor))
{
bool compare_name_ok = False;
- ret = smb_krb5_unparse_name(context,
kt_entry.principal, ktprinc);
+ ret = smb_krb5_unparse_name(talloc_tos(), context,
kt_entry.principal, ktprinc);
if (ret) {
DEBUG(1,(smb_krb5_kt_add_entry_ext:
smb_krb5_unparse_name failed (%s)\n,
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-665-g33eaa9a
The branch, v3-4-test has been updated
via 33eaa9accb90824ecc5c688326ba4c3c054f7e4a (commit)
from 4e32c424a00bc29e63176af9773f9ffa7aa09bc2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 33eaa9accb90824ecc5c688326ba4c3c054f7e4a
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 16:19:19 2009 +1100
s3:smbtorture Convert charcnv torture suite to use push_ucs2_talloc()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit fca02c9154796624958a877d2c92cabd65e9d0e4)
---
Summary of changes:
source3/torture/t_push_ucs2.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/t_push_ucs2.c b/source3/torture/t_push_ucs2.c
index b9bf87b..2bd91da 100644
--- a/source3/torture/t_push_ucs2.c
+++ b/source3/torture/t_push_ucs2.c
@@ -14,16 +14,16 @@ static int check_push_ucs2(const char *orig)
int ret;
size_t converted_size;
- push_ucs2_allocate(dest, orig, converted_size);
- pull_ucs2_allocate(orig2, dest, converted_size);
+ push_ucs2_talloc(NULL, dest, orig, converted_size);
+ pull_ucs2_talloc(NULL, orig2, dest, converted_size);
ret = strcmp(orig, orig2);
if (ret) {
fprintf(stderr, orig: %s\n, orig);
fprintf(stderr, orig (UNIX - UCS2 - UNIX): %s\n, orig2);
}
- SAFE_FREE(dest);
- SAFE_FREE(orig2);
+ TALLOC_FREE(dest);
+ TALLOC_FREE(orig2);
return ret;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-889-g574a6a8
The branch, master has been updated
via 574a6a8c350a4bab3f42f3f9cfb382db721d69b5 (commit)
from fca02c9154796624958a877d2c92cabd65e9d0e4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 574a6a8c350a4bab3f42f3f9cfb382db721d69b5
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 16:23:27 2009 +1100
s3:kerberos Rework smb_krb5_unparse_name() to take a talloc context
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/include/includes.h |7 ---
source3/libads/authdata.c|2 +-
source3/libads/kerberos.c|8
source3/libads/kerberos_keytab.c | 27 ++-
source3/libads/kerberos_verify.c |6 +++---
source3/libnet/libnet_keytab.c | 32 ++--
source3/libsmb/clikrb5.c | 23 ---
source3/smbd/sesssetup.c |8
source3/utils/ntlm_auth.c|6 ++
9 files changed, 54 insertions(+), 65 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index c883e17..497034b 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -901,9 +901,10 @@ krb5_error_code smb_krb5_parse_name(krb5_context context,
const char *name, /* in unix charset */
krb5_principal *principal);
-krb5_error_code smb_krb5_unparse_name(krb5_context context,
- krb5_const_principal principal,
- char **unix_name);
+krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
+ krb5_context context,
+ krb5_const_principal principal,
+ char **unix_name);
#ifndef HAVE_KRB5_SET_REAL_TIME
krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds,
int32_t microseconds);
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 9f0f68e..0032e9e 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -469,7 +469,7 @@ out:
data_blob_free(sesskey1);
data_blob_free(sesskey2);
- SAFE_FREE(client_princ_out);
+ TALLOC_FREE(client_princ_out);
return status;
}
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 52cb975..c476f59 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -545,7 +545,7 @@ krb5_principal
kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
/* look under the old key. If this fails, just use the
standard key */
- if (smb_krb5_unparse_name(context, host_princ, unparsed_name)
!= 0) {
+ if (smb_krb5_unparse_name(talloc_tos(), context, host_princ,
unparsed_name) != 0) {
return (krb5_principal)NULL;
}
if ((salt_princ_s =
kerberos_secrets_fetch_salting_principal(unparsed_name, enctype)) == NULL) {
@@ -558,7 +558,7 @@ krb5_principal
kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
ret_princ = NULL;
}
- SAFE_FREE(unparsed_name);
+ TALLOC_FREE(unparsed_name);
SAFE_FREE(salt_princ_s);
return ret_princ;
@@ -603,7 +603,7 @@ bool kerberos_secrets_store_salting_principal(const char
*service,
goto out;
}
- if (smb_krb5_unparse_name(context, princ, unparsed_name) != 0) {
+ if (smb_krb5_unparse_name(talloc_tos(), context, princ, unparsed_name)
!= 0) {
goto out;
}
@@ -623,7 +623,7 @@ bool kerberos_secrets_store_salting_principal(const char
*service,
SAFE_FREE(key);
SAFE_FREE(princ_s);
- SAFE_FREE(unparsed_name);
+ TALLOC_FREE(unparsed_name);
if (princ) {
krb5_free_principal(context, princ);
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 7c028cb..4fede25 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -64,7 +64,7 @@ int smb_krb5_kt_add_entry_ext(krb5_context context,
while(!krb5_kt_next_entry(context, keytab, kt_entry, cursor))
{
bool compare_name_ok = False;
- ret = smb_krb5_unparse_name(context,
kt_entry.principal, ktprinc);
+ ret = smb_krb5_unparse_name(talloc_tos(), context,
kt_entry.principal, ktprinc);
if (ret) {
DEBUG(1,(smb_krb5_kt_add_entry_ext:
smb_krb5_unparse_name failed (%s)\n,
error_message(ret)));
@@ -91,7 +91,7 @@ int
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-890-g042aaff
The branch, master has been updated
via 042aaffabf602560877558ac167c69257862b124 (commit)
from 574a6a8c350a4bab3f42f3f9cfb382db721d69b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 042aaffabf602560877558ac167c69257862b124
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 18:04:35 2009 +1100
s3:smbldap convert the easy cases to push_utf8_talloc()
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/lib/smbldap.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 1dfb020..4f54f9a 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -1228,7 +1228,7 @@ static int smbldap_search_ext(struct smbldap_state
*ldap_state,
ZERO_STRUCT(ldap_state-last_rebind);
}
- if (!push_utf8_allocate(utf8_filter, filter, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_filter, filter,
converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1276,7 +1276,7 @@ static int smbldap_search_ext(struct smbldap_state
*ldap_state,
}
}
- SAFE_FREE(utf8_filter);
+ TALLOC_FREE(utf8_filter);
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
@@ -1400,7 +1400,7 @@ int smbldap_modify(struct smbldap_state *ldap_state,
const char *dn, LDAPMod *at
DEBUG(5,(smbldap_modify: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1428,7 +1428,7 @@ int smbldap_modify(struct smbldap_state *ldap_state,
const char *dn, LDAPMod *at
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
@@ -1444,7 +1444,7 @@ int smbldap_add(struct smbldap_state *ldap_state, const
char *dn, LDAPMod *attrs
DEBUG(5,(smbldap_add: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1472,7 +1472,7 @@ int smbldap_add(struct smbldap_state *ldap_state, const
char *dn, LDAPMod *attrs
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
@@ -1488,7 +1488,7 @@ int smbldap_delete(struct smbldap_state *ldap_state,
const char *dn)
DEBUG(5,(smbldap_delete: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1516,7 +1516,7 @@ int smbldap_delete(struct smbldap_state *ldap_state,
const char *dn)
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-667-g44e05e8
The branch, v3-4-test has been updated
via 44e05e848c622750ae632386d94f63e107a59e1d (commit)
from 7e6d6eeff3e082d7223264c17cb27c2ab89df9aa (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 44e05e848c622750ae632386d94f63e107a59e1d
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 18:04:35 2009 +1100
s3:smbldap convert the easy cases to push_utf8_talloc()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 042aaffabf602560877558ac167c69257862b124)
---
Summary of changes:
source3/lib/smbldap.c | 16
1 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 1dfb020..4f54f9a 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -1228,7 +1228,7 @@ static int smbldap_search_ext(struct smbldap_state
*ldap_state,
ZERO_STRUCT(ldap_state-last_rebind);
}
- if (!push_utf8_allocate(utf8_filter, filter, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_filter, filter,
converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1276,7 +1276,7 @@ static int smbldap_search_ext(struct smbldap_state
*ldap_state,
}
}
- SAFE_FREE(utf8_filter);
+ TALLOC_FREE(utf8_filter);
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
@@ -1400,7 +1400,7 @@ int smbldap_modify(struct smbldap_state *ldap_state,
const char *dn, LDAPMod *at
DEBUG(5,(smbldap_modify: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1428,7 +1428,7 @@ int smbldap_modify(struct smbldap_state *ldap_state,
const char *dn, LDAPMod *at
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
@@ -1444,7 +1444,7 @@ int smbldap_add(struct smbldap_state *ldap_state, const
char *dn, LDAPMod *attrs
DEBUG(5,(smbldap_add: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1472,7 +1472,7 @@ int smbldap_add(struct smbldap_state *ldap_state, const
char *dn, LDAPMod *attrs
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
@@ -1488,7 +1488,7 @@ int smbldap_delete(struct smbldap_state *ldap_state,
const char *dn)
DEBUG(5,(smbldap_delete: dn = [%s]\n, dn ));
- if (!push_utf8_allocate(utf8_dn, dn, converted_size)) {
+ if (!push_utf8_talloc(talloc_tos(), utf8_dn, dn, converted_size)) {
return LDAP_NO_MEMORY;
}
@@ -1516,7 +1516,7 @@ int smbldap_delete(struct smbldap_state *ldap_state,
const char *dn)
}
}
- SAFE_FREE(utf8_dn);
+ TALLOC_FREE(utf8_dn);
return rc;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-668-g130baaf
The branch, v3-4-test has been updated via 130baafc7c36333cf29a19921f4736beb53a15e9 (commit) from 44e05e848c622750ae632386d94f63e107a59e1d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 130baafc7c36333cf29a19921f4736beb53a15e9 Author: Tim Prouty tpro...@samba.org Date: Tue Apr 7 09:49:55 2009 -0700 s3 oplocks: Add back procid_str to debug message --- Summary of changes: source3/smbd/oplock.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 3b6d4a3..290e662 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -429,8 +429,9 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx /* De-linearize incoming message. */ message_to_share_mode_entry(msg, (char *)data-data); - DEBUG(10, (Got oplock async level 2 break message from pid %d: %s/%lu\n, - (int)procid_to_pid(src), file_id_string_tos(msg.id), msg.share_file_id)); + DEBUG(10, (Got oplock async level 2 break message from pid %s: + %s/%lu\n, procid_str(debug_ctx(), src), + file_id_string_tos(msg.id), msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-669-ged6388e
The branch, v3-4-test has been updated
via ed6388ee3a96972b7bf7df79c9ca0b63bfb84380 (commit)
from 130baafc7c36333cf29a19921f4736beb53a15e9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit ed6388ee3a96972b7bf7df79c9ca0b63bfb84380
Author: Tim Prouty tpro...@samba.org
Date: Tue Apr 7 00:56:50 2009 +
s3 onefs: Fix case-insensitivity for mangled names
onefs_get_real_filename needs to demangle the filename before doing
the case-insensitive estat
(cherry picked from commit 161bd7f78fd10e4f850dc3ef1ba3df53c43eae30)
---
Summary of changes:
source3/modules/vfs_onefs.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c
index ad59c2b..e4a0feb 100644
--- a/source3/modules/vfs_onefs.c
+++ b/source3/modules/vfs_onefs.c
@@ -153,10 +153,21 @@ static int onefs_get_real_filename(vfs_handle_struct
*handle, const char *path,
char **found_name)
{
SMB_STRUCT_STAT sb;
+ struct connection_struct *conn = handle-conn;
struct stat_extra se;
int result;
+ char *unmangled_name = NULL;
char *full_name = NULL;
+ /* First demangle the name if necessary. */
+ if (!conn-case_sensitive mangle_is_mangled(name, conn-params)
+ mangle_lookup_name_from_8_3(mem_ctx, name, unmangled_name,
+ conn-params)) {
+ /* Name is now unmangled. */
+ name = unmangled_name;
+ }
+
+ /* Do the case insensitive stat. */
ZERO_STRUCT(se);
se.se_version = ESTAT_CURRENT_VERSION;
se.se_flags = ESTAT_CASE_INSENSITIVE | ESTAT_SYMLINK_NOFOLLOW;
@@ -184,6 +195,7 @@ static int onefs_get_real_filename(vfs_handle_struct
*handle, const char *path,
done:
TALLOC_FREE(full_name);
+ TALLOC_FREE(unmangled_name);
return result;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-679-g779ddf7
The branch, v3-4-test has been updated
via 779ddf78f13940ef402331b68d86276241479a86 (commit)
via 92688cded5d6018ca9f4c1588f418da6297f7d61 (commit)
via 22e82a52ded2ae43edb20c0898bd0a9316e563a2 (commit)
via 6cf0e88ee6cefdab7d2d5f272e6d9e23005f9b61 (commit)
from c551c490f858b0298f876d515b1b17116c04799f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 779ddf78f13940ef402331b68d86276241479a86
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:20:08 2009 +1100
s3:charcnv Remove unused unistrcpy() and unistrlen()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 0c22d55134b39a6bc983b4f852f623a51af4d362)
commit 92688cded5d6018ca9f4c1588f418da6297f7d61
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:18:14 2009 +1100
s3:rpc_parse remove unused prs_unistr2()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 3277b19800c6c56a32b7641d293e496475d8c62a)
commit 22e82a52ded2ae43edb20c0898bd0a9316e563a2
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:14:36 2009 +1100
s3:charcnv Remove unused unistr2 functions
Natrually, the hard work to make these unsued was done by GD, not me :-)
Andrew Bartlett
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 80163b5ac5bfff3698aeb9c5c43a2cc94947055c)
commit 6cf0e88ee6cefdab7d2d5f272e6d9e23005f9b61
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:11:15 2009 +1100
s3:charcnv Remove unused ucs2_to_unistr2()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 5fff53882002bf5378690ddeb8251e2c99490266)
---
Summary of changes:
source3/include/proto.h |9 --
source3/lib/util_unistr.c | 199 -
source3/rpc_parse/parse_prs.c | 38
3 files changed, 0 insertions(+), 246 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0ea7106..16fcd33 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1555,13 +1555,8 @@ int rpcstr_pull_talloc(TALLOC_CTX *ctx,
void *src,
int src_len,
int flags);
-int rpcstr_pull_unistr2_fstring(char *dest, UNISTR2 *src);
-char *rpcstr_pull_unistr2_talloc(TALLOC_CTX *ctx, const UNISTR2 *src);
int rpcstr_push(void *dest, const char *src, size_t dest_len, int flags);
int rpcstr_push_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
-void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen);
-char *unistr2_to_ascii_talloc(TALLOC_CTX *ctx, const UNISTR2 *str);
-const char *unistr2_static(const UNISTR2 *str);
smb_ucs2_t toupper_w(smb_ucs2_t val);
smb_ucs2_t tolower_w( smb_ucs2_t val );
bool islower_w(smb_ucs2_t c);
@@ -1595,9 +1590,6 @@ int strcmp_wa(const smb_ucs2_t *a, const char *b);
int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len);
smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p);
smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins);
-int unistrlen(uint16 *s);
-int unistrcpy(uint16 *dst, uint16 *src);
-UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* src);
int toupper_ascii(int c);
int tolower_ascii(int c);
int isupper_ascii(int c);
@@ -5743,7 +5735,6 @@ bool prs_uint8s(bool charmode, const char *name,
prs_struct *ps, int depth, uint
bool prs_uint16s(bool charmode, const char *name, prs_struct *ps, int depth,
uint16 *data16s, int len);
bool prs_uint16uni(bool charmode, const char *name, prs_struct *ps, int depth,
uint16 *data16s, int len);
bool prs_uint32s(bool charmode, const char *name, prs_struct *ps, int depth,
uint32 *data32s, int len);
-bool prs_unistr2(bool charmode, const char *name, prs_struct *ps, int depth,
UNISTR2 *str);
bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str);
bool prs_string(const char *name, prs_struct *ps, int depth, char *str, int
max_buf_size);
bool prs_string_alloc(const char *name, prs_struct *ps, int depth, const char
**str);
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 840e8e0..7d80b3c 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -291,64 +291,6 @@ int rpcstr_pull_talloc(TALLOC_CTX *ctx,
}
-/* Copy a string from a unistr2 source to internal samba format
- destination. Use this instead of direct calls to rpcstr_pull() to avoid
- having to determine whether the source string is null terminated. */
-
-int rpcstr_pull_unistr2_fstring(char *dest, UNISTR2 *src)
-{
-return pull_ucs2(NULL, dest, src-buffer, sizeof(fstring),
- src-uni_str_len * 2, 0);
-}
-
-/* Helper
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-892-g161bd7f
The branch, master has been updated
via 161bd7f78fd10e4f850dc3ef1ba3df53c43eae30 (commit)
via 785c19182ba7c0cc15502ee89f2c3ca1cfb1c5e7 (commit)
from 042aaffabf602560877558ac167c69257862b124 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 161bd7f78fd10e4f850dc3ef1ba3df53c43eae30
Author: Tim Prouty tpro...@samba.org
Date: Tue Apr 7 00:56:50 2009 +
s3 onefs: Fix case-insensitivity for mangled names
onefs_get_real_filename needs to demangle the filename before doing
the case-insensitive estat
commit 785c19182ba7c0cc15502ee89f2c3ca1cfb1c5e7
Author: Tim Prouty tpro...@samba.org
Date: Tue Apr 7 09:49:55 2009 -0700
s3 oplocks: Add back procid_str to debug message
---
Summary of changes:
source3/modules/vfs_onefs.c | 12
source3/smbd/oplock.c |5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c
index ad59c2b..e4a0feb 100644
--- a/source3/modules/vfs_onefs.c
+++ b/source3/modules/vfs_onefs.c
@@ -153,10 +153,21 @@ static int onefs_get_real_filename(vfs_handle_struct
*handle, const char *path,
char **found_name)
{
SMB_STRUCT_STAT sb;
+ struct connection_struct *conn = handle-conn;
struct stat_extra se;
int result;
+ char *unmangled_name = NULL;
char *full_name = NULL;
+ /* First demangle the name if necessary. */
+ if (!conn-case_sensitive mangle_is_mangled(name, conn-params)
+ mangle_lookup_name_from_8_3(mem_ctx, name, unmangled_name,
+ conn-params)) {
+ /* Name is now unmangled. */
+ name = unmangled_name;
+ }
+
+ /* Do the case insensitive stat. */
ZERO_STRUCT(se);
se.se_version = ESTAT_CURRENT_VERSION;
se.se_flags = ESTAT_CASE_INSENSITIVE | ESTAT_SYMLINK_NOFOLLOW;
@@ -184,6 +195,7 @@ static int onefs_get_real_filename(vfs_handle_struct
*handle, const char *path,
done:
TALLOC_FREE(full_name);
+ TALLOC_FREE(unmangled_name);
return result;
}
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 98f89ac..b937e8e 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -422,8 +422,9 @@ void process_oplock_async_level2_break_message(struct
messaging_context *msg_ctx
/* De-linearize incoming message. */
message_to_share_mode_entry(msg, (char *)data-data);
- DEBUG(10, (Got oplock async level 2 break message from pid %d:
%s/%lu\n,
- (int)procid_to_pid(src), file_id_string_tos(msg.id),
msg.share_file_id));
+ DEBUG(10, (Got oplock async level 2 break message from pid %s:
+ %s/%lu\n, procid_str(debug_ctx(), src),
+ file_id_string_tos(msg.id), msg.share_file_id));
fsp = initial_break_processing(msg.id, msg.share_file_id);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-902-g0c22d55
The branch, master has been updated
via 0c22d55134b39a6bc983b4f852f623a51af4d362 (commit)
via 3277b19800c6c56a32b7641d293e496475d8c62a (commit)
via 80163b5ac5bfff3698aeb9c5c43a2cc94947055c (commit)
via 5fff53882002bf5378690ddeb8251e2c99490266 (commit)
from c4ad3e57ff23b3a64e8a351c4b5466eabe52f3f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0c22d55134b39a6bc983b4f852f623a51af4d362
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:20:08 2009 +1100
s3:charcnv Remove unused unistrcpy() and unistrlen()
Signed-off-by: Günther Deschner g...@samba.org
commit 3277b19800c6c56a32b7641d293e496475d8c62a
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:18:14 2009 +1100
s3:rpc_parse remove unused prs_unistr2()
Signed-off-by: Günther Deschner g...@samba.org
commit 80163b5ac5bfff3698aeb9c5c43a2cc94947055c
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:14:36 2009 +1100
s3:charcnv Remove unused unistr2 functions
Natrually, the hard work to make these unsued was done by GD, not me :-)
Andrew Bartlett
Signed-off-by: Günther Deschner g...@samba.org
commit 5fff53882002bf5378690ddeb8251e2c99490266
Author: Andrew Bartlett abart...@samba.org
Date: Thu Mar 19 19:11:15 2009 +1100
s3:charcnv Remove unused ucs2_to_unistr2()
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/include/proto.h |9 --
source3/lib/util_unistr.c | 199 -
source3/rpc_parse/parse_prs.c | 38
3 files changed, 0 insertions(+), 246 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index b677c3d..f8a28ef 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1560,13 +1560,8 @@ int rpcstr_pull_talloc(TALLOC_CTX *ctx,
void *src,
int src_len,
int flags);
-int rpcstr_pull_unistr2_fstring(char *dest, UNISTR2 *src);
-char *rpcstr_pull_unistr2_talloc(TALLOC_CTX *ctx, const UNISTR2 *src);
int rpcstr_push(void *dest, const char *src, size_t dest_len, int flags);
int rpcstr_push_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src);
-void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen);
-char *unistr2_to_ascii_talloc(TALLOC_CTX *ctx, const UNISTR2 *str);
-const char *unistr2_static(const UNISTR2 *str);
smb_ucs2_t toupper_w(smb_ucs2_t val);
smb_ucs2_t tolower_w( smb_ucs2_t val );
bool islower_w(smb_ucs2_t c);
@@ -1600,9 +1595,6 @@ int strcmp_wa(const smb_ucs2_t *a, const char *b);
int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len);
smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p);
smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins);
-int unistrlen(uint16 *s);
-int unistrcpy(uint16 *dst, uint16 *src);
-UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* src);
int toupper_ascii(int c);
int tolower_ascii(int c);
int isupper_ascii(int c);
@@ -5788,7 +5780,6 @@ bool prs_uint8s(bool charmode, const char *name,
prs_struct *ps, int depth, uint
bool prs_uint16s(bool charmode, const char *name, prs_struct *ps, int depth,
uint16 *data16s, int len);
bool prs_uint16uni(bool charmode, const char *name, prs_struct *ps, int depth,
uint16 *data16s, int len);
bool prs_uint32s(bool charmode, const char *name, prs_struct *ps, int depth,
uint32 *data32s, int len);
-bool prs_unistr2(bool charmode, const char *name, prs_struct *ps, int depth,
UNISTR2 *str);
bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str);
bool prs_string(const char *name, prs_struct *ps, int depth, char *str, int
max_buf_size);
bool prs_string_alloc(const char *name, prs_struct *ps, int depth, const char
**str);
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 840e8e0..7d80b3c 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -291,64 +291,6 @@ int rpcstr_pull_talloc(TALLOC_CTX *ctx,
}
-/* Copy a string from a unistr2 source to internal samba format
- destination. Use this instead of direct calls to rpcstr_pull() to avoid
- having to determine whether the source string is null terminated. */
-
-int rpcstr_pull_unistr2_fstring(char *dest, UNISTR2 *src)
-{
-return pull_ucs2(NULL, dest, src-buffer, sizeof(fstring),
- src-uni_str_len * 2, 0);
-}
-
-/* Helper function to return a talloc'ed string. I have implemented it with a
- * copy because I don't really know how pull_ucs2 and friends calculate the
- * target size. If this turns out to be a major bottleneck someone with deeper
- * multi-byte knowledge needs to revisit this.
- * I just did (JRA :-).
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-898-gc4ad3e5
The branch, master has been updated via c4ad3e57ff23b3a64e8a351c4b5466eabe52f3f1 (commit) from 8da2fa36b4f4241d7d4cdbe254a2374dd373fe40 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c4ad3e57ff23b3a64e8a351c4b5466eabe52f3f1 Author: Karolin Seeger ksee...@samba.org Date: Tue Apr 7 20:45:45 2009 +0200 s3/docs: Raise version number up to 3.5. Karolin --- Summary of changes: docs-xml/manpages-3/cifs.upcall.8.xml |2 +- docs-xml/manpages-3/eventlogadm.8.xml |2 +- docs-xml/manpages-3/findsmb.1.xml |2 +- docs-xml/manpages-3/idmap_ad.8.xml |2 +- docs-xml/manpages-3/idmap_adex.8.xml |2 +- docs-xml/manpages-3/idmap_hash.8.xml |2 +- docs-xml/manpages-3/idmap_ldap.8.xml |2 +- docs-xml/manpages-3/idmap_nss.8.xml|2 +- docs-xml/manpages-3/idmap_rid.8.xml|2 +- docs-xml/manpages-3/idmap_tdb.8.xml|2 +- docs-xml/manpages-3/idmap_tdb2.8.xml |2 +- docs-xml/manpages-3/ldb.3.xml |2 +- docs-xml/manpages-3/ldbadd.1.xml |2 +- docs-xml/manpages-3/ldbdel.1.xml |2 +- docs-xml/manpages-3/ldbedit.1.xml |2 +- docs-xml/manpages-3/ldbmodify.1.xml|2 +- docs-xml/manpages-3/ldbsearch.1.xml|2 +- docs-xml/manpages-3/libsmbclient.7.xml |2 +- docs-xml/manpages-3/lmhosts.5.xml |2 +- docs-xml/manpages-3/log2pcap.1.xml |2 +- docs-xml/manpages-3/mount.cifs.8.xml |2 +- docs-xml/manpages-3/net.8.xml |2 +- docs-xml/manpages-3/nmbd.8.xml |2 +- docs-xml/manpages-3/nmblookup.1.xml|2 +- docs-xml/manpages-3/ntlm_auth.1.xml|2 +- docs-xml/manpages-3/pam_winbind.7.xml |2 +- docs-xml/manpages-3/pdbedit.8.xml |2 +- docs-xml/manpages-3/profiles.1.xml |2 +- docs-xml/manpages-3/rpcclient.1.xml|2 +- docs-xml/manpages-3/samba.7.xml|2 +- docs-xml/manpages-3/sharesec.1.xml |2 +- docs-xml/manpages-3/smb.conf.5.xml |2 +- docs-xml/manpages-3/smbcacls.1.xml |2 +- docs-xml/manpages-3/smbclient.1.xml|2 +- docs-xml/manpages-3/smbcontrol.1.xml |2 +- docs-xml/manpages-3/smbcquotas.1.xml |2 +- docs-xml/manpages-3/smbd.8.xml |2 +- docs-xml/manpages-3/smbget.1.xml |2 +- docs-xml/manpages-3/smbgetrc.5.xml |2 +- docs-xml/manpages-3/smbpasswd.5.xml|2 +- docs-xml/manpages-3/smbpasswd.8.xml|2 +- docs-xml/manpages-3/smbspool.8.xml |2 +- docs-xml/manpages-3/smbstatus.1.xml|2 +- docs-xml/manpages-3/smbtar.1.xml |2 +- docs-xml/manpages-3/smbtree.1.xml |2 +- docs-xml/manpages-3/swat.8.xml |2 +- docs-xml/manpages-3/tdbbackup.8.xml|2 +- docs-xml/manpages-3/tdbdump.8.xml |2 +- docs-xml/manpages-3/tdbtool.8.xml |2 +- docs-xml/manpages-3/testparm.1.xml |2 +- docs-xml/manpages-3/umount.cifs.8.xml |2 +- docs-xml/manpages-3/vfs_acl_tdb.8.xml |2 +- docs-xml/manpages-3/vfs_acl_xattr.8.xml|2 +- docs-xml/manpages-3/vfs_audit.8.xml|2 +- docs-xml/manpages-3/vfs_cacheprime.8.xml |2 +- docs-xml/manpages-3/vfs_cap.8.xml |2 +- docs-xml/manpages-3/vfs_catia.8.xml|2 +- docs-xml/manpages-3/vfs_commit.8.xml |2 +- docs-xml/manpages-3/vfs_default_quota.8.xml|2 +- docs-xml/manpages-3/vfs_dirsort.8.xml |2 +- docs-xml/manpages-3/vfs_extd_audit.8.xml |2 +- docs-xml/manpages-3/vfs_fake_perms.8.xml |2 +- docs-xml/manpages-3/vfs_fileid.8.xml |2 +- docs-xml/manpages-3/vfs_full_audit.8.xml |2 +- docs-xml/manpages-3/vfs_gpfs.8.xml |2 +- docs-xml/manpages-3/vfs_netatalk.8.xml |2 +- docs-xml/manpages-3/vfs_notify_fam.8.xml |2 +- docs-xml/manpages-3/vfs_prealloc.8.xml |2 +- docs-xml/manpages-3/vfs_preopen.8.xml |2 +- docs-xml/manpages-3/vfs_readahead.8.xml|2 +- docs-xml/manpages-3/vfs_readonly.8.xml |2 +-
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-674-gecaca64
The branch, v3-4-test has been updated
via ecaca646f91750bc0a9a6f58ff1589197585ebdc (commit)
via c689d84d6d1232f0574d42d0cebee9236eaf2a5b (commit)
via f1f133dba832d129752c12a7656ce4a2dfae7806 (commit)
via 78a2b98d92d5a651bdc07659e717b8a2249373e9 (commit)
via c62811a62bee3c5b5af4c8893813b1a56ad9c22f (commit)
from ed6388ee3a96972b7bf7df79c9ca0b63bfb84380 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit ecaca646f91750bc0a9a6f58ff1589197585ebdc
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:01:27 2009 +0200
s3/popt.h: Fix typo.
Karolin
(cherry picked from commit 8da2fa36b4f4241d7d4cdbe254a2374dd373fe40)
commit c689d84d6d1232f0574d42d0cebee9236eaf2a5b
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:00:47 2009 +0200
s3/loadparm: Fiy typos.
Karolin
(cherry picked from commit 4458809597ff4362a653ea5469c5237bbe2a0531)
commit f1f133dba832d129752c12a7656ce4a2dfae7806
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:47 2009 +0200
s3/gpo_ldap: Fix typo.
Karolin
(cherry picked from commit a103222e0b679d68684681c871ac912f279afc1b)
commit 78a2b98d92d5a651bdc07659e717b8a2249373e9
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:14 2009 +0200
s3/smbconf_reg: Fix typo.
Karolin
(cherry picked from commit 6343cab3086f5795c8428eddcb966ba8b72d3511)
commit c62811a62bee3c5b5af4c8893813b1a56ad9c22f
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:55:45 2009 +0200
s3/docs: Fix typo.
Karolin
(cherry picked from commit c002c1d776bc62bafe62e29a91e05100c5025890)
---
Summary of changes:
docs-xml/manpages-3/smbcontrol.1.xml |2 +-
lib/popt/popt.h |2 +-
source3/lib/smbconf/smbconf_reg.c|2 +-
source3/libgpo/gpo_ldap.c|2 +-
source3/param/loadparm.c |4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml
b/docs-xml/manpages-3/smbcontrol.1.xml
index f8c31bb..b608244 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -66,7 +66,7 @@
paraThe parameterall/parameter destination causes the
message to broadcast to all running daemons including nmbd and
winbind. This is a change for Samba 3.3, prior to this the
- paramter smbd used to do this./para
+ parameter smbd used to do this./para
paraThe parametersmbd/parameter destination causes the
message to be sent to the smbd daemon specified in the
diff --git a/lib/popt/popt.h b/lib/popt/popt.h
index 08701d7..7b94a98 100644
--- a/lib/popt/popt.h
+++ b/lib/popt/popt.h
@@ -83,7 +83,7 @@
#define POPT_ERROR_NOARG -10 /*! missing argument */
#define POPT_ERROR_BADOPT -11 /*! unknown option */
#define POPT_ERROR_OPTSTOODEEP -13 /*! aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE-15 /*! error in paramter quoting */
+#define POPT_ERROR_BADQUOTE-15 /*! error in parameter quoting */
#define POPT_ERROR_ERRNO -16 /*! errno set, use strerror(errno) */
#define POPT_ERROR_BADNUMBER -17 /*! invalid numeric value */
#define POPT_ERROR_OVERFLOW-18 /*! number too large or too small */
diff --git a/source3/lib/smbconf/smbconf_reg.c
b/source3/lib/smbconf/smbconf_reg.c
index ae6a411..0ecac97 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -193,7 +193,7 @@ static WERROR smbconf_reg_set_value(struct registry_key
*key,
if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
- DEBUG(5, (Global paramter '%s' not allowed in
+ DEBUG(5, (Global parameter '%s' not allowed in
service definition ('%s').\n, canon_valname,
subkeyname));
werr = WERR_INVALID_PARAM;
diff --git a/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c
index 882804b..716b872 100644
--- a/source3/libgpo/gpo_ldap.c
+++ b/source3/libgpo/gpo_ldap.c
@@ -453,7 +453,7 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
}
/
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
/
ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f49a1bc..8630dd0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -878,7 +878,7
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-903-gc5b24d6
The branch, master has been updated
via c5b24d65cdb1b32196681499dcaf23ea70e1019b (commit)
from 0c22d55134b39a6bc983b4f852f623a51af4d362 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c5b24d65cdb1b32196681499dcaf23ea70e1019b
Author: Günther Deschner g...@samba.org
Date: Thu Apr 2 16:15:16 2009 +0200
s3-spoolss: set servername to global_myname() in set_printer_hnd_name().
This allows spoolss_OpenPrinterEx to open a printer by printername.
Now the Samba3 spoolss server passes the RPC-SPOOLSS-WIN test.
Guenther
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 7bb0571..098e592 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -445,7 +445,7 @@ static bool set_printer_hnd_name(Printer_entry *Printer,
const char *handlename)
aprinter++;
}
} else {
- servername = ;
+ servername = global_myname();
}
/* save the servername to fill in replies on this handle */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-675-gc551c49
The branch, v3-4-test has been updated via c551c490f858b0298f876d515b1b17116c04799f (commit) from ecaca646f91750bc0a9a6f58ff1589197585ebdc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit c551c490f858b0298f876d515b1b17116c04799f Author: Karolin Seeger ksee...@samba.org Date: Tue Apr 7 20:43:28 2009 +0200 s3/docs: Raise version up to 3.4. Karolin --- Summary of changes: docs-xml/manpages-3/cifs.upcall.8.xml |2 +- docs-xml/manpages-3/eventlogadm.8.xml |2 +- docs-xml/manpages-3/findsmb.1.xml |2 +- docs-xml/manpages-3/idmap_ad.8.xml |2 +- docs-xml/manpages-3/idmap_adex.8.xml |2 +- docs-xml/manpages-3/idmap_hash.8.xml |2 +- docs-xml/manpages-3/idmap_ldap.8.xml |2 +- docs-xml/manpages-3/idmap_nss.8.xml|2 +- docs-xml/manpages-3/idmap_rid.8.xml|2 +- docs-xml/manpages-3/idmap_tdb.8.xml|2 +- docs-xml/manpages-3/idmap_tdb2.8.xml |2 +- docs-xml/manpages-3/ldb.3.xml |2 +- docs-xml/manpages-3/ldbadd.1.xml |2 +- docs-xml/manpages-3/ldbdel.1.xml |2 +- docs-xml/manpages-3/ldbedit.1.xml |2 +- docs-xml/manpages-3/ldbmodify.1.xml|2 +- docs-xml/manpages-3/ldbsearch.1.xml|2 +- docs-xml/manpages-3/libsmbclient.7.xml |2 +- docs-xml/manpages-3/lmhosts.5.xml |2 +- docs-xml/manpages-3/log2pcap.1.xml |2 +- docs-xml/manpages-3/mount.cifs.8.xml |2 +- docs-xml/manpages-3/net.8.xml |2 +- docs-xml/manpages-3/nmbd.8.xml |2 +- docs-xml/manpages-3/nmblookup.1.xml|2 +- docs-xml/manpages-3/ntlm_auth.1.xml|2 +- docs-xml/manpages-3/pam_winbind.7.xml |2 +- docs-xml/manpages-3/pdbedit.8.xml |2 +- docs-xml/manpages-3/profiles.1.xml |2 +- docs-xml/manpages-3/rpcclient.1.xml|2 +- docs-xml/manpages-3/samba.7.xml|2 +- docs-xml/manpages-3/sharesec.1.xml |2 +- docs-xml/manpages-3/smb.conf.5.xml |2 +- docs-xml/manpages-3/smbcacls.1.xml |2 +- docs-xml/manpages-3/smbclient.1.xml|2 +- docs-xml/manpages-3/smbcontrol.1.xml |2 +- docs-xml/manpages-3/smbcquotas.1.xml |2 +- docs-xml/manpages-3/smbd.8.xml |2 +- docs-xml/manpages-3/smbget.1.xml |2 +- docs-xml/manpages-3/smbgetrc.5.xml |2 +- docs-xml/manpages-3/smbpasswd.5.xml|2 +- docs-xml/manpages-3/smbpasswd.8.xml|2 +- docs-xml/manpages-3/smbspool.8.xml |2 +- docs-xml/manpages-3/smbstatus.1.xml|2 +- docs-xml/manpages-3/smbtar.1.xml |2 +- docs-xml/manpages-3/smbtree.1.xml |2 +- docs-xml/manpages-3/swat.8.xml |2 +- docs-xml/manpages-3/tdbbackup.8.xml|2 +- docs-xml/manpages-3/tdbdump.8.xml |2 +- docs-xml/manpages-3/tdbtool.8.xml |2 +- docs-xml/manpages-3/testparm.1.xml |2 +- docs-xml/manpages-3/umount.cifs.8.xml |2 +- docs-xml/manpages-3/vfs_acl_tdb.8.xml |2 +- docs-xml/manpages-3/vfs_acl_xattr.8.xml|2 +- docs-xml/manpages-3/vfs_audit.8.xml|2 +- docs-xml/manpages-3/vfs_cacheprime.8.xml |2 +- docs-xml/manpages-3/vfs_cap.8.xml |2 +- docs-xml/manpages-3/vfs_catia.8.xml|2 +- docs-xml/manpages-3/vfs_commit.8.xml |2 +- docs-xml/manpages-3/vfs_default_quota.8.xml|2 +- docs-xml/manpages-3/vfs_dirsort.8.xml |2 +- docs-xml/manpages-3/vfs_extd_audit.8.xml |2 +- docs-xml/manpages-3/vfs_fake_perms.8.xml |2 +- docs-xml/manpages-3/vfs_fileid.8.xml |2 +- docs-xml/manpages-3/vfs_full_audit.8.xml |2 +- docs-xml/manpages-3/vfs_gpfs.8.xml |2 +- docs-xml/manpages-3/vfs_netatalk.8.xml |2 +- docs-xml/manpages-3/vfs_notify_fam.8.xml |2 +- docs-xml/manpages-3/vfs_prealloc.8.xml |2 +- docs-xml/manpages-3/vfs_preopen.8.xml |2 +- docs-xml/manpages-3/vfs_readahead.8.xml|2 +- docs-xml/manpages-3/vfs_readonly.8.xml |2 +-
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5201-g3df28fc
The branch, v3-3-test has been updated
via 3df28fce45ce552df2c0815597fc1808ea08b363 (commit)
via 7648c51afaf844e576935dadc0d66a94e2cad28b (commit)
via a33677c8a80925965a4023785fc3a221d2ed9585 (commit)
via 56e877662dd6da64b348803c24e85f60ee6b3d85 (commit)
via 0b1a17739c8295642b8697cba3d3907238ad935d (commit)
from 8950b5acfcae187f73549c62e63fdc97c5764419 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 3df28fce45ce552df2c0815597fc1808ea08b363
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:01:27 2009 +0200
s3/popt.h: Fix typo.
This used to be commit 8da2fa36 in master.
Karolin
commit 7648c51afaf844e576935dadc0d66a94e2cad28b
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:00:47 2009 +0200
s3/loadparm: Fiy typos.
This used to be commit 44588095 in master.
Karolin
commit a33677c8a80925965a4023785fc3a221d2ed9585
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:47 2009 +0200
s3/gpo_ldap: Fix typo.
This used to be commit a103222e in master.
Karolin
commit 56e877662dd6da64b348803c24e85f60ee6b3d85
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:14 2009 +0200
s3/smbconf_reg: Fix typo.
This used to be commit 6343cab3 in master.
Karolin
commit 0b1a17739c8295642b8697cba3d3907238ad935d
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:55:45 2009 +0200
s3/docs: Fix typo.
Karolin
(cherry picked from commit c002c1d776bc62bafe62e29a91e05100c5025890)
---
Summary of changes:
docs-xml/manpages-3/smbcontrol.1.xml |2 +-
source/lib/smbconf/smbconf_reg.c |2 +-
source/libgpo/gpo_ldap.c |2 +-
source/param/loadparm.c |4 ++--
source/popt/popt.h |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml
b/docs-xml/manpages-3/smbcontrol.1.xml
index 46dd660..d4bccb7 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -66,7 +66,7 @@
paraThe parameterall/parameter destination causes the
message to broadcast to all running daemons including nmbd and
winbind. This is a change for Samba 3.3, prior to this the
- paramter smbd used to do this./para
+ parameter smbd used to do this./para
paraThe parametersmbd/parameter destination causes the
message to be sent to the smbd daemon specified in the
diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index 9a78692..ce4a76e 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -193,7 +193,7 @@ static WERROR smbconf_reg_set_value(struct registry_key
*key,
if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
- DEBUG(5, (Global paramter '%s' not allowed in
+ DEBUG(5, (Global parameter '%s' not allowed in
service definition ('%s').\n, canon_valname,
subkeyname));
werr = WERR_INVALID_PARAM;
diff --git a/source/libgpo/gpo_ldap.c b/source/libgpo/gpo_ldap.c
index 0e77f0a..02bd408 100644
--- a/source/libgpo/gpo_ldap.c
+++ b/source/libgpo/gpo_ldap.c
@@ -453,7 +453,7 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
}
/
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
/
ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 027cd3d..db72e64 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -860,7 +860,7 @@ static const struct enum_list enum_config_backend[] = {
/* Note: We do not initialise the defaults union - it is not allowed in ANSI C
*
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
+ * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
* screen in SWAT. This is used to exclude parameters as well as to squash all
* parameters that have been duplicated by pseudonyms.
*
@@ -869,7 +869,7 @@ static const struct enum_list enum_config_backend[] = {
* Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
*respective views.
*
- * NOTE2: Handling of duplicated (synonym) paramters:
+ * NOTE2: Handling of duplicated (synonym) parameters:
* Only the first occurance of a parameter should be
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-680-g3db2ef0
The branch, v3-4-test has been updated
via 3db2ef0394a3fdb11c8a54777360cbcdb94c87da (commit)
from 779ddf78f13940ef402331b68d86276241479a86 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 3db2ef0394a3fdb11c8a54777360cbcdb94c87da
Author: Günther Deschner g...@samba.org
Date: Thu Apr 2 16:15:16 2009 +0200
s3-spoolss: set servername to global_myname() in set_printer_hnd_name().
This allows spoolss_OpenPrinterEx to open a printer by printername.
Now the Samba3 spoolss server passes the RPC-SPOOLSS-WIN test.
Guenther
(cherry picked from commit c5b24d65cdb1b32196681499dcaf23ea70e1019b)
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 7bb0571..098e592 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -445,7 +445,7 @@ static bool set_printer_hnd_name(Printer_entry *Printer,
const char *handlename)
aprinter++;
}
} else {
- servername = ;
+ servername = global_myname();
}
/* save the servername to fill in replies on this handle */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-897-g8da2fa3
The branch, master has been updated
via 8da2fa36b4f4241d7d4cdbe254a2374dd373fe40 (commit)
via 4458809597ff4362a653ea5469c5237bbe2a0531 (commit)
via a103222e0b679d68684681c871ac912f279afc1b (commit)
via 6343cab3086f5795c8428eddcb966ba8b72d3511 (commit)
via c002c1d776bc62bafe62e29a91e05100c5025890 (commit)
from 161bd7f78fd10e4f850dc3ef1ba3df53c43eae30 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8da2fa36b4f4241d7d4cdbe254a2374dd373fe40
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:01:27 2009 +0200
s3/popt.h: Fix typo.
Karolin
commit 4458809597ff4362a653ea5469c5237bbe2a0531
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:00:47 2009 +0200
s3/loadparm: Fiy typos.
Karolin
commit a103222e0b679d68684681c871ac912f279afc1b
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:47 2009 +0200
s3/gpo_ldap: Fix typo.
Karolin
commit 6343cab3086f5795c8428eddcb966ba8b72d3511
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:14 2009 +0200
s3/smbconf_reg: Fix typo.
Karolin
commit c002c1d776bc62bafe62e29a91e05100c5025890
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:55:45 2009 +0200
s3/docs: Fix typo.
Karolin
---
Summary of changes:
docs-xml/manpages-3/smbcontrol.1.xml |2 +-
lib/popt/popt.h |2 +-
source3/lib/smbconf/smbconf_reg.c|2 +-
source3/libgpo/gpo_ldap.c|2 +-
source3/param/loadparm.c |4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml
b/docs-xml/manpages-3/smbcontrol.1.xml
index f8c31bb..b608244 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -66,7 +66,7 @@
paraThe parameterall/parameter destination causes the
message to broadcast to all running daemons including nmbd and
winbind. This is a change for Samba 3.3, prior to this the
- paramter smbd used to do this./para
+ parameter smbd used to do this./para
paraThe parametersmbd/parameter destination causes the
message to be sent to the smbd daemon specified in the
diff --git a/lib/popt/popt.h b/lib/popt/popt.h
index 08701d7..7b94a98 100644
--- a/lib/popt/popt.h
+++ b/lib/popt/popt.h
@@ -83,7 +83,7 @@
#define POPT_ERROR_NOARG -10 /*! missing argument */
#define POPT_ERROR_BADOPT -11 /*! unknown option */
#define POPT_ERROR_OPTSTOODEEP -13 /*! aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE-15 /*! error in paramter quoting */
+#define POPT_ERROR_BADQUOTE-15 /*! error in parameter quoting */
#define POPT_ERROR_ERRNO -16 /*! errno set, use strerror(errno) */
#define POPT_ERROR_BADNUMBER -17 /*! invalid numeric value */
#define POPT_ERROR_OVERFLOW-18 /*! number too large or too small */
diff --git a/source3/lib/smbconf/smbconf_reg.c
b/source3/lib/smbconf/smbconf_reg.c
index ae6a411..0ecac97 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -193,7 +193,7 @@ static WERROR smbconf_reg_set_value(struct registry_key
*key,
if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
- DEBUG(5, (Global paramter '%s' not allowed in
+ DEBUG(5, (Global parameter '%s' not allowed in
service definition ('%s').\n, canon_valname,
subkeyname));
werr = WERR_INVALID_PARAM;
diff --git a/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c
index 882804b..716b872 100644
--- a/source3/libgpo/gpo_ldap.c
+++ b/source3/libgpo/gpo_ldap.c
@@ -453,7 +453,7 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
}
/
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
/
ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8da1f63..4b14b80 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -885,7 +885,7 @@ static const struct enum_list enum_kerberos_method[] = {
/* Note: We do not initialise the defaults union - it is not allowed in ANSI C
*
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
+ * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
* screen in SWAT. This is used to exclude parameters as well
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3546-g89542c9
The branch, v3-2-test has been updated
via 89542c9dc4fede1547886b480791322f0497f277 (commit)
via a3081c94e64d226328885191212bd1ba46add09e (commit)
via 7038846d514b9ea25d991bc72b807921ab1ee158 (commit)
via 36cb36581208f754b14e2a955fbd886e6c82cfaa (commit)
from d3d4baecb89ddac6d460269e126a60b99f687a5b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 89542c9dc4fede1547886b480791322f0497f277
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:01:27 2009 +0200
s3/popt.h: Fix typo.
This used to be commit 8da2fa36 in master.
Karolin
(cherry picked from commit 3df28fce45ce552df2c0815597fc1808ea08b363)
commit a3081c94e64d226328885191212bd1ba46add09e
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 20:00:47 2009 +0200
s3/loadparm: Fiy typos.
This used to be commit 44588095 in master.
Karolin
(cherry picked from commit 7648c51afaf844e576935dadc0d66a94e2cad28b)
commit 7038846d514b9ea25d991bc72b807921ab1ee158
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:47 2009 +0200
s3/gpo_ldap: Fix typo.
This used to be commit a103222e in master.
Karolin
(cherry picked from commit a33677c8a80925965a4023785fc3a221d2ed9585)
commit 36cb36581208f754b14e2a955fbd886e6c82cfaa
Author: Karolin Seeger ksee...@samba.org
Date: Tue Apr 7 19:58:14 2009 +0200
s3/smbconf_reg: Fix typo.
This used to be commit 6343cab3 in master.
Karolin
(cherry picked from commit 56e877662dd6da64b348803c24e85f60ee6b3d85)
---
Summary of changes:
source/lib/smbconf/smbconf_reg.c |2 +-
source/libgpo/gpo_ldap.c |2 +-
source/param/loadparm.c |4 ++--
source/popt/popt.h |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index dfce750..eb67781 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -265,7 +265,7 @@ static WERROR smbconf_reg_set_value(struct registry_key
*key,
if (!strequal(subkeyname, GLOBAL_NAME)
lp_parameter_is_global(valname))
{
- DEBUG(5, (Global paramter '%s' not allowed in
+ DEBUG(5, (Global parameter '%s' not allowed in
service definition ('%s').\n, canon_valname,
subkeyname));
werr = WERR_INVALID_PARAM;
diff --git a/source/libgpo/gpo_ldap.c b/source/libgpo/gpo_ldap.c
index 477832a..084017d 100644
--- a/source/libgpo/gpo_ldap.c
+++ b/source/libgpo/gpo_ldap.c
@@ -453,7 +453,7 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
}
/
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
/
ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index aa41bf9..3ccb772 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -863,7 +863,7 @@ static const struct enum_list enum_config_backend[] = {
/* Note: We do not initialise the defaults union - it is not allowed in ANSI C
*
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
+ * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
* screen in SWAT. This is used to exclude parameters as well as to squash all
* parameters that have been duplicated by pseudonyms.
*
@@ -872,7 +872,7 @@ static const struct enum_list enum_config_backend[] = {
* Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
*respective views.
*
- * NOTE2: Handling of duplicated (synonym) paramters:
+ * NOTE2: Handling of duplicated (synonym) parameters:
* Only the first occurance of a parameter should be enabled by FLAG_BASIC
* and/or FLAG_ADVANCED. All duplicates following the first mention should
be
* set to FLAG_HIDE. ie: Make you must place the parameter that has the
preferred
diff --git a/source/popt/popt.h b/source/popt/popt.h
index 08701d7..7b94a98 100644
--- a/source/popt/popt.h
+++ b/source/popt/popt.h
@@ -83,7 +83,7 @@
#define POPT_ERROR_NOARG -10 /*! missing argument */
#define POPT_ERROR_BADOPT -11 /*! unknown option */
#define POPT_ERROR_OPTSTOODEEP -13 /*! aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE-15 /*! error in paramter quoting */
+#define POPT_ERROR_BADQUOTE-15 /*! error in parameter quoting */
#define POPT_ERROR_ERRNO -16 /*! errno set, use strerror(errno) */
#define
[SCM] CTDB repository - branch master updated - ctdb-1.0.78-8-gb8be5b0
The branch, master has been updated
via b8be5b06c3359d037db336dc12d38e0018349951 (commit)
from 13e2c9044950f21918e4610726e73ed3d8f76920 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit b8be5b06c3359d037db336dc12d38e0018349951
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 08:48:55 2009 +1000
install /etc/ctdb/notify.sh as executable.
this addresses bug 6250
---
Summary of changes:
Makefile.in |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index b67818f..f1c596d 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,7 +223,7 @@ install: all
if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1
$(DESTDIR)$(mandir)/man1; fi
if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1
$(DESTDIR)$(mandir)/man1; fi
if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1
$(DESTDIR)$(mandir)/man1; fi
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m
644 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
+ if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m
755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
test: all
tests/run_tests.sh
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-904-g6859b80
The branch, master has been updated
via 6859b805e84af91eca641ec1b91b844cbdab4065 (commit)
from c5b24d65cdb1b32196681499dcaf23ea70e1019b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6859b805e84af91eca641ec1b91b844cbdab4065
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 18:05:17 2009 +1100
s3:lib Use push_ucs2_talloc() in ms_fnmatch()
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/lib/ms_fnmatch.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c
index ca53446..1eac9fa 100644
--- a/source3/lib/ms_fnmatch.c
+++ b/source3/lib/ms_fnmatch.c
@@ -170,12 +170,12 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
}
}
- if (!push_ucs2_allocate(p, pattern, converted_size)) {
+ if (!push_ucs2_talloc(talloc_tos(), p, pattern, converted_size)) {
return -1;
}
- if (!push_ucs2_allocate(s, string, converted_size)) {
- SAFE_FREE(p);
+ if (!push_ucs2_talloc(talloc_tos(), s, string, converted_size)) {
+ TALLOC_FREE(p);
return -1;
}
@@ -214,8 +214,8 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
else {
max_n = SMB_CALLOC_ARRAY(struct max_n, count);
if (!max_n) {
- SAFE_FREE(p);
- SAFE_FREE(s);
+ TALLOC_FREE(p);
+ TALLOC_FREE(s);
return -1;
}
max_n_free = max_n;
@@ -225,8 +225,8 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')),
is_case_sensitive);
SAFE_FREE(max_n_free);
- SAFE_FREE(p);
- SAFE_FREE(s);
+ TALLOC_FREE(p);
+ TALLOC_FREE(s);
return ret;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-681-ge27c0d6
The branch, v3-4-test has been updated
via e27c0d668bd93f7d64a2fe0c6aef6edc63af64d4 (commit)
from 3db2ef0394a3fdb11c8a54777360cbcdb94c87da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit e27c0d668bd93f7d64a2fe0c6aef6edc63af64d4
Author: Andrew Bartlett abart...@samba.org
Date: Wed Mar 18 18:05:17 2009 +1100
s3:lib Use push_ucs2_talloc() in ms_fnmatch()
Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 6859b805e84af91eca641ec1b91b844cbdab4065)
---
Summary of changes:
source3/lib/ms_fnmatch.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c
index ca53446..1eac9fa 100644
--- a/source3/lib/ms_fnmatch.c
+++ b/source3/lib/ms_fnmatch.c
@@ -170,12 +170,12 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
}
}
- if (!push_ucs2_allocate(p, pattern, converted_size)) {
+ if (!push_ucs2_talloc(talloc_tos(), p, pattern, converted_size)) {
return -1;
}
- if (!push_ucs2_allocate(s, string, converted_size)) {
- SAFE_FREE(p);
+ if (!push_ucs2_talloc(talloc_tos(), s, string, converted_size)) {
+ TALLOC_FREE(p);
return -1;
}
@@ -214,8 +214,8 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
else {
max_n = SMB_CALLOC_ARRAY(struct max_n, count);
if (!max_n) {
- SAFE_FREE(p);
- SAFE_FREE(s);
+ TALLOC_FREE(p);
+ TALLOC_FREE(s);
return -1;
}
max_n_free = max_n;
@@ -225,8 +225,8 @@ int ms_fnmatch(const char *pattern, const char *string,
bool translate_pattern,
ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')),
is_case_sensitive);
SAFE_FREE(max_n_free);
- SAFE_FREE(p);
- SAFE_FREE(s);
+ TALLOC_FREE(p);
+ TALLOC_FREE(s);
return ret;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-905-gb36fab0
The branch, master has been updated
via b36fab0491a7f73ac9dffea6397167c5bdd82a2a (commit)
from 6859b805e84af91eca641ec1b91b844cbdab4065 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b36fab0491a7f73ac9dffea6397167c5bdd82a2a
Author: Günther Deschner g...@samba.org
Date: Wed Apr 8 01:52:28 2009 +0200
s3-svcctl: no need to define SVCCTL_NUM_INTERNAL_SERVICES twice in a file.
Guenther
---
Summary of changes:
source3/rpc_server/srv_svcctl_nt.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_svcctl_nt.c
b/source3/rpc_server/srv_svcctl_nt.c
index 848cdc2..6aafd5a 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -32,8 +32,6 @@ struct service_control_op {
SERVICE_CONTROL_OPS *ops;
};
-#define SVCCTL_NUM_INTERNAL_SERVICES 4
-
/* handle external services */
extern SERVICE_CONTROL_OPS rcinit_svc_ops;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-682-g7109bb4
The branch, v3-4-test has been updated
via 7109bb4fc38d9fa798e3bdd5e55b7825e10ceda8 (commit)
from e27c0d668bd93f7d64a2fe0c6aef6edc63af64d4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7109bb4fc38d9fa798e3bdd5e55b7825e10ceda8
Author: Günther Deschner g...@samba.org
Date: Wed Apr 8 01:52:28 2009 +0200
s3-svcctl: no need to define SVCCTL_NUM_INTERNAL_SERVICES twice in a file.
Guenther
(cherry picked from commit b36fab0491a7f73ac9dffea6397167c5bdd82a2a)
---
Summary of changes:
source3/rpc_server/srv_svcctl_nt.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_svcctl_nt.c
b/source3/rpc_server/srv_svcctl_nt.c
index 848cdc2..6aafd5a 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -32,8 +32,6 @@ struct service_control_op {
SERVICE_CONTROL_OPS *ops;
};
-#define SVCCTL_NUM_INTERNAL_SERVICES 4
-
/* handle external services */
extern SERVICE_CONTROL_OPS rcinit_svc_ops;
--
Samba Shared Repository
Build status as of Wed Apr 8 00:00:01 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-04-07 00:01:05.0 + +++ /home/build/master/cache/broken_results.txt 2009-04-08 00:00:32.0 + @@ -1,21 +1,21 @@ -Build status as of Tue Apr 7 00:00:02 2009 +Build status as of Wed Apr 8 00:00:01 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 30 6 0 +ccache 31 6 0 distcc 0 0 0 ldb 31 31 0 -libreplace 31 13 0 +libreplace 30 13 0 lorikeet 0 0 0 pidl 21 3 0 ppp 13 0 0 -rsync31 11 0 +rsync31 13 0 samba-docs 0 0 0 samba-web0 0 0 samba_3_current 29 20 0 -samba_3_master 29 25 0 -samba_4_0_test 31 30 4 +samba_3_master 30 25 1 +samba_4_0_test 31 30 1 talloc 31 31 0 tdb 29 10 0
[SCM] CTDB repository - branch master updated - ctdb-1.0.78-12-ga9f851c
The branch, master has been updated
via a9f851caec2525ccbb3a6d6283eaef52b89a4eb2 (commit)
via 1b47ddc97373376b416a50939b74dc8c926fc917 (commit)
via 7c4389cc0baa43a0ffa9fb08944c253db7885807 (commit)
via b0718551f55d5da9be0e6aba233f57c1ff8509be (commit)
from b8be5b06c3359d037db336dc12d38e0018349951 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit a9f851caec2525ccbb3a6d6283eaef52b89a4eb2
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 10:45:00 2009 +1000
set libdir to ../lib64 on x86-64 platforms
commit 1b47ddc97373376b416a50939b74dc8c926fc917
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 09:34:20 2009 +1000
install ctdb.pc from the RPM
commit 7c4389cc0baa43a0ffa9fb08944c253db7885807
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 09:21:11 2009 +1000
From Mathieu Parent math.par...@gmail.com
Install the pkgconfig file
commit b0718551f55d5da9be0e6aba233f57c1ff8509be
Author: Mathieu Parent math.par...@gmail.com
Date: Wed Apr 8 09:14:20 2009 +1000
---
Summary of changes:
.gitignore |1 +
Makefile.in |4 +++-
autogen.sh |2 +-
configure.ac| 11 ++-
ctdb.pc.in | 19 +++
packaging/RPM/ctdb.spec |1 +
6 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 ctdb.pc.in
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 826bc1a..69d8093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*~
config.status
configure
+ctdb.pc
publish*.sh
push*.sh
web/packages
diff --git a/Makefile.in b/Makefile.in
index f1c596d..f1c5f36 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,12 +188,14 @@ distclean: clean
rm -f Makefile
install: all
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
mkdir -p $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(sbindir)
mkdir -p $(DESTDIR)$(includedir)
mkdir -p $(DESTDIR)$(etcdir)/ctdb
mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d
mkdir -p $(DESTDIR)$(docdir)/ctdb
+ ${INSTALLCMD} -m 644 ctdb.pc $(DESTDIR)$(libdir)/pkgconfig
${INSTALLCMD} -m 755 bin/ctdb $(DESTDIR)$(bindir)
${INSTALLCMD} -m 755 bin/ctdb_ipmux $(DESTDIR)$(bindir)
${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
@@ -233,4 +235,4 @@ valgrindtest: all
realdistclean: distclean
- rm -f configure config.h.in
+ rm -f configure config.h.in ctdb.pc
diff --git a/autogen.sh b/autogen.sh
index a361cd1..e333898 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh
rm -rf autom4te.cache
-rm -f configure config.h.in
+rm -f configure config.h.in ctdb.pc
IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace
IPATHS=$IPATHS -I lib/talloc -I talloc -I ../talloc
diff --git a/configure.ac b/configure.ac
index 8b6102d..a7bd2bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,15 @@ AC_DEFUN([SMB_ENABLE], [echo -n ])
AC_INIT(ctdb.h)
AC_CONFIG_SRCDIR([server/ctdbd.c])
+case `uname -m` in
+ x86_64)
+libdir='${exec_prefix}/lib64'
+;;
+ *)
+libdir='${exec_prefix}/lib'
+;;
+esac
+
case `uname` in
Linux*)
CTDB_SYSTEM_OBJ=common/system_linux.o
@@ -84,4 +93,4 @@ AC_SUBST(CTDB_SYSTEM_OBJ)
AC_SUBST(CTDB_SCSI_IO)
AC_SUBST(CTDB_PCAP_LDFLAGS)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile ctdb.pc)
diff --git a/ctdb.pc.in b/ctdb.pc.in
new file mode 100644
index 000..5f5bfab
--- /dev/null
+++ b/ctdb.pc.in
@@ -0,0 +1,19 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+datarootd...@datarootdir@
+included...@includedir@
+libd...@libdir@
+bind...@bindir@
+sbind...@sbindir@
+mand...@mandir@
+localstated...@localstatedir@
+srcd...@srcdir@
+etcd...@sysconfdir@
+
+Name: ctdb
+Description: A clustered database to store temporary data
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir}
+Cflags: -I${includedir}
+URL: http://ctdb.samba.org/
+
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 7422150..3bedcc6 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -128,6 +128,7 @@ fi
%{_mandir}/man1/onnode.1.gz
%{_includedir}/ctdb.h
%{_includedir}/ctdb_private.h
+%{_libdir}/pkgconfig/ctdb.pc
%changelog
* Tue Mar 31 2009 : Version 1.0.78
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.78-14-g6c900aa
The branch, master has been updated
via 6c900aa343096c5e1e297e055c36832ffa5028dd (commit)
via feab5f30b2d6cebf4dd28abc5a81f93424a4c852 (commit)
from a9f851caec2525ccbb3a6d6283eaef52b89a4eb2 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 6c900aa343096c5e1e297e055c36832ffa5028dd
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 12:56:52 2009 +1000
new version 1.0.79
commit feab5f30b2d6cebf4dd28abc5a81f93424a4c852
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Apr 8 12:49:28 2009 +1000
create a function remote_ip which can be used from scripts to remove a
single ip from an interface.
use this fucntion from the natgw eventscript
---
Summary of changes:
config/events.d/11.natgw |7 ---
config/functions | 25 +
packaging/RPM/ctdb.spec | 10 +-
3 files changed, 38 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index 2d256ba..1e0543d 100644
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -14,16 +14,17 @@ cmd=$1
shift
PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+
delete_all() {
- ip addr add $NATGW_PUBLIC_IP dev $NATGW_PUBLIC_IFACE /dev/null
2/dev/null
- ip addr del $NATGW_PUBLIC_IP_HOST dev $NATGW_PRIVATE_IFACE /dev/null
2/dev/null
+ remove_ip $NATGW_PUBLIC_IP $NATGW_PUBLIC_IFACE
+ remove_ip $NATGW_PUBLIC_IP_HOST $NATGW_PRIVATE_IFACE
+
ip route del 0.0.0.0/0 metric 10 /dev/null 2/dev/null
# Delete the masquerading setup from a previous iteration where we
# were the NAT-GW
iptables -D POSTROUTING -t nat -s $NATGW_PRIVATE_NETWORK -d !
$NATGW_PRIVATE_NETWORK -j MASQUERADE /dev/null 2/dev/null
- ip addr del $NATGW_PUBLIC_IP dev $NATGW_PUBLIC_IFACE /dev/null
2/dev/null
}
case $cmd in
diff --git a/config/functions b/config/functions
index 2f0b01f..8b29fe4 100644
--- a/config/functions
+++ b/config/functions
@@ -438,6 +438,30 @@ startstop_nfslock() {
}
+# remove an ip address from an interface
+
+remove_ip() {
+ # the ip tool will delete all secondary IPs if this is the primary.
+ # To work around this _very_ annoying behaviour we have to keep a
+ # record of the secondaries and re-add them afterwards. yuck
+ secondaries=
+ if ip addr list dev $2 primary | grep -q inet $1 ; then
+ secondaries=`ip addr list dev $2 secondary | grep inet | awk
'{print $2}'`
+ fi
+ ip addr del $1 dev $2 /dev/null 2/dev/null || failed=1
+ [ -z $secondaries ] || {
+ for i in $secondaries; do
+ if ip addr list dev $2 | grep -q inet $i ; then
+ echo kept secondary $i on dev $2
+ else
+ echo re-adding secondary address $i to dev $2
+ ip addr add $i dev $2 || failed=1
+ fi
+ done
+ }
+}
+
+
# load a site local config file
@@ -445,3 +469,4 @@ startstop_nfslock() {
. $CTDB_BASE/rc.local
}
+
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 3bedcc6..77bb0ba 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Name: ctdb
-Version: 1.0.78
+Version: 1.0.79
Release: 1
Epoch: 0
License: GNU GPL version 3
@@ -131,6 +131,14 @@ fi
%{_libdir}/pkgconfig/ctdb.pc
%changelog
+* Wed Apr 8 2009 : Version 1.0.79
+ - From Mathieu Parent: add a ctdb pkgconfig file
+ - Fix bug 6250
+ - add a funciton remove_ip to safely remove an ip from an interface, taking
care to workaround an issue with linux alias interfaces.
+ - Update the natgw eventscript to use the safe remove_ip() function
+ - fix a bug in the eventscript child process that would cause the socket to
be removed.
+ - dont verify nodemap on banned nodes during cluster monitoring
+ - Update the dodgy SeqnumInterval to have ms resolution
* Tue Mar 31 2009 : Version 1.0.78
- Add a notify mechanism so we can send snmptraps/email to external
management systems when the node becomes unhealthy
- include 11.natgw eventscript in thew install so that the NATGW feature works
--
CTDB repository
