Re: [Samba] Configuring MaxMpxCount
On Fri, Jan 30, 2009 at 10:10:12PM -0800, Sudheer Kurichiyath wrote: Is it possible to configure MaxMpxCount through smb.conf or by some other means? I appreciate comments. max mux Volker pgprBJcyC2iWl.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: {Disarmed} Re: [Samba] Update: Winbind+nss working on one centOS 5.2 box but not another
Thanks Kums - I should have been clearer - the non-verbose testparm output (which doesn't show the netbios name) diffs out perfectly. The netbios names are in fact set differently and the join happens without errors. testparm -v Kums wrote: Make sure to have different Netbios Name, else only one box will be able to successfully join to AD + export Samba shares. Cheers, -Kums On Fri, Jan 23, 2009 at 1:18 AM, Ben Tisdall b...@redcircleit.com mailto:b...@redcircleit.com wrote: tim clusters wrote: What is your id backend? AD or RID? Can you post your smb.conf? Hi Tim thanks for replying. This is very minimal smb.conf - the history is that it was copied verbatim from a Guardian snap appliance worked perfectly well on 'Box A'. workgroup = OURDOMAIN security = ads server string = Samba Server Version %v netbios name = testukmcsstor1 realm = OURDOMAIN.PRIV idmap uid = 1-2 idmap gid = 1-2 ;interfaces = lo eth0 *MailScanner warning: numerical links are often malicious:* 192.168.12.2/24 http://192.168.12.2/24 *MailScanner warning: numerical links are often malicious:* 192.168.13.2/24 http://192.168.13.2/24 ;hosts allow = 127. 10 # logs split per machine log file = /var/log/samba/log.%m # max 50KB per log file, then rotate max log size = 50 preferred master = no wins support = yes ; wins server = w.x.y.z ; wins proxy = yes ; dns proxy = yes load printers = yes cups options = raw ; map archive = no ; map hidden = no ; map read only = no ; map system = no ; store dos attributes = yes Include = /etc/samba/shares.conf NB: I can testparm the conf from both boxes the output diffs perfectly. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- This message has been scanned for viruses and dangerous content by *MailScanner* http://www.mailscanner.info/, and is believed to be clean. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] mv errors.
Am Samstag, 31. Januar 2009 03:06 schrieb Athunye: Günter Kukkukk-2 wrote: that's what i've expected. These cifs vfs bugs have been fixed in a later kernel release. I was able to test that on a (somewhat more recent kernel than yours) 2.6.22.18-0.2, which was shipped with cifs vfs version 1.49. The 'mv' and 'cp -p' problems are fixed in there. Btw - you can also expect cp -p errors, when ACLs are used and the remote samba server is exporting a share on a *file system* which does not support ACLs - or is not configured to do so. (e.g. ext3 can be mounted with the acl,user_xattr option). On the cifs client side one can use the cifs mount option noacl to disable acls. So i can only recommend to update the kernels on your linux clients. Good luck! :-) We use Fluxbox with Rox-filer in the machines. I tried to install Gnome and with Nautilus it seems that the cp/mv warnings won't show up. I'll follow your tips about ACLs and mount options. I'm not sure whether I'm going to upgrade the kernel or not. (I'd have to upgrade Etch to Lenny.) Try the etchnhalf Kernel 2.6.24+* first. I believe this kernel is in etch-proposed-updates Repository Thanks a lot for your help, time and patience. (everyone) -- View this message in context: http://www.nabble.com/mv-errors.-tp21712791p21759003.html Sent from the Samba - General mailing list archive at Nabble.com. -- Gruss Harry Jede -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] User Manager for Domains -- Groups not showing
On Fri, Jan 30, 2009 at 10:27 AM, Jeremy Allison j...@samba.org wrote: On Fri, Jan 30, 2009 at 12:13:45AM -0800, Ray Klassen wrote: I have a network of about 100+ users with a Samba 3.0.25 server with an LDAP backend that I configured myself (with some help). Recently I have had to add about 300 more users to my system and now I need to get a slightly less technical person to help me manage the accounts. I've been happily using smbldap-tools all of this time, but when I showed what I do to my hapless trainee, her eyes started to glaze over. So as an alternative I'd like to start using the 'User Manager for Domains' in the SRVTOOLS.EXE archive. She might find the point and click of it all more friendly. Only thing is, when I start up User Manager, I can see all the users, but I can't see the groups. So I did a bit of checking and found that nowhere are those available as a list. Not even 'net rpc group list' will give me a list, even though if I add someone to my Domain Admins group everything works correctly. At the windows workstation end I can access the groups by name, to set the permissions of a share to certain group, etc. but I can't list them as I can the users.I've checked all the files... smb.conf,ldap.conf,slapd.conf,smbldap.conf and the Groups directive matches up with the right ldap 'ou' and so on. Has anyone any pointers? There was a bug in earlier versions of the smbldap-tools that creates groups with the wrong sid-type. I'd suggest upgrading to 3.0.34 (latest 3.0.x release) and then ensuring the group-type is changed in your LDAP db (I think it should be type 5, rather than type 4 but this could be the other way around :-). Jeremy. 3.0.34 is now installed. no change. 'net rpc list groups' returns nothing, while 'net rpc group members group' returns the correct data tried changing the group type on a few groups. no change in behavior there. cleaned up some error messages in my slapd.log where I assume samba was requesting indexes from slapd.log. just told slap.conf to index those attributes and the messages went away. Upping the loglevel in slapd.conf... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] User Manager for Domains -- Groups not showing
On Sat, Jan 31, 2009 at 6:44 AM, Ray Klassen rayklas...@gmail.com wrote: On Fri, Jan 30, 2009 at 10:27 AM, Jeremy Allison j...@samba.org wrote: On Fri, Jan 30, 2009 at 12:13:45AM -0800, Ray Klassen wrote: I have a network of about 100+ users with a Samba 3.0.25 server with an LDAP backend that I configured myself (with some help). Recently I have had to add about 300 more users to my system and now I need to get a slightly less technical person to help me manage the accounts. I've been happily using smbldap-tools all of this time, but when I showed what I do to my hapless trainee, her eyes started to glaze over. So as an alternative I'd like to start using the 'User Manager for Domains' in the SRVTOOLS.EXE archive. She might find the point and click of it all more friendly. Only thing is, when I start up User Manager, I can see all the users, but I can't see the groups. So I did a bit of checking and found that nowhere are those available as a list. Not even 'net rpc group list' will give me a list, even though if I add someone to my Domain Admins group everything works correctly. At the windows workstation end I can access the groups by name, to set the permissions of a share to certain group, etc. but I can't list them as I can the users.I've checked all the files... smb.conf,ldap.conf,slapd.conf,smbldap.conf and the Groups directive matches up with the right ldap 'ou' and so on. Has anyone any pointers? There was a bug in earlier versions of the smbldap-tools that creates groups with the wrong sid-type. I'd suggest upgrading to 3.0.34 (latest 3.0.x release) and then ensuring the group-type is changed in your LDAP db (I think it should be type 5, rather than type 4 but this could be the other way around :-). Jeremy. 3.0.34 is now installed. no change. 'net rpc list groups' returns nothing, while 'net rpc group members group' returns the correct data tried changing the group type on a few groups. no change in behavior there. cleaned up some error messages in my slapd.log where I assume samba was requesting indexes from slapd.log. just told slap.conf to index those attributes and the messages went away. Upping the loglevel in slapd.conf... looking at the slapd logging after a 'net rpc list groups' it locates 57 groups and then queries the sambaSIDList attribute on each one. (which I said earlier I wasn't set) After which it records 'bdb_search: no candidates' and thats that... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] User Manager for Domains -- Groups not showing
On Sat, Jan 31, 2009 at 7:16 AM, Ray Klassen rayklas...@gmail.com wrote: On Sat, Jan 31, 2009 at 6:44 AM, Ray Klassen rayklas...@gmail.com wrote: On Fri, Jan 30, 2009 at 10:27 AM, Jeremy Allison j...@samba.org wrote: On Fri, Jan 30, 2009 at 12:13:45AM -0800, Ray Klassen wrote: I have a network of about 100+ users with a Samba 3.0.25 server with an LDAP backend that I configured myself (with some help). Recently I have had to add about 300 more users to my system and now I need to get a slightly less technical person to help me manage the accounts. I've been happily using smbldap-tools all of this time, but when I showed what I do to my hapless trainee, her eyes started to glaze over. So as an alternative I'd like to start using the 'User Manager for Domains' in the SRVTOOLS.EXE archive. She might find the point and click of it all more friendly. Only thing is, when I start up User Manager, I can see all the users, but I can't see the groups. So I did a bit of checking and found that nowhere are those available as a list. Not even 'net rpc group list' will give me a list, even though if I add someone to my Domain Admins group everything works correctly. At the windows workstation end I can access the groups by name, to set the permissions of a share to certain group, etc. but I can't list them as I can the users.I've checked all the files... smb.conf,ldap.conf,slapd.conf,smbldap.conf and the Groups directive matches up with the right ldap 'ou' and so on. Has anyone any pointers? There was a bug in earlier versions of the smbldap-tools that creates groups with the wrong sid-type. I'd suggest upgrading to 3.0.34 (latest 3.0.x release) and then ensuring the group-type is changed in your LDAP db (I think it should be type 5, rather than type 4 but this could be the other way around :-). Jeremy. 3.0.34 is now installed. no change. 'net rpc list groups' returns nothing, while 'net rpc group members group' returns the correct data tried changing the group type on a few groups. no change in behavior there. cleaned up some error messages in my slapd.log where I assume samba was requesting indexes from slapd.log. just told slap.conf to index those attributes and the messages went away. Upping the loglevel in slapd.conf... looking at the slapd logging after a 'net rpc list groups' it locates 57 groups and then queries the sambaSIDList attribute on each one. (which I said earlier I wasn't set) After which it records 'bdb_search: no candidates' and thats that... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba did smbldap-tools get upgraded along with samba? if not, you should update them separately. if so, you will have to delete and re-create the groups in order for them to be created correctly. Another workaround would be to delete the groups and use net rpc group to re-create them. This worked for me. -wes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] User Manager for Domains -- Groups not showing
did smbldap-tools get upgraded along with samba? if not, you should update them separately. if so, you will have to delete and re-create the groups in order for them to be created correctly. Another workaround would be to delete the groups and use net rpc group to re-create them. This worked for me. I would just install LAM (http://lam.sourceforge.net) and fix the errors in the LDAP with that. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] User Manager for Domains -- Groups not showing
3.0.34 is now installed. no change. 'net rpc list groups' returns nothing, while 'net rpc group members group' returns the correct data The correct syntax is 'net rpc group list' ... -- 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 master updated - release-4-0-0alpha6-284-g412b89a
The branch, master has been updated via 412b89afbab91e3c104b012a2c1ec8b770ee6ab8 (commit) via 21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 (commit) from ae19f5acddee6d6507225c0c9a625383255a6d4c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 412b89afbab91e3c104b012a2c1ec8b770ee6ab8 Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 31 09:32:14 2009 +0100 lib/replace: move MAXHOSTNAMELEN to system/network.h Some platforms define it in netdb.h, so we should define the replace after including metdb.h. metze commit 21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 31 09:04:12 2009 +0100 s4:heimdal_build: fix the build of asn1_compile and compile_et We should not link in heimdal_build/replace.ho twice. HEIMDAL_ROKEN has everything we need metze --- Summary of changes: lib/replace/replace.h | 12 lib/replace/system/network.h |6 +- source4/heimdal_build/internal.mk |6 ++ 3 files changed, 7 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/replace.h b/lib/replace/replace.h index 688a746..c5b8676 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -503,18 +503,6 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) ? ~ (t) 0 (sizeof (t) * CHAR_BIT - 1) : (t) 0)) #define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t))) -#ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 255 -#endif - -/* - * Some older systems seem not to have MAXHOSTNAMELEN - * defined. - */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN HOST_NAME_MAX -#endif - #ifndef UINT16_MAX #define UINT16_MAX 65535 #endif diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index 473d79b..40d20db 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -271,7 +271,11 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]); #endif #ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 256 +#define HOST_NAME_MAX 255 +#endif + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN HOST_NAME_MAX #endif #ifndef HAVE_SA_FAMILY_T diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 92bef08..9e32898 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -656,7 +656,7 @@ HEIMDAL_COM_ERR_OBJ_FILES = \ # Start BINARY asn1_compile [BINARY::asn1_compile] USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN ASN1C = $(builddir)/bin/asn1_compile @@ -682,7 +682,6 @@ asn1_compile_OBJ_FILES = \ $(asn1_compile_ASN1_OBJ_FILES) \ $(heimdalsrcdir)/lib/vers/print_version.ho \ $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho $(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) @@ -700,7 +699,7 @@ $(eval $(call heimdal_proto_header_template, \ # Start BINARY compile_et [BINARY::compile_et] USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN # End BINARY compile_et ### @@ -711,7 +710,6 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ $(heimdalsrcdir)/lib/com_err/lex.ho \ $(heimdalsrcdir)/lib/com_err/compile_et.ho \ $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho $(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-285-gea157f4
The branch, master has been updated via ea157f495fec9906736ed3c79a84d9b71ae6ded3 (commit) from 412b89afbab91e3c104b012a2c1ec8b770ee6ab8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ea157f495fec9906736ed3c79a84d9b71ae6ded3 Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 31 09:44:27 2009 +0100 s4:repl_meta_data: fix segfault after ldb changes metze --- Summary of changes: source4/dsdb/samdb/ldb_modules/repl_meta_data.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 1ea1ab1..41f4e8e 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -258,7 +258,7 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req) return ldb_next_request(module, req); } - ldb = ldb_module_get_ctx(ac-module); + ldb = ldb_module_get_ctx(module); ldb_debug(ldb, LDB_DEBUG_TRACE, replmd_add\n); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-288-gcee0d85
The branch, master has been updated
via cee0d85e0b2be27d9314206f3fe832fc0c75b0f3 (commit)
via d94e9c802ceddeff93168337b6fc5533db7f2d33 (commit)
via b99859b948f31dbe474b6ce0c6cab601e7e7bc56 (commit)
from ea157f495fec9906736ed3c79a84d9b71ae6ded3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cee0d85e0b2be27d9314206f3fe832fc0c75b0f3
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 30 23:45:35 2009 +0100
make send_file_readbraw static
commit d94e9c802ceddeff93168337b6fc5533db7f2d33
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 30 23:44:21 2009 +0100
Remove the global variable chain_size
commit b99859b948f31dbe474b6ce0c6cab601e7e7bc56
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 30 23:29:37 2009 +0100
Make is_andx_req non-static
---
Summary of changes:
source3/include/proto.h |7 ++-
source3/include/smb.h|5 -
source3/include/smb_macros.h |2 +-
source3/lib/util.c |3 ---
source3/libsmb/async_smb.c | 26 --
source3/libsmb/clientgen.c | 25 +
source3/smbd/aio.c |6 ++
source3/smbd/blocking.c |7 +--
source3/smbd/process.c | 26 --
source3/smbd/reply.c | 17 +
10 files changed, 64 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d30eb09..9199d6c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2472,6 +2472,7 @@ struct async_req *cli_echo_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
NTSTATUS cli_echo_recv(struct async_req *req);
NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data);
bool cli_ucs2(struct cli_state *cli);
+bool is_andx_req(uint8_t cmd);
/* The following definitions come from libsmb/clierror.c */
@@ -7200,6 +7201,7 @@ void remove_from_common_flags2(uint32 v);
void construct_reply_common_req(struct smb_request *req, char *outbuf);
size_t req_wct_ofs(struct smb_request *req);
void chain_reply(struct smb_request *req);
+bool req_is_in_chain(struct smb_request *req);
void check_reload(time_t t);
void smbd_process(void);
@@ -7273,11 +7275,6 @@ void reply_ctemp(struct smb_request *req);
NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req,
uint32 dirtype, const char *name_in, bool has_wild);
void reply_unlink(struct smb_request *req);
-void send_file_readbraw(connection_struct *conn,
- files_struct *fsp,
- SMB_OFF_T startpos,
- size_t nread,
- ssize_t mincount);
void reply_readbraw(struct smb_request *req);
void reply_lockread(struct smb_request *req);
void reply_read(struct smb_request *req);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9451710..be6ccbf 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1550,11 +1550,6 @@ enum acl_compatibility {ACL_COMPAT_AUTO,
ACL_COMPAT_WINNT, ACL_COMPAT_WIN2K};
#define COPYBUF_SIZE (8*1024)
/*
- * Used in chaining code.
- */
-extern int chain_size;
-
-/*
* Map the Core and Extended Oplock requesst bits down
* to common bits (EXCLUSIVE_OPLOCK BATCH_OPLOCK).
*/
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 92c60a7..fd1bba1 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -135,7 +135,7 @@
/* Note that chain_size must be available as an extern int to this macro. */
-#define smb_offset(p,buf) (PTR_DIFF(p,buf+4) + chain_size)
+#define smb_offset(p,buf) (PTR_DIFF(p,buf+4))
#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)8)|((PVAL(buf,1)1)16))
#define _smb_setlen(buf,len) do { buf[0] = 0; buf[1] = ((len)0x1)16; \
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 195065a..df01c03 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -57,9 +57,6 @@ extern unsigned int global_clobber_region_line;
enum protocol_types Protocol = PROTOCOL_COREPLUS;
-/* this is used by the chaining code */
-int chain_size = 0;
-
static enum remote_arch_types ra_type = RA_UNKNOWN;
/***
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index a4bbe6d..18e5a71 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -152,32 +152,6 @@ bool cli_in_chain(struct cli_state *cli)
}
/**
- * Is the SMB command able to hold an AND_X successor
- * @param[in] cmd The SMB command in question
- * @retval Can we add a chained request after cmd?
- */
-
-static bool is_andx_req(uint8_t cmd)
-{
- switch (cmd) {
- case SMBtconX:
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-289-g582b27b
The branch, master has been updated via 582b27be242ad4453e42020cf5309293710768c4 (commit) from cee0d85e0b2be27d9314206f3fe832fc0c75b0f3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 582b27be242ad4453e42020cf5309293710768c4 Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 31 11:34:12 2009 +0100 s4:auth: try to fix the build on Solaris MAXHOSTNAMELEN comes in via system/network.h now. metze --- Summary of changes: source4/auth/ntlmssp/ntlmssp_server.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 37cc5f3..30bf159 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -22,6 +22,7 @@ */ #include includes.h +#include system/network.h #include auth/ntlmssp/ntlmssp.h #include auth/ntlmssp/msrpc_parse.h #include ../lib/crypto/crypto.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-298-gfa7ddc7
The branch, master has been updated
via fa7ddc78b8da8265096b1cc45471e1c7c96ac994 (commit)
via 72729bfaee6057c383e1b2b261893d2bd8ae9714 (commit)
via 8b480b52cef385f555ca90c804132472e2173129 (commit)
via 2d5ec28b3b065940cefdd491ad7c8fd1a58c3a5c (commit)
via 8ef92f7e32af73d0cd215e8f259ba5fcd3d9812e (commit)
via e8b2b46caeff185faef5491cbbeaf799bcd1b1ec (commit)
via c2fe28ba598e7db2915b3bb5e7b8d281361a4c95 (commit)
via b797c056a60b519da6595ce728846dace5d1dfbd (commit)
via e60d69d67d4064d4aa26644c6bca2dfc1b0f4983 (commit)
from 582b27be242ad4453e42020cf5309293710768c4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fa7ddc78b8da8265096b1cc45471e1c7c96ac994
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 16:17:25 2009 +0100
Remove unused np_read sync wrapper
commit 72729bfaee6057c383e1b2b261893d2bd8ae9714
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 14:57:52 2009 +0100
Make reply_pipe_read_andx async
commit 8b480b52cef385f555ca90c804132472e2173129
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 14:44:04 2009 +0100
Remove unused np_write sync wrapper
commit 2d5ec28b3b065940cefdd491ad7c8fd1a58c3a5c
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 14:43:06 2009 +0100
Make reply_pipe_write async
commit 8ef92f7e32af73d0cd215e8f259ba5fcd3d9812e
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 14:31:31 2009 +0100
Make reply_pipe_write_and_X async
commit e8b2b46caeff185faef5491cbbeaf799bcd1b1ec
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 14:33:38 2009 +0100
Make-np_write-handle-0-byte-writes-as-NT_STATUS_OK
commit c2fe28ba598e7db2915b3bb5e7b8d281361a4c95
Author: Volker Lendecke v...@samba.org
Date: Tue Oct 14 15:53:35 2008 +0200
Convert api_rpc_trans_reply to async np_*
commit b797c056a60b519da6595ce728846dace5d1dfbd
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 13:36:09 2009 +0100
Add an async np_read wrapper
commit e60d69d67d4064d4aa26644c6bca2dfc1b0f4983
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 31 12:43:25 2009 +0100
Add an async np_write wrapper
---
Summary of changes:
source3/include/proto.h | 13 ++-
source3/include/smb.h | 16 +++
source3/rpc_server/srv_pipe_hnd.c | 187 ++--
source3/smbd/ipc.c| 148 ++-
source3/smbd/pipes.c | 247 +---
5 files changed, 465 insertions(+), 146 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9199d6c..fd55669 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6314,10 +6314,15 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
const char *client_address,
struct auth_serversupplied_info *server_info,
struct fake_file_handle **phandle);
-NTSTATUS np_write(struct fake_file_handle *handle, const uint8_t *data,
- size_t len, ssize_t *nwritten);
-NTSTATUS np_read(struct fake_file_handle *handle, uint8_t *data, size_t len,
-ssize_t *nread, bool *is_data_outstanding);
+struct async_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+ struct fake_file_handle *handle,
+ const uint8_t *data, size_t len);
+NTSTATUS np_write_recv(struct async_req *req, ssize_t *nwritten);
+struct async_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+ struct fake_file_handle *handle,
+ uint8_t *data, size_t len);
+NTSTATUS np_read_recv(struct async_req *req, ssize_t *nread,
+ bool *is_data_outstanding);
/* The following definitions come from rpc_server/srv_samr_util.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index be6ccbf..491dd76 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -624,7 +624,18 @@ struct smb_request {
uint16_t buflen;
const uint8_t *buf;
const uint8 *inbuf;
+
+ /*
+* Async handling in the main smb processing loop is directed by
+* outbuf: reply_xxx routines indicate sync behaviour by putting their
+* reply into outbuf. If they leave it as NULL, they take of it
+* themselves, possibly later.
+*
+* If async handling is wanted, the reply_xxx routine must make sure
+* that it talloc_move()s the smb_req somewhere else.
+*/
uint8 *outbuf;
+
size_t unread_bytes;
bool encrypted;
connection_struct *conn;
@@ -638,6 +649,11 @@ struct smb_request {
* Here we collect the
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-299-g99f021d
The branch, master has been updated via 99f021d0ef5f1e8e7793c28f1c5ed03912218142 (commit) from fa7ddc78b8da8265096b1cc45471e1c7c96ac994 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 99f021d0ef5f1e8e7793c28f1c5ed03912218142 Author: Volker Lendecke v...@samba.org Date: Sun Feb 1 00:07:16 2009 +0100 Fix the build on Solaris CC --- Summary of changes: source3/rpc_server/srv_pipe_hnd.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 0a4d94f..90fa49f 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -1184,7 +1184,7 @@ static void np_write_done(struct async_req *subreq) async_req_error(req, status); return; } - return async_req_done(req); + async_req_done(req); } NTSTATUS np_write_recv(struct async_req *req, ssize_t *pnwritten) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-304-g5f13710
The branch, master has been updated
via 5f13710ced2565355c3cdcef04067cacdf74a9ad (commit)
via 96f176dbd84090fd18b8c796f869ddaa2da39e59 (commit)
via f3f2dfc51a25080290e13ed1d1f8c85932e0be31 (commit)
via 15239f742cfcebe0bce4dbf4cb74eb2e8dcab364 (commit)
via 06a24497dc167853bbd2171e50945595a62c5623 (commit)
from 99f021d0ef5f1e8e7793c28f1c5ed03912218142 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5f13710ced2565355c3cdcef04067cacdf74a9ad
Author: Stefan Metzmacher me...@samba.org
Date: Sun Feb 1 00:03:47 2009 +0100
s4:irpc: avoid c++ reserved word 'private'
metze
commit 96f176dbd84090fd18b8c796f869ddaa2da39e59
Author: Stefan Metzmacher me...@samba.org
Date: Sun Feb 1 00:02:17 2009 +0100
s4:lib/messaging: fix warnings in testsuite
metze
commit f3f2dfc51a25080290e13ed1d1f8c85932e0be31
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 31 23:57:02 2009 +0100
s4:lib/messaging: avoid c++ reserved word 'private'
metze
commit 15239f742cfcebe0bce4dbf4cb74eb2e8dcab364
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 31 23:43:43 2009 +0100
s4:kdc: avoid c++ reserved word 'private'
metze
commit 06a24497dc167853bbd2171e50945595a62c5623
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 31 23:32:01 2009 +0100
s4:nbt_server/wins/: fix compiler warnings in winsdb.c
metze
---
Summary of changes:
source4/kdc/hdb-samba4.c | 52 ++--
source4/kdc/kdc.c | 15
source4/kdc/pac-glue.c | 34 +-
source4/lib/messaging/irpc.h | 18 +-
source4/lib/messaging/messaging.c | 42 +++---
source4/lib/messaging/tests/irpc.c | 12 +++---
source4/libcli/composite/composite.c |2 +-
source4/libcli/finddcs.c |2 +-
source4/libcli/wbclient/wbclient.c |4 +-
source4/nbt_server/irpc.c |5 ++-
source4/nbt_server/wins/winsdb.c |2 +-
source4/nbt_server/wins/winswack.c |4 +-
source4/smb_server/management.c|6 ++-
source4/winbind/wb_irpc.c |4 +-
source4/wrepl_server/wrepl_apply_records.c | 12 +++---
source4/wrepl_server/wrepl_scavenging.c|4 +-
16 files changed, 111 insertions(+), 107 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 937839d..daeed77 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -186,9 +186,9 @@ static HDBFlags uf2HDBFlags(krb5_context context, int
userAccountControl, enum h
return flags;
}
-static int hdb_ldb_destructor(struct hdb_ldb_private *private)
+static int hdb_ldb_destructor(struct hdb_ldb_private *p)
{
-hdb_entry_ex *entry_ex = private-entry_ex;
+hdb_entry_ex *entry_ex = p-entry_ex;
free_hdb_entry(entry_ex-entry);
return 0;
}
@@ -509,7 +509,7 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
nCName,
ldb_dn_new(mem_ctx,
(struct ldb_context *)db-hdb_db, NULL));
- struct hdb_ldb_private *private;
+ struct hdb_ldb_private *p;
NTTIME acct_expiry;
struct ldb_message_element *objectclasses;
@@ -531,19 +531,19 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
goto out;
}
- private = talloc(mem_ctx, struct hdb_ldb_private);
- if (!private) {
+ p = talloc(mem_ctx, struct hdb_ldb_private);
+ if (!p) {
ret = ENOMEM;
goto out;
}
- private-entry_ex = entry_ex;
- private-iconv_convenience = lp_iconv_convenience(lp_ctx);
- private-netbios_name = lp_netbios_name(lp_ctx);
+ p-entry_ex = entry_ex;
+ p-iconv_convenience = lp_iconv_convenience(lp_ctx);
+ p-netbios_name = lp_netbios_name(lp_ctx);
- talloc_set_destructor(private, hdb_ldb_destructor);
+ talloc_set_destructor(p, hdb_ldb_destructor);
- entry_ex-ctx = private;
+ entry_ex-ctx = p;
entry_ex-free_entry = hdb_ldb_free_entry;
userAccountControl = ldb_msg_find_attr_as_uint(msg,
userAccountControl, 0);
@@ -655,7 +655,7 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
entry_ex-entry.generation = NULL;
/* Get keys from the db */
- ret = LDB_message2entry_keys(context, private-iconv_convenience,
private, msg, userAccountControl, entry_ex);
+ ret = LDB_message2entry_keys(context, p-iconv_convenience,
Build status as of Sun Feb 1 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-01-31 00:00:11.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-01 00:00:40.0 + @@ -1,4 +1,4 @@ -Build status as of Sat Jan 31 00:00:02 2009 +Build status as of Sun Feb 1 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -9,14 +9,14 @@ ldb 29 29 0 libreplace 28 10 0 lorikeet-heimdal 26 16 0 -pidl 18 4 0 +pidl 18 3 0 ppp 11 0 0 -rsync27 9 0 +rsync29 9 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_X_devel 27 26 0 +samba_3_X_devel 27 24 0 samba_3_X_test 27 23 0 -samba_4_0_test 29 27 1 +samba_4_0_test 29 25 1 smb-build27 6 0 talloc 29 29 0 tdb 27 8 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-305-ga5e570b
The branch, master has been updated
via a5e570b56205f64fd330f0ac1fda9884a5ea8311 (commit)
from 5f13710ced2565355c3cdcef04067cacdf74a9ad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a5e570b56205f64fd330f0ac1fda9884a5ea8311
Author: Simo Sorce i...@samba.org
Date: Sat Jan 31 20:00:15 2009 -0500
Start restoring the sqlite3 backend
Passes many tests but not all yet.
---
Summary of changes:
source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c | 677 +++--
1 files changed, 357 insertions(+), 320 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 39a77a5..8acbac4 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -1,23 +1,23 @@
-/*
+/*
ldb database library
-
+
Copyright (C) Derrell Lipman 2005
- Copyright (C) Simo Sorce 2005-2006
-
+ Copyright (C) Simo Sorce 2005-2009
+
** NOTE! The following LGPL license applies to the ldb
** library. This does NOT imply that all of Samba is released
** under the LGPL
-
+
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
Lesser 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/.
*/
@@ -50,6 +50,9 @@ struct lsql_context {
long long current_eid;
const char * const * attrs;
struct ldb_reply *ares;
+
+ bool callback_failed;
+ struct tevent_timer *timeout_event;
};
/*
@@ -63,7 +66,8 @@ struct lsql_context {
#define RESULT_ATTR_TABLE temp_result_attrs
-//#define TEMPTAB /* for testing, create non-temporary table */
+
+/* for testing, define to nothing, (create non-temporary table) */
#define TEMPTAB TEMPORARY
/*
@@ -144,7 +148,7 @@ base160_sql(sqlite3_context * hContext,
val = sqlite3_value_int64(argv[0]);
for (i = 3; i = 0; i--) {
-
+
result[i] = base160tab[val % 160];
val /= 160;
}
@@ -244,6 +248,7 @@ static char *parsetree_to_sql(struct ldb_module *module,
void *mem_ctx,
const struct ldb_parse_tree *t)
{
+ struct ldb_context *ldb;
const struct ldb_schema_attribute *a;
struct ldb_val value, subval;
char *wild_card_string;
@@ -252,6 +257,7 @@ static char *parsetree_to_sql(struct ldb_module *module,
char *attr;
int i;
+ ldb = ldb_module_get_ctx(module);
switch(t-operation) {
case LDB_OP_AND:
@@ -271,7 +277,7 @@ static char *parsetree_to_sql(struct ldb_module *module,
ret = talloc_asprintf(mem_ctx, SELECT * FROM ( %s )\n, tmp);
return ret;
-
+
case LDB_OP_OR:
tmp = parsetree_to_sql(module, mem_ctx, t-u.list.elements[0]);
@@ -304,10 +310,10 @@ static char *parsetree_to_sql(struct ldb_module *module,
*/
attr = ldb_attr_casefold(mem_ctx, t-u.equality.attr);
if (attr == NULL) return NULL;
- a = ldb_schema_attribute_by_name(module-ldb, attr);
+ a = ldb_schema_attribute_by_name(ldb, attr);
/* Get a canonicalised copy of the data */
- a-syntax-canonicalise_fn(module-ldb, mem_ctx,
(t-u.equality.value), value);
+ a-syntax-canonicalise_fn(ldb, mem_ctx,
(t-u.equality.value), value);
if (value.data == NULL) {
return NULL;
}
@@ -315,7 +321,7 @@ static char *parsetree_to_sql(struct ldb_module *module,
if (strcasecmp(t-u.equality.attr, dn) == 0) {
/* DN query is a special ldb case */
const char *cdn = ldb_dn_get_casefold(
- ldb_dn_new(mem_ctx, module-ldb,
+ ldb_dn_new(mem_ctx, ldb,
(const char
*)value.data));
return lsqlite3_tprintf(mem_ctx,
@@ -352,13 +358,13 @@ static char *parsetree_to_sql(struct ldb_module *module,
attr = ldb_attr_casefold(mem_ctx,
