Re: [Samba] Different IPs on a samba server #2
On Fri, 17 Oct 2008 [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] wrote: are you running wins server = yes and msdfs root = yes on the samba server? network is not found. If I type in \\samba_ipaddress\share then it gives me a logon prompt, but it will never authenticate, it just keeps asking for the password like I typed the wrong one. Both of these work fine from the 10.0. network. It occurred also to me, with a 100% win2000 (PDC and WS) network: wins is based on broadcasts. so these does not passed the routers, and yes, they need some time to propagate, even 4 or more hours ! the way i resolved was this: first open a share on the PDC, calling it with the IP. This will of course authenticate since it must know who is the PDC and has not to resort on any NS resolution. Then log on the other server. Question: Because it reverses the logical flow of conversation. Answer: Why is putting a reply at the top of the message frowned upon? since you have no idea on what part of the message you are replying to. of course is a worse idea to quote the entire message, either top or bottom. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba4/Win2008: error - directory property cannot be found in the cache
I setup a samba4 pdc and successfully added a Windows 2008 machine to the domain. When I start up the Active Directory Users and Computers tool, I get a Naming information cannot be located because: directory property cannot be found in the cache error. I'm running a pretty up to date version of samba4. The head commit is: commit 044bb5ce391e0b271d5dee87dd05bbedd6bcdadc Author: Günther Deschner [EMAIL PROTECTED] Date: Sun Oct 19 00:26:16 2008 +0200 I set my log level to 10 in smb.conf, and get the output shown below. Any ideas on what's going wrong? I thing else I can do to help troubleshoot the problem? I have a wireshark capture as well, but wasn't sure if it would be safe to post. jr Registered NVIZN1b with 10.0.0.1 on interface 10.0.0.255 Registered NVIZN1c with 10.0.0.1 on interface 10.0.0.255 Registered NVIZN00 with 10.0.0.1 on interface 10.0.0.255 Received cldap packet of length 156 from 10.0.0.2:55695 cldap netlogon query domain=nvizn.com host=FRODO user=(null) version=536870934 guid=0020fc69-5a37-46af-8279-7462bed3d8e9 added interface ip=10.0.0.1 nmask=255.255.255.0 gendb_search_v: cn=Primary Domains ((flatname=NVIZN)(objectclass=primaryDomain)) - 1 Security token of user S-1-5-7 SIDs (4): SID[ 0]: S-1-5-7 SID[ 1]: S-1-5-32-546 SID[ 2]: S-1-1-0 SID[ 3]: S-1-5-2 Privileges (0x 0): gendb_search_v: (objectclass=ldapSecret) - 0 (normal if no LDAP backend required) Could not find entry to match filter: '(objectclass=ldapSecret)' base: '(null)' ldb: naming_fsmo_init: we are master: yes ldb: pdc_fsmo_init: we are master: yes SearchRequest basedn: filter: (objectclass=*) SearchRequest: basedn: [] SearchRequest: filter: [(objectclass=*)] SearchRequest: scope: [BASE] SearchRequest: attrs: [subschemaSubentry] SearchRequest: attrs: [dsServiceName] SearchRequest: attrs: [namingContexts] SearchRequest: attrs: [defaultNamingContext] SearchRequest: attrs: [schemaNamingContext] SearchRequest: attrs: [configurationNamingContext] SearchRequest: attrs: [rootDomainNamingContext] SearchRequest: attrs: [supportedControl] SearchRequest: attrs: [supportedLDAPVersion] SearchRequest: attrs: [supportedLDAPPolicies] SearchRequest: attrs: [supportedSASLMechanisms] SearchRequest: attrs: [dnsHostName] SearchRequest: attrs: [ldapServiceName] SearchRequest: attrs: [serverName] SearchRequest: attrs: [supportedCapabilities] ldb_request BASE dn= filter=(objectclass=*) SearchRequest: results: [1] Received cldap packet of length 156 from 10.0.0.2:55999 cldap netlogon query domain=NVIZN.COM host=FRODO user=(null) version=536870934 guid=0020fc69-5a37-46af-8279-7462bed3d8e9 added interface ip=10.0.0.1 nmask=255.255.255.0 Received KDC packet of length 1522 from 10.0.0.2:50044 Kerberos: TGS-REQ [EMAIL PROTECTED] from 10.0.0.2 for ldap/gandalf.nvizn.com/[EMAIL PROTECTED] [renewable, forwardable] gendb_search_v: DC=nvizn,DC=com NULL - 1 gendb_search_v: CN=GANDALF,OU=Domain Controllers,DC=nvizn,DC=com NULL - 1 gendb_search_v: CN=Partitions,CN=Configuration,DC=nvizn,DC=com ncName=DC=nvizn,DC=com - 1 gendb_search_v: DC=nvizn,DC=com NULL - 1 gendb_search_v: CN=Partitions,CN=Configuration,DC=nvizn,DC=com (ncName=DC=nvizn,DC=com) - 1 gendb_search_v: CN=Administrator,CN=Users,DC=nvizn,DC=com NULL - 1 Kerberos: TGS-REQ authtime: 2008-10-19T14:36:44 starttime: 2008-10-19T14:41:56 endtime: 2037-09-12T22:48:05 renew till: unset Terminating connection - 'NT_STATUS_END_OF_FILE' Terminating connection - 'NT_STATUS_END_OF_FILE' single_terminate: reason[NT_STATUS_END_OF_FILE] BindSASL dn: Starting GENSEC mechanism spnego Starting GENSEC submechanism gssapi_krb5 gensec_gssapi: NO credentials were delegated GSSAPI Connection will be cryptographicly sealed gendb_search_v: (objectclass=ldapSecret) - 0 (normal if no LDAP backend required) Could not find entry to match filter: '(objectclass=ldapSecret)' base: '(null)' ldb: naming_fsmo_init: we are master: yes ldb: pdc_fsmo_init: we are master: yes gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\F4\01\00\00 - 1 gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\01\02\00\00 - 1 gendb_search_v: NULL objectSid=\01\01\00\00\00\00\00\01\00\00\00\00 - 1 gendb_search_v: NULL objectSid=\01\01\00\00\00\00\00\05\02\00\00\00 - 1 gendb_search_v: NULL objectSid=\01\01\00\00\00\00\00\05\0B\00\00\00 - 1 gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\06\02\00\00 - 1 gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\07\02\00\00 - 1 gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\00\02\00\00 - 1 gendb_search_v: NULL objectSid=\01\05\00\00\00\00\00\05\15\00\00\00\B1\CE\E2\C1u\8Dip\B3\F1Y\07\08\02\00\00 - 1 gendb_search_v: NULL objectSid=\01\02\00\00\00\00\00\05\20\00\00\00\20\02\00\00 - 1 Security token of user
[Samba] usrmgr force password change for new user
Im using 3.2.4 with an LDAP backend, When i want to change a users password and force them to change it on next logon i cant do it in 1 step in the same dialog, The password gets changed 1st time around but the user isnt forced to change their password. I have to go into the users settings again and tick the box, then it takes affect. Anyone got any idea how to make it work in one fowl swoop? Thanks. David Markey -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Account locking out not working[LDAP backend]
Hi I cannot get account locking out to work. -bash-3.00# pdbedit -P bad lockout attempt smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened account policy bad lockout attempt description: Lockout users after bad logon attempts (default: 0 = off) account policy bad lockout attempt value is: 5 Obviously its set to 5. -bash-3.00# pdbedit -P lockout duration smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened account policy lockout duration description: Lockout duration in minutes (default: 30, -1 = forever) account policy lockout duration value is: 4294967295 And lockout duration of forever so here we go: smbldap_open_connection: connection opened init_sam_from_ldap: Entry found for user: test.user1 Unix username:test.user1 NT username: test.user1 Account Flags:[U ] User SID: S-1-5-21-933094658-698143331-34306911-1041 init_group_from_ldap: Entry found for group: 513 init_group_from_ldap: Entry found for group: 513 Primary Group SID:S-1-5-21-933094658-698143331-34306911-513 Full Name:test.user1 Home Directory: \\samba\test.user1 HomeDir Drive:U: Logon Script: logon.bat Profile Path: Domain: CSR Account desc: Workstations: Munged dial: Logon time: 0 Logoff time: never Kickoff time: 0 Password last set:Wed, 15 Oct 2008 13:05:54 WEST Password can change: Wed, 15 Oct 2008 13:05:54 WEST Password must change: Sun, 14 Dec 2008 12:05:54 WET Last bad password : 0 Bad password count : 0 Logon hours : FF And attempt to log in 8 times: -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: Could not connect to server 127.0.0.1 The username or password was not correct. Connection failed: NT_STATUS_LOGON_FAILURE -bash-3.00# net --user=test.user1 user Enter test.user1's password: root nobody test.user1 -bash-3.00# pdbedit -v test.user1 smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened smbldap_search_domain_info: Searching for:[((objectClass=sambaDomain)(sambaDomainName=CSR))] smbldap_open_connection: connection opened init_sam_from_ldap: Entry found for user: test.user1 Unix username:test.user1 NT username: test.user1 Account Flags:[U ] User SID: S-1-5-21-933094658-698143331-34306911-1041 init_group_from_ldap: Entry found for group: 513 init_group_from_ldap: Entry found for group: 513 Primary Group SID:S-1-5-21-933094658-698143331-34306911-513 Full Name:test.user1 Home Directory: \\samba\test.user1 HomeDir Drive:U: Logon Script: logon.bat Profile Path: Domain: CSR Account desc: Workstations: Munged dial: Logon time: 0 Logoff time: never Kickoff time: 0 Password last set:Wed, 15 Oct 2008 13:05:54 WEST Password can change: Wed, 15 Oct 2008 13:05:54 WEST Password must change: Sun, 14 Dec 2008 12:05:54 WET Last bad password : 0 Bad password count : 0 Logon hours : FF So locking out isnt working, Is this a bug or have i missed something obvious? Any help appreciated. Samba 3.2.4 on solaris 10, ldap backend. Thanks, David. -- To unsubscribe from this list go to the following URL and read the
[Samba] Question about switching from Windows 2k Server to SAMBA 3 under Centos
Greetings List, I'll begin by outlining what it is that I have to do. First, I have a windows 2k server that is currently on its last legs. It holds a list of users, groups and shares that are still required after the migration to a Linux based server. I've heard of a command called 'vampire' that extracts the required users and groups, though as of yet have been unsuccessful in getting this to work. I've also setup an OpenLDAP server with LDAP Account Manager and can input data manually, though for some weird reason, vampire just doesn't want to work. My questions are: 1) What is required for the smb.conf to get it talking to the windows 2k server? 2) What other environment configuration is required to get vampire to work correctly? Thanks, Matthew Delves -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Vista Samba 4
On Wed, 2008-10-15 at 15:14 +0200, mustafa evelioglu wrote: three simple question. 1) It is possible to migrate Vista in NT-Samba with NTLMv2? Sorry, I don't quite understand your question: What are you migrating? Samba fully supports NTLMv2 in all Samba3 and Samba4 version. 2) Does Vista join in Samba4 AD Domain. Especially can Vista-Client gets Keberos TGT and PAC from Samba4-KDC? Yes, Samba4 supports Vista as a domain member, and the PAC etc work correctly. Use the current GIT tree for best support. 3) When Samba4 is configured with an TDB-Backend. Does LDB-API provide LDAP services for Linux. Especially libnss.so services ? The aim at this stage is for Linux clients to run winbind (from Samba3 or Samb4, but the Samba4 winbind is not yet complete) against Samba4 domains. I'll shortly begin working on the issues preventing Samba3's winbind from fully operating in Samba4 domains. Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] one ldap server and multiple samba PDC domains
hello Is it possible to have multiple samba servers so multiple samba PDC domains but just one ldap server ? (so users in ldap can login to diffrent domains but we add them just one time) if yes how? thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch master updated - 5380d43d3bc84f431d491c40ad37920973870e4e
The branch, master has been updated via 5380d43d3bc84f431d491c40ad37920973870e4e (commit) from 044bb5ce391e0b271d5dee87dd05bbedd6bcdadc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5380d43d3bc84f431d491c40ad37920973870e4e Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 19 09:47:45 2008 +0200 Remove duplicate macro definitions (already defined in libutil/attr.h) --- Summary of changes: source3/include/includes.h | 17 - 1 files changed, 0 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 2ba6c44..760280e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -71,23 +71,6 @@ #undef HAVE_TERMIOS_H #endif -#ifndef _PUBLIC_ -#ifdef HAVE_VISIBILITY_ATTR -# define _PUBLIC_ __attribute__((visibility(default))) -#else -# define _PUBLIC_ -#endif -#endif - -#if defined(__GNUC__) !defined(__cplusplus) -/** gcc attribute used on function parameters so that it does not emit - * warnings about them being unused. **/ -# define UNUSED(param) param __attribute__ ((unused)) -#else -# define UNUSED(param) param -/** Feel free to add definitions for other compilers here. */ -#endif - #ifdef RELIANTUNIX /* * unistd.h has to be included before any other to get -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3
The branch, master has been updated
via b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3 (commit)
via 07426353554cb883b566a3c27edbbf8e8ac39399 (commit)
from 5380d43d3bc84f431d491c40ad37920973870e4e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 09:53:18 2008 +0200
Remove defines for QSORT_CAST, already provided by libreplace.
commit 07426353554cb883b566a3c27edbbf8e8ac39399
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 09:51:26 2008 +0200
Simplify SIG_ATOMIC_T define, since sig_atomic_t is always provided by
libreplace.
---
Summary of changes:
source3/include/includes.h | 14 ++
1 files changed, 2 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 760280e..ac5b2b2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -271,12 +271,10 @@ typedef int ber_int_t;
/*
* Define additional missing types
*/
-#if defined(HAVE_SIG_ATOMIC_T_TYPE) defined(AIX)
+#if defined(AIX)
typedef sig_atomic_t SIG_ATOMIC_T;
-#elif defined(HAVE_SIG_ATOMIC_T_TYPE) !defined(AIX)
-typedef sig_atomic_t volatile SIG_ATOMIC_T;
#else
-typedef int volatile SIG_ATOMIC_T;
+typedef sig_atomic_t volatile SIG_ATOMIC_T;
#endif
#ifndef uchar
@@ -766,14 +764,6 @@ enum flush_reason_enum {
/* prototypes from lib/util_transfer_file.c */
#include transfer_file.h
-#ifdef __COMPAR_FN_T
-#define QSORT_CAST (__compar_fn_t)
-#endif
-
-#ifndef QSORT_CAST
-#define QSORT_CAST (int (*)(const void *, const void *))
-#endif
-
#ifndef DEFAULT_PRINTING
#ifdef HAVE_CUPS
#define DEFAULT_PRINTING PRINT_CUPS
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74
The branch, master has been updated
via 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74 (commit)
via 7275952568bbf003299d895b71b246f75851db93 (commit)
from b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 10:16:21 2008 +0200
Make generate_random_buffer signature match that of lib/util.
commit 7275952568bbf003299d895b71b246f75851db93
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 10:05:48 2008 +0200
Add TALLOC_CTX pointer to generate_random_str(), for consistency with
Samba 4.
---
Summary of changes:
source3/include/proto.h | 10 ++
source3/lib/genrand.c| 10 +++---
source3/libads/util.c|2 +-
source3/libnet/libnet_join.c |2 +-
source3/libsmb/trusts_util.c |5 ++---
source3/utils/net_rpc_join.c | 10 +++---
6 files changed, 12 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ba84574..156e66d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -577,8 +577,8 @@ void gencache_unlock_entry( const char *key );
void set_rand_reseed_callback(void (*fn)(int *));
void set_need_random_reseed(void);
-void generate_random_buffer( unsigned char *out, int len);
-char *generate_random_str(size_t len);
+void generate_random_buffer(uint8_t *out, int len);
+char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
/* The following definitions come from lib/iconv.c */
@@ -770,12 +770,6 @@ int sys_select_intr(int maxfd, fd_set *readfds, fd_set
*writefds, fd_set *errorf
/* The following definitions come from lib/sendfile.c */
ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T
offset, size_t count);
/* The following definitions come from lib/server_mutex.c */
diff --git a/source3/lib/genrand.c b/source3/lib/genrand.c
index 57314c5..076a2fd 100644
--- a/source3/lib/genrand.c
+++ b/source3/lib/genrand.c
@@ -156,7 +156,7 @@ static int do_reseed(bool use_fd, int fd)
Interface to the (hopefully) good crypto random number generator.
/
-void generate_random_buffer( unsigned char *out, int len)
+void generate_random_buffer(uint8_t *out, int len)
{
static int urand_fd = -1;
unsigned char md4_buf[64];
@@ -205,15 +205,11 @@ void generate_random_buffer( unsigned char *out, int len)
static char c_list[] =
ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+_-#.,;
-char *generate_random_str(size_t len)
+char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len)
{
- static unsigned char retstr[256];
+ unsigned char *retstr = talloc_zero_array(mem_ctx, unsigned char, len);
size_t i;
- memset(retstr, '\0', sizeof(retstr));
-
- if (len sizeof(retstr)-1)
- len = sizeof(retstr) -1;
generate_random_buffer( retstr, len);
for (i = 0; i len; i++)
retstr[i] = c_list[ retstr[i] % (sizeof(c_list)-1) ];
diff --git a/source3/libads/util.c b/source3/libads/util.c
index d23c36f..9866a15 100644
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -33,7 +33,7 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads,
char *host_princip
return ADS_ERROR_SYSTEM(ENOENT);
}
- new_password =
generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
+ new_password = generate_random_str(talloc_tos(),
DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
ret = kerberos_set_password(ads-auth.kdc_server, host_principal,
password, host_principal, new_password, ads-auth.time_offset);
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index ab8af0b..6935e00 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -775,7 +775,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
ZERO_STRUCT(user_pol);
if (!r-in.machine_password) {
- r-in.machine_password =
[SCM] Samba Shared Repository - branch master updated - 694a579cb8d418a4feb441a77c0dc000023f2c6e
The branch, master has been updated via 694a579cb8d418a4feb441a77c0dc23f2c6e (commit) via 0fd0fc75c46b39a611c7f9a56081105714d73e36 (commit) via 69d38a95c29498c0266cb98b911faa3e7240c787 (commit) via 182a0e349082fd43ec410cd6ac512376748fa27d (commit) from 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 694a579cb8d418a4feb441a77c0dc23f2c6e Merge: 2fc058bdb0dd7d6ed2ffb17f049a677709d8be74 0fd0fc75c46b39a611c7f9a56081105714d73e36 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 19 10:20:37 2008 +0200 Merge branch 'selftest' of git://git.samba.org/jelmer/samba commit 0fd0fc75c46b39a611c7f9a56081105714d73e36 Merge: 69d38a95c29498c0266cb98b911faa3e7240c787 47f7ef8f39ba482a7d6578ab82c9e0670381c4f8 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sat Oct 11 03:12:21 2008 +0200 Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest Conflicts: selftest/selftest.pl commit 69d38a95c29498c0266cb98b911faa3e7240c787 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Thu Sep 18 19:53:05 2008 +0200 keep obsolete file in samba4 source directory. commit 182a0e349082fd43ec410cd6ac512376748fa27d Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Thu Sep 18 19:51:03 2008 +0200 Move selftest code to top-level. --- Summary of changes: selftest/README | 119 selftest/SocketWrapper.pm | 66 +++ selftest/Subunit.pm | 97 selftest/TODO |2 + selftest/output/buildfarm.pm| 120 selftest/output/html.pm | 354 selftest/output/plain.pm| 212 +++ selftest/output/testresults.css | 129 + selftest/selftest.pl| 871 selftest/target/Kvm.pm | 167 ++ selftest/target/Samba3.pm | 434 ++ selftest/target/Samba4.pm | 956 +++ selftest/target/Windows.pm | 40 ++ selftest/test_samba4.pl | 20 + selftest/test_subunit.pl|7 + source4/Makefile|4 +- source4/samba4-knownfail| 52 -- source4/samba4-quick| 38 -- source4/samba4-skip | 61 -- source4/samba4-slow |7 - source4/selftest/README | 119 source4/selftest/SocketWrapper.pm | 66 --- source4/selftest/Subunit.pm | 97 source4/selftest/TODO |2 - source4/selftest/config.mk |6 +- source4/selftest/knownfail | 52 ++ source4/selftest/output/buildfarm.pm| 120 source4/selftest/output/html.pm | 354 source4/selftest/output/plain.pm| 212 --- source4/selftest/output/testresults.css | 129 - source4/selftest/quick | 38 ++ source4/selftest/samba4_tests.sh| 396 - source4/selftest/selftest.pl| 871 source4/selftest/skip | 61 ++ source4/selftest/slow |7 + source4/selftest/target/Kvm.pm | 167 -- source4/selftest/target/Samba3.pm | 434 -- source4/selftest/target/Samba4.pm | 956 --- source4/selftest/target/Windows.pm | 40 -- source4/selftest/test_samba4.pl | 20 - source4/selftest/test_subunit.pl|7 - source4/selftest/tests.sh | 394 + 42 files changed, 4151 insertions(+), 4153 deletions(-) create mode 100644 selftest/README create mode 100644 selftest/SocketWrapper.pm create mode 100644 selftest/Subunit.pm create mode 100644 selftest/TODO create mode 100644 selftest/output/buildfarm.pm create mode 100644 selftest/output/html.pm create mode 100644 selftest/output/plain.pm create mode 100644 selftest/output/testresults.css create mode 100755 selftest/selftest.pl create mode 100644 selftest/target/Kvm.pm create mode 100644 selftest/target/Samba3.pm create mode 100644 selftest/target/Samba4.pm create mode 100644 selftest/target/Windows.pm create mode 100755 selftest/test_samba4.pl create mode 100755 selftest/test_subunit.pl delete mode 100644 source4/samba4-knownfail delete mode 100644 source4/samba4-quick delete mode 100644 source4/samba4-skip delete mode 100644 source4/samba4-slow delete mode 100644 source4/selftest/README delete mode 100644 source4/selftest/SocketWrapper.pm delete mode 100644 source4/selftest/Subunit.pm delete mode 100644 source4/selftest/TODO create mode 100644
[SCM] Samba Shared Repository - branch master updated - 2c8cf0b394e8625017a1290f73d0007d3b5b6d20
The branch, master has been updated
via 2c8cf0b394e8625017a1290f73d0007d3b5b6d20 (commit)
via c484b0465c8c2298c8d439677412f34e6bdd17f1 (commit)
from 694a579cb8d418a4feb441a77c0dc23f2c6e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2c8cf0b394e8625017a1290f73d0007d3b5b6d20
Merge: c484b0465c8c2298c8d439677412f34e6bdd17f1
694a579cb8d418a4feb441a77c0dc23f2c6e
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 10:45:25 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
commit c484b0465c8c2298c8d439677412f34e6bdd17f1
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 10:45:02 2008 +0200
Move SMB-specific attribute function to SMB client library.
---
Summary of changes:
lib/util/util_str.c | 48 +
source4/libcli/raw/rawfile.c | 44 ++
2 files changed, 46 insertions(+), 46 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index 231f7f2..6f8a921 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -22,8 +22,9 @@
*/
#include includes.h
-#include libcli/raw/smb.h
#include system/locale.h
+#undef strncasecmp
+#undef strcasemp
/**
* @file
@@ -405,51 +406,6 @@ _PUBLIC_ size_t ascii_len_n(const char *src, size_t n)
return len;
}
-
-/**
- Return a string representing a CIFS attribute for a file.
-**/
-_PUBLIC_ char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib)
-{
- int i, len;
- const struct {
- char c;
- uint16_t attr;
- } attr_strs[] = {
- {'V', FILE_ATTRIBUTE_VOLUME},
- {'D', FILE_ATTRIBUTE_DIRECTORY},
- {'A', FILE_ATTRIBUTE_ARCHIVE},
- {'H', FILE_ATTRIBUTE_HIDDEN},
- {'S', FILE_ATTRIBUTE_SYSTEM},
- {'N', FILE_ATTRIBUTE_NORMAL},
- {'R', FILE_ATTRIBUTE_READONLY},
- {'d', FILE_ATTRIBUTE_DEVICE},
- {'t', FILE_ATTRIBUTE_TEMPORARY},
- {'s', FILE_ATTRIBUTE_SPARSE},
- {'r', FILE_ATTRIBUTE_REPARSE_POINT},
- {'c', FILE_ATTRIBUTE_COMPRESSED},
- {'o', FILE_ATTRIBUTE_OFFLINE},
- {'n', FILE_ATTRIBUTE_NONINDEXED},
- {'e', FILE_ATTRIBUTE_ENCRYPTED}
- };
- char *ret;
-
- ret = talloc_array(mem_ctx, char, ARRAY_SIZE(attr_strs)+1);
- if (!ret) {
- return NULL;
- }
-
- for (len=i=0; iARRAY_SIZE(attr_strs); i++) {
- if (attrib attr_strs[i].attr) {
- ret[len++] = attr_strs[i].c;
- }
- }
-
- ret[len] = 0;
-
- return ret;
-}
-
/**
Set a boolean variable from the text value stored in the passed string.
Returns true in success, false if the passed string does not correctly
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index d39c615..d174fbf 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -30,6 +30,50 @@
if (!req) return NULL; \
} while (0)
+/**
+ Return a string representing a CIFS attribute for a file.
+**/
+_PUBLIC_ char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib)
+{
+ int i, len;
+ const struct {
+ char c;
+ uint16_t attr;
+ } attr_strs[] = {
+ {'V', FILE_ATTRIBUTE_VOLUME},
+ {'D', FILE_ATTRIBUTE_DIRECTORY},
+ {'A', FILE_ATTRIBUTE_ARCHIVE},
+ {'H', FILE_ATTRIBUTE_HIDDEN},
+ {'S', FILE_ATTRIBUTE_SYSTEM},
+ {'N', FILE_ATTRIBUTE_NORMAL},
+ {'R', FILE_ATTRIBUTE_READONLY},
+ {'d', FILE_ATTRIBUTE_DEVICE},
+ {'t', FILE_ATTRIBUTE_TEMPORARY},
+ {'s', FILE_ATTRIBUTE_SPARSE},
+ {'r', FILE_ATTRIBUTE_REPARSE_POINT},
+ {'c', FILE_ATTRIBUTE_COMPRESSED},
+ {'o', FILE_ATTRIBUTE_OFFLINE},
+ {'n', FILE_ATTRIBUTE_NONINDEXED},
+ {'e', FILE_ATTRIBUTE_ENCRYPTED}
+ };
+ char *ret;
+
+ ret = talloc_array(mem_ctx, char, ARRAY_SIZE(attr_strs)+1);
+ if (!ret) {
+ return NULL;
+ }
+
+ for (len=i=0; iARRAY_SIZE(attr_strs); i++) {
+ if (attrib attr_strs[i].attr) {
+ ret[len++] = attr_strs[i].c;
+ }
+ }
+
+ ret[len] = 0;
+
+ return ret;
+}
+
/
Rename a file - async interface
/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - ded09b28dea16ba1f4c8894e33a1ce46153e65a7
The branch, master has been updated
via ded09b28dea16ba1f4c8894e33a1ce46153e65a7 (commit)
from 7af7935d0ed247faa30ce38723831151ead3c862 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ded09b28dea16ba1f4c8894e33a1ce46153e65a7
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sat Oct 18 19:41:12 2008 +0200
Inline the once-used macro init_dfsroot
---
Summary of changes:
source3/include/msdfs.h |8
source3/smbd/reply.c|7 ++-
2 files changed, 6 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index 4551325..800393c 100644
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -64,12 +64,4 @@ struct dfs_path {
bool posix_path;
};
-#define init_dfsroot(conn, inbuf, outbuf) \
-{ if (lp_msdfs_root(SNUM(conn)) lp_host_msdfs()) { \
-DEBUG(2,(Serving %s as a Dfs root\n, \
-lp_servicename(SNUM(conn)) )); \
- SSVAL(outbuf, smb_vwv2, SMB_SHARE_IN_DFS\
- | SVAL(outbuf, smb_vwv2));\
-} }
-
#endif /* _MSDFS_H */
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 9ccfaa7..b7763cb 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -747,7 +747,12 @@ void reply_tcon_and_X(struct smb_request *req)
SSVAL(req-outbuf, smb_vwv2, SMB_SUPPORT_SEARCH_BITS|
(lp_csc_policy(SNUM(conn)) 2));
- init_dfsroot(conn, req-inbuf, req-outbuf);
+ if (lp_msdfs_root(SNUM(conn)) lp_host_msdfs()) {
+ DEBUG(2,(Serving %s as a Dfs root\n,
+lp_servicename(SNUM(conn)) ));
+ SSVAL(req-outbuf, smb_vwv2,
+ SMB_SHARE_IN_DFS | SVAL(req-outbuf, smb_vwv2));
+ }
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 58b4efc9b49c1cc366303a306639a3fc9321dcfe
The branch, master has been updated
via 58b4efc9b49c1cc366303a306639a3fc9321dcfe (commit)
via 452b3e57e9b78dbc2f80d24112540e69fbf13954 (commit)
from ded09b28dea16ba1f4c8894e33a1ce46153e65a7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 58b4efc9b49c1cc366303a306639a3fc9321dcfe
Merge: 452b3e57e9b78dbc2f80d24112540e69fbf13954
ded09b28dea16ba1f4c8894e33a1ce46153e65a7
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 11:53:44 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit 452b3e57e9b78dbc2f80d24112540e69fbf13954
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 11:53:13 2008 +0200
Move README.Debian to the right directory.
---
Summary of changes:
{packaging = packaging4}/README.Debian |0
1 files changed, 0 insertions(+), 0 deletions(-)
rename {packaging = packaging4}/README.Debian (100%)
Changeset truncated at 500 lines:
diff --git a/packaging/README.Debian b/packaging4/README.Debian
similarity index 100%
rename from packaging/README.Debian
rename to packaging4/README.Debian
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 9fec173b071d0e4c17db73823bd7c1bdd50ad4d1
The branch, master has been updated
via 9fec173b071d0e4c17db73823bd7c1bdd50ad4d1 (commit)
via 8e704e4107b284bfc1e43f4c698ac0e6c5ae1800 (commit)
from 58b4efc9b49c1cc366303a306639a3fc9321dcfe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9fec173b071d0e4c17db73823bd7c1bdd50ad4d1
Merge: 8e704e4107b284bfc1e43f4c698ac0e6c5ae1800
58b4efc9b49c1cc366303a306639a3fc9321dcfe
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 12:39:37 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
commit 8e704e4107b284bfc1e43f4c698ac0e6c5ae1800
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 12:38:16 2008 +0200
Move more functions out of util_str.c into the shared util.c.
---
Summary of changes:
lib/util/util.c| 278 +
lib/util/util_str.c| 319 +++-
source3/lib/util_str.c | 229 --
3 files changed, 298 insertions(+), 528 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util.c b/lib/util/util.c
index fc55629..1e7991d 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -27,6 +27,7 @@
#include system/locale.h
#undef malloc
#undef strcasecmp
+#undef strncasecmp
#undef strdup
#undef realloc
@@ -559,3 +560,280 @@ _PUBLIC_ void *talloc_check_name_abort(const void *ptr,
const char *name)
return NULL;
}
+/**
+ Trim the specified elements off the front and back of a string.
+**/
+_PUBLIC_ bool trim_string(char *s, const char *front, const char *back)
+{
+ bool ret = false;
+ size_t front_len;
+ size_t back_len;
+ size_t len;
+
+ /* Ignore null or empty strings. */
+ if (!s || (s[0] == '\0'))
+ return false;
+
+ front_len = front? strlen(front) : 0;
+ back_len= back? strlen(back) : 0;
+
+ len = strlen(s);
+
+ if (front_len) {
+ while (len strncmp(s, front, front_len)==0) {
+ /* Must use memmove here as src dest can
+* easily overlap. Found by valgrind. JRA. */
+ memmove(s, s+front_len, (len-front_len)+1);
+ len -= front_len;
+ ret=true;
+ }
+ }
+
+ if (back_len) {
+ while ((len = back_len)
strncmp(s+len-back_len,back,back_len)==0) {
+ s[len-back_len]='\0';
+ len -= back_len;
+ ret=true;
+ }
+ }
+ return ret;
+}
+
+/**
+ Find the number of 'c' chars in a string
+**/
+_PUBLIC_ _PURE_ size_t count_chars(const char *s, char c)
+{
+ size_t count = 0;
+
+ while (*s) {
+ if (*s == c) count++;
+ s ++;
+ }
+
+ return count;
+}
+
+/**
+ Routine to get hex characters and turn them into a 16 byte array.
+ the array can be variable length, and any non-hex-numeric
+ characters are skipped. 0xnn or 0Xnn is specially catered
+ for.
+
+ valid examples: 0A5D15; 0x15, 0x49, 0xa2; 59\ta9\te3\n
+
+
+**/
+_PUBLIC_ size_t strhex_to_str(char *p, size_t p_len, const char *strhex,
size_t strhex_len)
+{
+ size_t i;
+ size_t num_chars = 0;
+ uint8_t lonybble, hinybble;
+ const char *hexchars = 0123456789ABCDEF;
+ char *p1 = NULL, *p2 = NULL;
+
+ for (i = 0; i strhex_len strhex[i] != 0; i++) {
+ if (strncasecmp(hexchars, 0x, 2) == 0) {
+ i++; /* skip two chars */
+ continue;
+ }
+
+ if (!(p1 = strchr(hexchars, toupper((unsigned char)strhex[i]
+ break;
+
+ i++; /* next hex digit */
+
+ if (!(p2 = strchr(hexchars, toupper((unsigned char)strhex[i]
+ break;
+
+ /* get the two nybbles */
+ hinybble = PTR_DIFF(p1, hexchars);
+ lonybble = PTR_DIFF(p2, hexchars);
+
+ if (num_chars = p_len) {
+ break;
+ }
+
+ p[num_chars] = (hinybble 4) | lonybble;
+ num_chars++;
+
+ p1 = NULL;
+ p2 = NULL;
+ }
+ return num_chars;
+}
+
+/**
+ * Parse a hex string and return a data blob.
+ */
+_PUBLIC_ _PURE_ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char
*strhex)
+{
+ DATA_BLOB ret_blob = data_blob_talloc(mem_ctx, NULL,
strlen(strhex)/2+1);
+
+ ret_blob.length = strhex_to_str((char *)ret_blob.data, ret_blob.length,
+ strhex,
+ strlen(strhex));
+
+ return ret_blob;
+}
+
+
+/**
[SCM] Samba Shared Repository - branch master updated - 99f0d6b1c1bf15716cf20722cd2bf83536614b1c
The branch, master has been updated
via 99f0d6b1c1bf15716cf20722cd2bf83536614b1c (commit)
via f0c4829e827210e6f58885994e18f77f9afc3b8c (commit)
from 9fec173b071d0e4c17db73823bd7c1bdd50ad4d1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 99f0d6b1c1bf15716cf20722cd2bf83536614b1c
Merge: f0c4829e827210e6f58885994e18f77f9afc3b8c
9fec173b071d0e4c17db73823bd7c1bdd50ad4d1
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 13:20:55 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit f0c4829e827210e6f58885994e18f77f9afc3b8c
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 13:06:14 2008 +0200
Remove silly safe_free() function which is a wrapper around SAFE_FREE().
Since it's a function it just sets the local pointer to NULL and basically
is an equivalent to free().
It also claims it's being used for callbacks but isn't used that way
anywhere.
---
Summary of changes:
source3/lib/util.c | 11 ---
source3/printing/nt_printing.c |9 -
source3/printing/pcap.c |2 +-
source3/printing/print_aix.c|8
source3/utils/net_ads.c |4 ++--
source3/utils/net_rpc_printer.c |2 +-
source3/utils/nmblookup.c |2 +-
7 files changed, 13 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 92b818b..820cf37 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1228,17 +1228,6 @@ void add_to_large_array(TALLOC_CTX *mem_ctx, size_t
element_size,
}
/
- Free memory, checks for NULL.
- Use directly SAFE_FREE()
- Exists only because we need to pass a function pointer somewhere --SSS
-/
-
-void safe_free(void *p)
-{
- SAFE_FREE(p);
-}
-
-/
Get my own name and IP.
/
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index c0e62ea..1826fa8 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -280,7 +280,7 @@ static bool upgrade_to_version_3(void)
DEBUG(0,(upgrade_to_version_3: upgrading print tdb's to version 3\n));
for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr;
- newkey = tdb_nextkey(tdb_drivers, kbuf),
safe_free(kbuf.dptr), kbuf=newkey) {
+ newkey = tdb_nextkey(tdb_drivers, kbuf),
free(kbuf.dptr), kbuf=newkey) {
dbuf = tdb_fetch(tdb_drivers, kbuf);
@@ -807,7 +807,7 @@ int get_ntforms(nt_forms_struct **list)
for (kbuf = tdb_firstkey(tdb_forms);
kbuf.dptr;
-newkey = tdb_nextkey(tdb_forms, kbuf), safe_free(kbuf.dptr),
kbuf=newkey)
+newkey = tdb_nextkey(tdb_forms, kbuf), free(kbuf.dptr),
kbuf=newkey)
{
if (strncmp((const char *)kbuf.dptr, FORMS_PREFIX,
strlen(FORMS_PREFIX)) != 0)
continue;
@@ -1024,7 +1024,7 @@ int get_ntdrivers(fstring **list, const char
*architecture, uint32 version)
for (kbuf = tdb_firstkey(tdb_drivers);
kbuf.dptr;
-newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr),
kbuf=newkey) {
+newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr),
kbuf=newkey) {
if (strncmp((const char *)kbuf.dptr, key, strlen(key)) != 0)
continue;
@@ -3123,8 +3123,7 @@ static void map_single_multi_sz_into_ctr(REGVAL_CTR *ctr,
const char *val_name,
regval_ctr_delvalue(ctr, val_name);
regval_ctr_addvalue(ctr, val_name, REG_MULTI_SZ,
(char *) conv_strs, str_size);
- safe_free(conv_strs);
-
+ SAFE_FREE(conv_strs);
}
/
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index b9e5ad5..a6bf52a 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -179,7 +179,7 @@ void pcap_cache_reload(void)
goto done;
}
- for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL;
safe_free(pcap_line)) {
+ for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL;
free(pcap_line)) {
char name[MAXPRINTERLEN+1];
char comment[62];
char *p, *q;
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 57590cc..523be77 100644
--- a/source3/printing/print_aix.c
+++
[SCM] Samba Shared Repository - branch master updated - 202affa511125cf54d86d92a9ee1b6ecd49ad5af
The branch, master has been updated
via 202affa511125cf54d86d92a9ee1b6ecd49ad5af (commit)
from 99f0d6b1c1bf15716cf20722cd2bf83536614b1c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 202affa511125cf54d86d92a9ee1b6ecd49ad5af
Author: Kai Blin [EMAIL PROTECTED]
Date: Sun Oct 19 13:18:20 2008 +0200
rpc: Fix the merged build breaking on StrnCaseCmp.
---
Summary of changes:
librpc/ndr/ndr_drsuapi.c | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index 38474c2..4d1ae8b 100644
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -25,6 +25,8 @@
#include librpc/gen_ndr/ndr_misc.h
#include ../lib/util/asn1.h
#include librpc/ndr/ndr_compression.h
+/* We don't need multibyte if we're just comparing to 'ff' */
+#undef strncasecmp
void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const
char *name,
const struct
drsuapi_DsReplicaObjectListItem *r)
@@ -91,11 +93,7 @@ enum ndr_err_code ndr_push_drsuapi_DsReplicaOID(struct
ndr_push *ndr, int ndr_fl
if (r-oid) {
DATA_BLOB blob;
-#if (_SAMBA_BUILD_ == 3)
- if (StrnCaseCmp(ff, r-oid, 2) == 0) {
-#else
if (strncasecmp(ff, r-oid, 2) == 0) {
-#endif
blob = strhex_to_data_blob(ndr, r-oid);
if (!blob.data) {
return ndr_push_error(ndr,
NDR_ERR_SUBCONTEXT,
@@ -167,11 +165,7 @@ size_t ndr_size_drsuapi_DsReplicaOID_oid(const char *oid,
int flags)
if (!oid) return 0;
-#if (_SAMBA_BUILD_ == 3)
- if (StrnCaseCmp(ff, oid, 2) == 0) {
-#else
if (strncasecmp(ff, oid, 2) == 0) {
-#endif
_blob = strhex_to_data_blob(NULL, oid);
if (_blob.data) {
ret = _blob.length;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 7af7935d0ed247faa30ce38723831151ead3c862
The branch, master has been updated via 7af7935d0ed247faa30ce38723831151ead3c862 (commit) from 2c8cf0b394e8625017a1290f73d0007d3b5b6d20 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7af7935d0ed247faa30ce38723831151ead3c862 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Sun Oct 19 11:22:19 2008 +0200 Specify ZLIB_LIBS explicitly in case zlib isn't brought in any other way. --- Summary of changes: source3/Makefile.in | 55 ++ 1 files changed, 29 insertions(+), 26 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index fed38c8..808bcc1 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -919,7 +919,7 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \ MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ -$(LIBNDR_GEN_OBJ0) +$(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS) MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ @@ -927,7 +927,7 @@ MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \ - $(LIBNDR_GEN_OBJ0) + $(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS) NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ @@ -946,7 +946,7 @@ LOG2PCAP_OBJ = utils/log2pcaphex.o LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ - $(LIBNDR_GEN_OBJ0) + $(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS) SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \ @@ -1328,40 +1328,41 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \ $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ - $(WINBIND_LIBS) + $(WINBIND_LIBS) $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \ - $(KRB5LIBS) $(LDAP_LIBS) + $(KRB5LIBS) $(LDAP_LIBS) $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \ $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \ - $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) + $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ - $(WINBIND_LIBS) + $(WINBIND_LIBS) $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \ - $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) + $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ $(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ - @INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS) + @INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS) \ + $(ZLIB_LIBS) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS)
[SCM] Samba Shared Repository - branch master updated - 085e7b0b6cc882b31c11b6d6ea7834235588e1ed
The branch, master has been updated
via 085e7b0b6cc882b31c11b6d6ea7834235588e1ed (commit)
via 7f826373dbea1d6421abcde6046ec53853ecaf6f (commit)
via 069437a2faf6a8811ba511f765c5d133ed0b97a9 (commit)
via 55a88210d8ff429f7cc86db58c8a03c6eb991b93 (commit)
from 202affa511125cf54d86d92a9ee1b6ecd49ad5af (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 085e7b0b6cc882b31c11b6d6ea7834235588e1ed
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:14:55 2008 +0200
Fix segfault when using DEBUG() in the merged build.
commit 7f826373dbea1d6421abcde6046ec53853ecaf6f
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:03:20 2008 +0200
Move smb.conf parser to libutil to match Samba 4.
commit 069437a2faf6a8811ba511f765c5d133ed0b97a9
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 13:52:56 2008 +0200
Just call talloc_free directly rather than through a helper function.
commit 55a88210d8ff429f7cc86db58c8a03c6eb991b93
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 13:35:37 2008 +0200
Add vlp to TORTURE_PROGS since it's required by make test.
---
Summary of changes:
lib/util/debug.c|5 -
lib/util/params.c |9 ++---
source3/Makefile.in |9 +
3 files changed, 11 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index b6edb90..faec52a 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -33,7 +33,10 @@
*/
int _debug_level = 0;
_PUBLIC_ int *debug_level = _debug_level;
-int *DEBUGLEVEL_CLASS = NULL; /* For samba 3 */
+static int debug_all_class_hack = 1;
+int *DEBUGLEVEL_CLASS = debug_all_class_hack; /* For samba 3 */
+static bool debug_all_class_isset_hack = true;
+bool*DEBUGLEVEL_CLASS_ISSET = debug_all_class_isset_hack; /* For samba 3
*/
/* the registered mutex handlers */
static struct {
diff --git a/lib/util/params.c b/lib/util/params.c
index c03edec..7af7ac7 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -105,11 +105,6 @@ static int mygetc(myFILE *f)
return (int)( *(f-p++) 0x00FF );
}
-static void myfile_close(myFILE *f)
-{
- talloc_free(f);
-}
-
/* --
**
* Functions...
*/
@@ -565,7 +560,7 @@ bool pm_process( const char *FileName,
if( NULL == InFile-bufr )
{
DEBUG(0,(%s memory allocation failure.\n, func));
- myfile_close(InFile);
+ talloc_free(InFile);
return( false );
}
result = Parse( InFile, sfunc, pfunc, userdata );
@@ -573,7 +568,7 @@ bool pm_process( const char *FileName,
InFile-bSize = 0;
}
- myfile_close(InFile);
+ talloc_free(InFile);
if( !result ) /* Generic failure. */
{
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 808bcc1..1b86c95 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -196,7 +196,7 @@ TORTURE_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL
PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \
bin/[EMAIL PROTECTED]@ \
- bin/[EMAIL PROTECTED]@
+ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@
BIN_PROGS = @EXTRA_BIN_PROGS@ \
$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4)
@@ -319,7 +319,8 @@ LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
../lib/util/xfile.o ../lib/util/util_strlist.o \
../lib/util/util_file.o ../lib/util/data_blob.o \
- ../lib/util/util.o ../lib/util/fsusage.o
+ ../lib/util/util.o ../lib/util/fsusage.o \
+ ../lib/util/params.o
CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
@@ -361,7 +362,7 @@ READLINE_OBJ = lib/readline.o
# Be sure to include them into your application
POPT_LIB_OBJ = lib/popt_common.o
-PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o ../lib/util/params.o
param/util.o lib/sharesec.o lib/ldap_debug_handler.o
+PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o param/util.o
lib/sharesec.o lib/ldap_debug_handler.o
PARAM_REG_ADD_OBJ = $(REG_SMBCONF_OBJ) $(LIBSMBCONF_OBJ)
$(PRIVILEGES_BASIC_OBJ)
PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
@@ -1162,7 +1163,7 @@ pam_winbind: SHOWFLAGS bin/[EMAIL PROTECTED]@
gpext_modules:: $(GPEXT_MODULES)
-torture:: SHOWFLAGS $(TORTURE_PROGS)
+torture:: SHOWFLAGS $(TORTURE_PROGS)
smbtorture : SHOWFLAGS bin/[EMAIL PROTECTED]@
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 6ba693b5de0ecf53638468b56ce3b93d2e33c919
The branch, master has been updated
via 6ba693b5de0ecf53638468b56ce3b93d2e33c919 (commit)
via 1ba9867e7ae2f517e47edd67d7d41e48b6f55e5c (commit)
via 0b3cf400db35018000ceb84cdc20b55bc6c77aa3 (commit)
via 7e088ec35424fc2d6c64b8699d9d22b3215275e2 (commit)
via e09c0c1185b4a4ad1d28023549074875028f3e55 (commit)
via 33032d591f8e39edae0ce4b35ca1b6e25f04a04b (commit)
from 085e7b0b6cc882b31c11b6d6ea7834235588e1ed (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6ba693b5de0ecf53638468b56ce3b93d2e33c919
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:54:16 2008 +0200
Make sure crypt libs get included.
commit 1ba9867e7ae2f517e47edd67d7d41e48b6f55e5c
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:53:55 2008 +0200
Fix typo.
commit 0b3cf400db35018000ceb84cdc20b55bc6c77aa3
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:50:25 2008 +0200
Fix formatting in selftest help output.
commit 7e088ec35424fc2d6c64b8699d9d22b3215275e2
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:41:10 2008 +0200
Fix comment after paths have changed.
commit e09c0c1185b4a4ad1d28023549074875028f3e55
Merge: 33032d591f8e39edae0ce4b35ca1b6e25f04a04b
085e7b0b6cc882b31c11b6d6ea7834235588e1ed
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 14:27:08 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
commit 33032d591f8e39edae0ce4b35ca1b6e25f04a04b
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sat Oct 18 17:49:41 2008 +0200
Move ufc to libreplace.
---
Summary of changes:
lib/replace/crypt.c | 770 +
lib/replace/crypt.m4 |6 +
lib/replace/libreplace.m4 |1 +
lib/replace/replace.h |7 +
lib/replace/samba.m4 |2 +-
selftest/output/plain.pm |2 +-
selftest/selftest.pl |8 +-
source3/Makefile.in |2 +-
source3/configure.in |8 +-
source3/include/proto.h |4 -
source3/lib/ufc.c | 770 -
source4/selftest/tests.sh |4 +-
12 files changed, 795 insertions(+), 789 deletions(-)
create mode 100644 lib/replace/crypt.c
create mode 100644 lib/replace/crypt.m4
delete mode 100644 source3/lib/ufc.c
Changeset truncated at 500 lines:
diff --git a/lib/replace/crypt.c b/lib/replace/crypt.c
new file mode 100644
index 000..22341ce
--- /dev/null
+++ b/lib/replace/crypt.c
@@ -0,0 +1,770 @@
+/*
+ This bit of code was derived from the UFC-crypt package which
+ carries the following copyright
+
+ Modified for use by Samba by Andrew Tridgell, October 1994
+
+ Note that this routine is only faster on some machines. Under Linux 1.1.51
+ libc 4.5.26 I actually found this routine to be slightly slower.
+
+ Under SunOS I found a huge speedup by using these routines
+ (a factor of 20 or so)
+
+ Warning: I've had a report from Steve Kennedy [EMAIL PROTECTED]
+ that this crypt routine may sometimes get the wrong answer. Only
+ use UFC_CRYT if you really need it.
+
+*/
+
+#include replace.h
+
+#ifndef HAVE_CRYPT
+
+/*
+ * UFC-crypt: ultra fast crypt(3) implementation
+ *
+ * Copyright (C) 1991-1998, Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see http://www.gnu.org/licenses/.
+ *
+ * @(#)crypt_util.c2.31 02/08/92
+ *
+ * Support routines
+ *
+ */
+
+
+#ifndef long32
+#define long32 int32
+#endif
+
+#ifndef long64
+#define long64 int64
+#endif
+
+#ifndef ufc_long
+#define ufc_long unsigned
+#endif
+
+#ifndef _UFC_64_
+#define _UFC_32_
+#endif
+
+/*
+ * Permutation done once on the 56 bit
+ * key derived from the original 8 byte ASCII key.
+ */
+static int pc1[56] = {
+ 57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18,
+ 10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36,
+ 63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22,
+ 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4
+};
+
+/*
+ * How much to rotate each 28 bit half of the pc1 permutated
+ * 56 bit key before using pc2 to give the i' key
+ */
+static int rots[16] = {
+ 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2,
[SCM] Samba Shared Repository - branch master updated - c88cbbfdf323c24f7d8a68491bcb1e0354db41d4
The branch, master has been updated
via c88cbbfdf323c24f7d8a68491bcb1e0354db41d4 (commit)
from 6ba693b5de0ecf53638468b56ce3b93d2e33c919 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c88cbbfdf323c24f7d8a68491bcb1e0354db41d4
Author: Kai Blin [EMAIL PROTECTED]
Date: Sun Oct 19 13:05:19 2008 +0200
vlp: Move closer to the code tested.
---
Summary of changes:
source3/Makefile.in |2 +-
source3/printing/tests/README.vlp | 19 ++
source3/printing/tests/vlp.c | 431 +
testsuite/printing/Makefile.vlp | 14 --
testsuite/printing/README.vlp | 35 ---
testsuite/printing/vlp.c | 431 -
6 files changed, 451 insertions(+), 481 deletions(-)
create mode 100644 source3/printing/tests/README.vlp
create mode 100644 source3/printing/tests/vlp.c
delete mode 100644 testsuite/printing/Makefile.vlp
delete mode 100644 testsuite/printing/README.vlp
delete mode 100644 testsuite/printing/vlp.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 12d37ce..bb81dd2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1125,7 +1125,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ)
$(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
-VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2)
$(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
+VLP_OBJ1 = printing/tests/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2)
$(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
diff --git a/source3/printing/tests/README.vlp
b/source3/printing/tests/README.vlp
new file mode 100644
index 000..fc0b91a
--- /dev/null
+++ b/source3/printing/tests/README.vlp
@@ -0,0 +1,19 @@
+Virtual line printer test program (vlp)
+===
+
+This can be useful for testing/debugging Samba print code. It gives you a
+virtual full-function printer.
+
+Setup
+
+Set up Samba to use vlp.
+ In your smb.conf file under [global], add the following option:
+ printing = vlp
+ and then add any number of print shares, without needing to make them
+ really exist.
+
+ [testprinter]
+ printable = yes
+
+ is all you need for the most basic virtual printer.
+
diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c
new file mode 100644
index 000..1545988
--- /dev/null
+++ b/source3/printing/tests/vlp.c
@@ -0,0 +1,431 @@
+/*
+ Unix SMB/Netbios implementation.
+
+ Virtual lp system for printer testing
+
+ Copyright (C) Tim Potter 2000
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+
+#define PRINT_TDB /tmp/vlp.tdb
+#define PRINT_FIRSTJOB 100
+
+static TDB_CONTEXT *tdb;
+
+struct vlp_job {
+ fstring owner;
+ int jobid;
+ fstring jobname;
+ int size;
+ int status;
+ time_t submit_time;
+ int deleted;
+};
+
+/* Print usage */
+
+static void usage(void)
+{
+ printf(Usage: print-test lpq|lprm|print|queuepause|queueresume|
+ lppause|lpresume [args]\n);
+}
+
+/* Return an array of vlp jobs that is the printer queue */
+
+static void get_job_list(char *printer, struct vlp_job **job_list,
+int *num_jobs)
+{
+ fstring keystr;
+ TDB_DATA data;
+
+ slprintf(keystr, sizeof(keystr) - 1, LPQ/%s, printer);
+ data = tdb_fetch_bystring(tdb, keystr);
+
+ *job_list = (struct vlp_job *)data.dptr;
+ *num_jobs = data.dsize / sizeof(struct vlp_job);
+}
+
+/* Store an array of vl jobs for the queue */
+
+static void set_job_list(char *printer, struct vlp_job *job_list,
+int num_jobs)
+{
+ fstring keystr;
+ TDB_DATA data;
+
+ slprintf(keystr, sizeof(keystr) - 1, LPQ/%s, printer);
+
+ data.dptr = (unsigned char *)job_list;
+ data.dsize = num_jobs * sizeof(struct vlp_job);
+ tdb_store_bystring(tdb, keystr, data, TDB_REPLACE);
+}
+
+/* Return the next job number
[SCM] Samba Shared Repository - branch master updated - 974ab9d2f9ffabe20fab687f7e63cb168570f7e5
The branch, master has been updated
via 974ab9d2f9ffabe20fab687f7e63cb168570f7e5 (commit)
from c88cbbfdf323c24f7d8a68491bcb1e0354db41d4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 974ab9d2f9ffabe20fab687f7e63cb168570f7e5
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 15:47:36 2008 +0200
Use _EXT version of autoconf macro.
---
Summary of changes:
lib/replace/crypt.m4 |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/crypt.m4 b/lib/replace/crypt.m4
index 5a9fe88..0b31ae4 100644
--- a/lib/replace/crypt.m4
+++ b/lib/replace/crypt.m4
@@ -1,6 +1,6 @@
###
# test for where we get crypt() from
-AC_SEARCH_LIBS(crypt, [crypt],
+AC_SEARCH_LIBS_EXT(crypt, [crypt],
[test $ac_cv_search_crypt = none required || CRYPT_LIBS=-lcrypt
AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])],
[ LIBREPLACEOBJ=${LIBREPLACEOBJ} crypt.o ])
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - c0de338394c9e2dd80a3ad06341fe95b1ea169ed
The branch, master has been updated
via c0de338394c9e2dd80a3ad06341fe95b1ea169ed (commit)
from 974ab9d2f9ffabe20fab687f7e63cb168570f7e5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c0de338394c9e2dd80a3ad06341fe95b1ea169ed
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 16:07:00 2008 +0200
Move Samba4-specific code out of selftest.
---
Summary of changes:
selftest/selftest.pl | 35 ---
source4/selftest/tests.sh | 23 +++
2 files changed, 43 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ebb88dd..d1e9c8d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -588,24 +588,9 @@ sub write_clientconf($$)
close(CF);
}
-my @torture_options = ();
-push (@torture_options, --configfile=$conffile);
-# ensure any one smbtorture call doesn't run too long
-push (@torture_options, --maximum-runtime=$torture_maxtime);
-push (@torture_options, --target=$opt_target);
-push (@torture_options, --basedir=$prefix_abs);
-push (@torture_options, --option=torture:progress=no) unless ($opt_verbose);
-push (@torture_options, --format=subunit);
-push (@torture_options, --option=torture:quick=yes) if ($opt_quick);
-
-$ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
-print OPTIONS $ENV{TORTURE_OPTIONS}\n;
-
my @todo = ();
my $testsdir = $srcdir/selftest;
-$ENV{SMB_CONF_PATH} = $conffile;
-$ENV{CONFIGURATION} = --configfile=$conffile;
my %required_envs = ();
@@ -640,6 +625,26 @@ if ($#testlists == -1) {
die(No testlists specified);
}
+$ENV{SELFTEST_PREFIX} = $prefix_abs;
+if ($opt_socket_wrapper) {
+ $ENV{SELFTEST_INTERFACES} = $interfaces;
+} else {
+ $ENV{SELFTEST_INTERFACES} = ;
+}
+if ($opt_verbose) {
+ $ENV{SELFTEST_VERBOSE} = 1;
+} else {
+ $ENV{SELFTEST_VERBOSE} = ;
+}
+if ($opt_quick) {
+ $ENV{SELFTEST_QUICK} = 1;
+} else {
+ $ENV{SELFTEST_QUICK} = ;
+}
+$ENV{SELFTEST_TARGET} = $opt_target;
+$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
+$ENV{SELFTEST_CONFFILE} = $conffile;
+
my @available = ();
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5f14890..b02b7bb 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -58,8 +58,31 @@ bin/smbtorture -V
samba4srcdir=.
samba4bindir=$samba4srcdir/bin
+
+prefix_abs=$SELFTEST_PREFIX/s4client
+
+mkdir $prefix_abs
+conffile=$SELFTEST_CONFFILE
+
+TORTURE_OPTIONS=
+TORTURE_OPTIONS=$TORTURE_OPTIONS --configfile=$conffile
+TORTURE_OPTIONS=$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME
+TORTURE_OPTIONS=$TORTURE_OPTIONS --target=$SELFTEST_TARGET
+TORTURE_OPTIONS=$TORTURE_OPTIONS --basedir=$prefix_abs
+if [ -n $SELFTEST_VERBOSE ]; then
+ TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:progress=no
+fi
+TORTURE_OPTIONS=$TORTURE_OPTIONS --format=subunit
+if [ -n $SELFTEST_QUICK ]; then
+ TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:quick=yes
+fi
smb4torture=$samba4bindir/smbtorture $TORTURE_OPTIONS
+echo OPTIONS $TORTURE_OPTIONS
+
+SMB_CONF_PATH=$conffile
+CONFIGURATION=--configfile=$conffile
+
# Simple tests for LDAP and CLDAP
for options in --option=socket:testnonblock=true -U\$USERNAME%\$PASSWORD
--option=socket:testnonblock=true -U\$USERNAME%\$PASSWORD; do
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated -c0de338394c9e2dd80a3ad06341fe95b1ea169ed
The branch, master has been updated
via c0de338394c9e2dd80a3ad06341fe95b1ea169ed (commit)
from 974ab9d2f9ffabe20fab687f7e63cb168570f7e5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c0de338394c9e2dd80a3ad06341fe95b1ea169ed
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Sun Oct 19 16:07:00 2008 +0200
Move Samba4-specific code out of selftest.
---
Summary of changes:
selftest/selftest.pl | 35 ---
source4/selftest/tests.sh | 23 +++
2 files changed, 43 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ebb88dd..d1e9c8d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -588,24 +588,9 @@ sub write_clientconf($$)
close(CF);
}
-my @torture_options = ();
-push (@torture_options, --configfile=$conffile);
-# ensure any one smbtorture call doesn't run too long
-push (@torture_options, --maximum-runtime=$torture_maxtime);
-push (@torture_options, --target=$opt_target);
-push (@torture_options, --basedir=$prefix_abs);
-push (@torture_options, --option=torture:progress=no) unless
($opt_verbose);
-push (@torture_options, --format=subunit);
-push (@torture_options, --option=torture:quick=yes) if ($opt_quick);
-
-$ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
-print OPTIONS $ENV{TORTURE_OPTIONS}\n;
-
my @todo = ();
my $testsdir = $srcdir/selftest;
-$ENV{SMB_CONF_PATH} = $conffile;
-$ENV{CONFIGURATION} = --configfile=$conffile;
my %required_envs = ();
@@ -640,6 +625,26 @@ if ($#testlists == -1) {
die(No testlists specified);
}
+$ENV{SELFTEST_PREFIX} = $prefix_abs;
+if ($opt_socket_wrapper) {
+ $ENV{SELFTEST_INTERFACES} = $interfaces;
+} else {
+ $ENV{SELFTEST_INTERFACES} = ;
+}
+if ($opt_verbose) {
+ $ENV{SELFTEST_VERBOSE} = 1;
+} else {
+ $ENV{SELFTEST_VERBOSE} = ;
+}
+if ($opt_quick) {
+ $ENV{SELFTEST_QUICK} = 1;
+} else {
+ $ENV{SELFTEST_QUICK} = ;
+}
+$ENV{SELFTEST_TARGET} = $opt_target;
+$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
+$ENV{SELFTEST_CONFFILE} = $conffile;
+
my @available = ();
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5f14890..b02b7bb 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -58,8 +58,31 @@ bin/smbtorture -V
samba4srcdir=.
samba4bindir=$samba4srcdir/bin
+
+prefix_abs=$SELFTEST_PREFIX/s4client
+
+mkdir $prefix_abs
+conffile=$SELFTEST_CONFFILE
+
+TORTURE_OPTIONS=
+TORTURE_OPTIONS=$TORTURE_OPTIONS --configfile=$conffile
+TORTURE_OPTIONS=$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME
+TORTURE_OPTIONS=$TORTURE_OPTIONS --target=$SELFTEST_TARGET
+TORTURE_OPTIONS=$TORTURE_OPTIONS --basedir=$prefix_abs
+if [ -n $SELFTEST_VERBOSE ]; then
+ TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:progress=no
+fi
+TORTURE_OPTIONS=$TORTURE_OPTIONS --format=subunit
+if [ -n $SELFTEST_QUICK ]; then
+ TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:quick=yes
+fi
smb4torture=$samba4bindir/smbtorture $TORTURE_OPTIONS
+echo OPTIONS $TORTURE_OPTIONS
+
+SMB_CONF_PATH=$conffile
+CONFIGURATION=--configfile=$conffile
+
don't you need to export some of this shell variables into the environment?
I think at least SMB_CONF_PATH should be exported.
metze
[SCM] Samba Shared Repository - branch master updated - c4dc548171ba27b741669e364839a3c8e507be96
The branch, master has been updated
via c4dc548171ba27b741669e364839a3c8e507be96 (commit)
via 2883c88ae46d3957564660213471e1d6f94cdb04 (commit)
via 48d3a1d2fb5569ab11ffef8b903af91d77d326a3 (commit)
via 1510b7b8c99ea64a8fabdb89c5868b2f5895fdbf (commit)
via ac647d03ac271b0a81b6c8041e2c6b84ada13aca (commit)
from c0de338394c9e2dd80a3ad06341fe95b1ea169ed (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c4dc548171ba27b741669e364839a3c8e507be96
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 19 22:37:27 2008 +0200
Fix 64-bit printf warnings
commit 2883c88ae46d3957564660213471e1d6f94cdb04
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 19 15:30:12 2008 +0200
Fix nonempty blank lines
commit 48d3a1d2fb5569ab11ffef8b903af91d77d326a3
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 19 15:17:12 2008 +0200
fn_new-fn in smb_messages[], we got beyond that :-)
commit 1510b7b8c99ea64a8fabdb89c5868b2f5895fdbf
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 19 14:50:55 2008 +0200
Use a direct compare instead of calling strncmp in valid_smb_header
commit ac647d03ac271b0a81b6c8041e2c6b84ada13aca
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 19 13:44:11 2008 +0200
Move the global hosts_allow() check out of the processing loop
---
Summary of changes:
librpc/ndr/ndr_compression.c |8 +-
source3/smbd/process.c | 53 +++-
source3/smbd/reply.c | 182 +-
3 files changed, 126 insertions(+), 117 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c
index afd397e..c73c3bb 100644
--- a/librpc/ndr/ndr_compression.c
+++ b/librpc/ndr/ndr_compression.c
@@ -260,7 +260,9 @@ static enum ndr_err_code
ndr_push_compression_mszip_chunk(struct ndr_push *ndrpu
ndrpush-offset = tmp_offset;
DEBUG(9,(MSZIP comp plain_chunk_size: %08X (%u) comp_chunk_size: %08X
(%u)\n,
-plain_chunk.length, plain_chunk.length, comp_chunk_size,
comp_chunk_size));
+(unsigned int)plain_chunk.length,
+(unsigned int)plain_chunk.length,
+comp_chunk_size, comp_chunk_size));
ndrpush-offset += comp_chunk_size;
return NDR_ERR_SUCCESS;
@@ -307,7 +309,7 @@ static enum ndr_err_code
ndr_pull_compression_xpress_chunk(struct ndr_pull *ndrp
if (ret 0) {
return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION,
XPRESS lzxpress_decompress() returned
%d\n,
- ret);
+ (int)ret);
}
plain_chunk.length = ret;
@@ -361,7 +363,7 @@ static enum ndr_err_code
ndr_push_compression_xpress_chunk(struct ndr_push *ndrp
if (ret 0) {
return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION,
XPRESS lzxpress_compress() returned
%d\n,
- ret);
+ (int)ret);
}
comp_chunk.length = ret;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ceffd6f..a8b93d8 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -105,7 +105,11 @@ static bool valid_smb_header(const uint8_t *inbuf)
if (is_encrypted_packet(inbuf)) {
return true;
}
- return (strncmp(smb_base(inbuf),\377SMB,4) == 0);
+ /*
+* This used to be (strncmp(smb_base(inbuf),\377SMB,4) == 0)
+* but it just looks weird to call strncmp for this one.
+*/
+ return (IVAL(smb_base(inbuf), 0) == 0x424D53FF);
}
/* Socket functions for smbd packet processing. */
@@ -974,7 +978,7 @@ force write permissions on print services.
*/
static const struct smb_message_struct {
const char *name;
- void (*fn_new)(struct smb_request *req);
+ void (*fn)(struct smb_request *req);
int flags;
} smb_messages[256] = {
@@ -1350,7 +1354,7 @@ static connection_struct *switch_message(uint8 type,
struct smb_request *req, in
exit_server_cleanly(Non-SMB packet);
}
- if (smb_messages[type].fn_new == NULL) {
+ if (smb_messages[type].fn == NULL) {
DEBUG(0,(Unknown message type %d!\n,type));
smb_dump(Unknown, 1, (char *)req-inbuf, size);
reply_unknown_new(req, type);
@@ -1472,7 +1476,7 @@ static connection_struct *switch_message(uint8 type,
struct smb_request *req, in
return conn;
}
- smb_messages[type].fn_new(req);
+ smb_messages[type].fn(req);
return req-conn;
}
@@ -1534,25 +1538,6 @@ static void process_smb(char
[SCM] CTDB repository - branch master updated - ctdb-1.0.62-6-g59a8796
The branch, master has been updated
via 59a879626a6a55fb6a43cadf5338c1aa6afe96d1 (commit)
via e25ea88ea4f270ba65ed5fdacd693f1248f343c0 (commit)
via 4b0f32047e8bece0a052bdbe2209afe91b7e8ce3 (commit)
via 82fd2b6b5cd8e988c38fa6b74121a048757bdeef (commit)
from 06097b88709ced09d1f9f869eed9a54e6d2fedbf (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 59a879626a6a55fb6a43cadf5338c1aa6afe96d1
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Mon Oct 20 09:47:54 2008 +1100
new version 1.0.63
commit e25ea88ea4f270ba65ed5fdacd693f1248f343c0
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Mon Oct 20 09:45:15 2008 +1100
dont log running periodic cleanup ...
commit 4b0f32047e8bece0a052bdbe2209afe91b7e8ce3
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri Oct 17 21:38:42 2008 +1100
null out the pointer before we reload the nodes file
commit 82fd2b6b5cd8e988c38fa6b74121a048757bdeef
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Fri Oct 17 21:18:06 2008 +1100
when we reload the nodes file, we may need to reload the nodes file
inside the recovery daemon as well.
---
Summary of changes:
config/events.d/50.samba |2 +-
packaging/RPM/ctdb.spec |7 ++-
server/ctdb_recoverd.c | 26 --
3 files changed, 31 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 498aa17..9ec5f1c 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -108,7 +108,7 @@ check_ctdb_manages_winbind() {
periodic_cleanup() {
# running smbstatus scrubs any dead entries from the connections
# and sessionid database
-echo Running periodic cleanup of samba databases
+# echo Running periodic cleanup of samba databases
smbstatus -n /dev/null 21
}
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 0bc381f..a052910 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team [EMAIL PROTECTED]
Name: ctdb
Version: 1.0
-Release: 62
+Release: 63
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -120,6 +120,11 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Mon Oct 20 2008 : Version 1.0.63
+ - Remove logging of periodic cleanup ... in 50.samba
+ - When we reload a nodes file, we must detect this and reload the file also
+ in the recovery daemon before we try to dereference somethoung beyond the
end
+ of the nodes array.
* Thu Oct 16 2008 : Version 1.0.62
- Allow multiple eventscritps using the same prefix number.
It is undefined which order scripts with the same prefix will execute in.
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index b17f989..350897a 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -291,7 +291,9 @@ static void async_getcap_callback(struct ctdb_context
*ctdb, uint32_t node_pnn,
DEBUG(DEBUG_ERR, (__location__ Invalid lenght/pointer for
getcap callback : %u %p\n, (unsigned)outdata.dsize, outdata.dptr));
return;
}
- ctdb-nodes[node_pnn]-capabilities = *((uint32_t *)outdata.dptr);
+ if (node_pnn ctdb-num_nodes) {
+ ctdb-nodes[node_pnn]-capabilities = *((uint32_t
*)outdata.dptr);
+ }
}
/*
@@ -1310,7 +1312,16 @@ static int recover_database(struct ctdb_recoverd *rec,
return 0;
}
-
+/*
+ reload the nodes file
+*/
+static void reload_nodes_file(struct ctdb_context *ctdb)
+{
+ ctdb-nodes = NULL;
+ ctdb_load_nodes_file(ctdb);
+}
+
+
/*
we are the recmaster, and recovery is needed - start a recovery run
*/
@@ -1328,6 +1339,12 @@ static int do_recovery(struct ctdb_recoverd *rec,
DEBUG(DEBUG_NOTICE, (__location__ Starting do_recovery\n));
+ if (ctdb-num_nodes != nodemap-num) {
+ DEBUG(DEBUG_ERR, (__location__ ctdb-num_nodes (%d) !=
nodemap-num (%d) reloading nodes file\n, ctdb-num_nodes, nodemap-num));
+ reload_nodes_file(ctdb);
+ return -1;
+ }
+
/* if recovery fails, force it again */
rec-need_recovery = true;
@@ -2527,6 +2544,11 @@ again:
/* update the list of public ips that a node can handle for
all connected nodes
*/
+ if (ctdb-num_nodes != nodemap-num) {
+ DEBUG(DEBUG_ERR, (__location__ ctdb-num_nodes (%d) !=
nodemap-num (%d) reloading nodes file\n, ctdb-num_nodes, nodemap-num));
+ reload_nodes_file(ctdb);
+ goto again;
+ }
for (j=0; jnodemap-num; j++) {
if (nodemap-nodes[j].flags NODE_FLAGS_INACTIVE) {
continue;
--
CTDB repository
[SCM] CTDB repository - tag ctdb-1.0.63 created - ctdb-1.0.62-6-g59a8796
The tag, ctdb-1.0.63 has been created at 59a879626a6a55fb6a43cadf5338c1aa6afe96d1 (commit) - Log - commit 59a879626a6a55fb6a43cadf5338c1aa6afe96d1 Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Mon Oct 20 09:47:54 2008 +1100 new version 1.0.63 --- -- CTDB repository
Build status as of Mon Oct 20 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-10-19 00:01:05.0 + +++ /home/build/master/cache/broken_results.txt 2008-10-20 00:00:24.0 + @@ -1,23 +1,23 @@ -Build status as of Sun Oct 19 00:00:02 2008 +Build status as of Mon Oct 20 00:00:02 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 31 7 0 +ccache 33 7 0 ctdb 0 0 0 distcc 1 0 0 -ldb 33 32 0 -libreplace 32 12 0 +ldb 32 32 0 +libreplace 31 12 0 lorikeet-heimdal 29 20 0 pidl 19 3 0 ppp 13 13 0 rsync33 10 0 samba-docs 0 0 0 samba-gtk8 8 0 -samba_3_X_devel 30 21 0 +samba_3_X_devel 30 20 0 samba_3_X_test 29 17 0 samba_4_0_test 32 28 1 -smb-build31 6 0 -talloc 33 32 0 -tdb 33 12 0 +smb-build29 6 0 +talloc 32 32 0 +tdb 32 14 0
