AW: [Samba] Running SQL over SAMBA?
Hello Jeremy, with all respect but this will not work. Microsoft specifically excluded the ability to store SQL on any network share. You can only place SQL and Exchange (not PST files) on local drives (block based). The only way to get SQL or Exchange running over Ethernet is via iSCSI (block based) and not on NAS. You could modify the registry to place SQL and Exchange on a network share but this will eliminate any support from Microsoft if there would be any issue. Best regards, Pseudomizer -Ursprüngliche Nachricht- Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Im Auftrag von Jeremy Allison Gesendet: Montag, 27. März 2006 12:07 An: Ephi Dror Cc: samba@lists.samba.org Betreff: Re: [Samba] Running SQL over SAMBA? On Mon, Mar 27, 2006 at 09:50:31AM -0800, Ephi Dror wrote: Hi All, Does anyone run SQL and/or exchange on SAMBA server share? Are there any special considerations to take? would you be kind enough to share your experience doing it? Any special smb.conf configuration is required? is there any performance issue or functional limitations supporting it? I am just wondering since Microsoft encourages block level access over share/file level access. http://support.microsoft.com/default.aspx?scid=kb;en-us;304261 Microsoft generally recommends that you use a Storage Area Network (SAN) or locally attached disk for the storage of your Microsoft SQL Server database files because this configuration optimizes SQL Server performance and reliability. By default, use of network database files (stored on a networked server or Network Attached Storage [NAS]) is not enabled for SQL Server. However, you can configure SQL Server to store a database on a networked server or NAS storage server. Servers used for this purpose must meet SQL Server requirements for data write ordering and write-through guarantees detailed in the More Information section of this article. . http://support.microsoft.com/kb/234656/ All versions of SQL Server open the log and data files using the Win32 CreateFile function. The dwFlagsAndAttributes member includes the FILE_FLAG_WRITE_THROUGH option when opened by SQL Server. All comments are welcome and highly appreciated. Should work. If you have problems let us know and we'll fix 'em. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Running SQL over SAMBA?
On Sun, Apr 02, 2006 at 07:11:37AM -0700, Pseudomizer wrote: Hello Jeremy, with all respect but this will not work. Microsoft specifically excluded the ability to store SQL on any network share. You can only place SQL and Exchange (not PST files) on local drives (block based). The only way to get SQL or Exchange running over Ethernet is via iSCSI (block based) and not on NAS. You could modify the registry to place SQL and Exchange on a network share but this will eliminate any support from Microsoft if there would be any issue. Well I didn't say it was supported by Microsoft, I said it should work from a Samba point of view :-). Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: problem with showing title of the share
Add this line to your smb.conf: server string = put_some_text_here Steve :) -- Paul wrote: Hello I have the following problem: I mapped my share on linux (with samba) with a letter Z: . how can I change title when accessing this share from My computer in WinXP. This title is : share_name on Samba 3.0.4-SUSE (address ip) (Z:) Smb.conf server string = Server announce as = linux announce version = 5.1 Samba was installed from rpm. Is there anything I can do to change this title? I would like this title to appear like: share_name on linux (ip_addres) (Z: ) Thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Where are the privileges saved
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gernot Poerner wrote: Hi all, short question about privileges. If I grant privileges, for example to the Domain Admins group, where does samba save them? I ask because I upgraded from 3.0.20b to 3.0.21c a few days ago and after that my privileges where gone. I did not find this in the archives or in the documentation. My setup consists of one PDC, one BDC and the LDAP backend (OpenLDAP 2.2.24 and smbldap-tools 0.9.1 on SUSE SLES9. It's documented in several places. account_policy.tdb. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEMCT+IR7qMdg1EfYRAlVeAJ4u2ldfFaI5KGOLwSh5tE1Y4JTekACfV3iG KOIEc2vBYGFBaTz6ADPuSIA= =HBGk -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Issue with passdb.tdb
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Patrick wrote: Hello, During a re-start of Samba I got the following error: [2006/03/22 12:36:14, 0] passdb/pdb_tdb.c:tdbsam_tdbopen(196) Unable to open/create TDB passwd [2006/03/22 12:36:14, 0] passdb/pdb_tdb.c:tdbsam_getsampwrid(490) pdb_getsampwrid: Unable to open TDB rid database! The result is a new password file. Please retest against 3.0.21c. It's more stable anyways. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEMCVLIR7qMdg1EfYRAseRAKDDAK6Jp3Ko8mKKiWvedDDjlPKpYQCg7J0G Ld2ut5b7RGo21tlSWHYHv80= =DLsP -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.21c and big wmv or mpg files
At 03:15 PM 4/1/2006 +0200, Thomas Bork wrote: Tom Peters wrote: Tell me, do you get this problem when you drag/n/drop a file into a folder on the samba share? And can you prevent this problem from occurring by the following procedure? I cannot see the problem here but heared from 2 users of 3.0.21c with this problem. Downloaded a file with 843 MB which reproducable triggered the error by one of the users - but not on my system. We are using the _same_ samba version (built by me) on the same distribution: http://www.eisfair.org/ http://www.pack-eis.de/index.php?p=samba I'm the maintainer of this samba package and therefore interested in to correct this. Click in the target window on the samba machine (this is on the XP desktop). Press F5 to refresh the view. Wait about a second. Immediately start your copy. When I do this, the errors, previously reported to the desktop and to my server log, don't occur. The user copies the file with: - right click to the local file and 'copy' - right click in the share and 'insert' This procedure is the same as drag-and-drop from WinXP point of view. In English I believe the options are 'copy' and 'paste' rather than 'copy' and 'insert' but it's does the same as drag and drop in this context. I've been told that it's a WinXP only issue, that it attempts to connect on ports 445 and 139 nearly simultaneously, and then proceeds to talk over whichever one answers first. I'm told that Win2k clients won't have this problem, and Win98 clients don't use port 445 so it doesn't arise there. How did you adjusted your clients? On tab 'WINS'/Netbios properties (all translated from german): TCP/IP properties/Default or TCP/IP properties/Enable Netbios over TCP/IP Up to this moment, they had been TCP/IP properties/Default. I have changed it to Enable NetBIOS over TCP/IP. While copying the wmv test file a have a cpu utilization of 95! percent (top) of smbd at the time, samba creates the sparse (?) file in the size needed for the test file. I don't believe this happens in my case. I am not certain. I know that when it fails, Windows clients see a 0 bytes file with the name of the destination in the target share. You have to erase or overwrite it when you try again. Maybe this is problematical on smaller systems. Samba is running here on an VMWARE on top of XP (the test client) with P4 3,2 GHz: deveis # cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Intel(R) Pentium(R) 4 CPU 3.20GHz stepping: 8 cpu MHz : 3193.393 cache size : 0 KB fdiv_bug: no hlt_bug : no f00f_bug: no coma_bug: no fpu : yes fpu_exception : yes cpuid level : 5 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss pni ds_cpl bogomips: 6370.09 By the user of the test file the sparse file with the correct size will be created but is complete empty... I would need to force a failure of this type and examine the size of the target file on the Linux side. WinXP says its empty and zero-length. der tom [Philosophy] I loathe people who keep dogs. They are cowards who haven't the guts to bite people themselves. --August Strindberg --... ...-- -.. . -. . --.- --.- -... [EMAIL PROTECTED] (remove nospam) N9QQB (amateur radio) HEY YOU (loud shouting) WEB ADDRESS http//www.mixweb.com/tpeters 43° 7' 17.2 N by 88° 6' 28.9 W, Elevation 815', Grid Square EN53wc WAN/LAN/Telcom Analyst, Tech Writer, MCP, CCNA, Registered Linux User 385531 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba with on access file scanning
hi there, i'm currently running a CentOS samba server and i'm looking at getting clamav to do on-access scanning of files. can someone point me in the direction of a how-to for setting this up? or what programs should be used? do i need to install samba-vscan? or something of that nature? is there a package called samba-vscan if so why can't i install it via 'yum install *samba-vscan*'? any information on this topical at all would be helpful. Paul Matthews I.T Trainee | The Cathedral School Ph (07) 47222 194 | Fax (07) 47222 111 PO Box 944 Aitkenvale Q 4814 E: [EMAIL PROTECTED] W: www.cathedral.qld.edu.au Anglican coeducation | Day and Boarding | Early Childhood to Year 12 Educating for life-long success *** IMPORTANT NOTICE REGARDING CONFIDENTIALITY This electronic email message is intended only for the addressee and may contain confidential information. If you are not the addressee, you are notified that any transmission, distribution or photocopying of this email is strictly prohibited. The confidentiality attached to this email is not waived, lost or destroyed by reasons of a mistaken delivery to you. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r14856 - in branches/SAMBA_4_0/source/kdc: .
Author: metze
Date: 2006-04-02 11:15:59 + (Sun, 02 Apr 2006)
New Revision: 14856
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14856
Log:
fix bugs noticed by the ibm code checker
metze
Modified:
branches/SAMBA_4_0/source/kdc/kpasswdd.c
Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kpasswdd.c
===
--- branches/SAMBA_4_0/source/kdc/kpasswdd.c2006-04-02 06:25:11 UTC (rev
14855)
+++ branches/SAMBA_4_0/source/kdc/kpasswdd.c2006-04-02 11:15:59 UTC (rev
14856)
@@ -124,7 +124,7 @@
Not permitted to change
password,
error_blob);
}
- if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) {
+ if (dominfo NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION))
{
const char *reject_string;
switch (reject_reason) {
case SAMR_REJECT_TOO_SHORT:
@@ -233,8 +233,8 @@
case KRB5_KPASSWD_VERS_SETPW:
{
NTSTATUS status;
- enum samr_RejectReason reject_reason;
- struct samr_DomInfo1 *dominfo;
+ enum samr_RejectReason reject_reason = SAMR_REJECT_OTHER;
+ struct samr_DomInfo1 *dominfo = NULL;
struct ldb_context *samdb;
struct ldb_message *msg;
krb5_context context = kdc-smb_krb5_context-krb5_context;
@@ -321,8 +321,8 @@
status = NT_STATUS_TRANSACTION_ABORTED;
return kpasswd_make_pwchange_reply(kdc, mem_ctx,
status,
- reject_reason,
- dominfo,
+ SAMR_REJECT_OTHER,
+ NULL,
reply);
}
@@ -334,8 +334,8 @@
ldb_transaction_cancel(samdb);
return kpasswd_make_pwchange_reply(kdc, mem_ctx,
status,
- reject_reason,
- dominfo,
+ SAMR_REJECT_OTHER,
+ NULL,
reply);
}
@@ -412,7 +412,9 @@
uint16_t krb_priv_len;
uint16_t version;
NTSTATUS nt_status;
- DATA_BLOB ap_req, krb_priv_req, krb_priv_rep, ap_rep;
+ DATA_BLOB ap_req, krb_priv_req;
+ DATA_BLOB krb_priv_rep = data_blob(NULL, 0);
+ DATA_BLOB ap_rep = data_blob(NULL, 0);
DATA_BLOB kpasswd_req, kpasswd_rep;
struct cli_credentials *server_credentials;
struct gensec_security *gensec_security;
svn commit: samba r14857 - in branches/SAMBA_4_0/source/ldap_server: .
Author: metze
Date: 2006-04-02 11:17:07 + (Sun, 02 Apr 2006)
New Revision: 14857
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14857
Log:
fix bugs noticed by the ibm code checker
metze
Modified:
branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2006-04-02
11:15:59 UTC (rev 14856)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2006-04-02
11:17:07 UTC (rev 14857)
@@ -123,8 +123,8 @@
const char **attrs = NULL;
const char *errstr = NULL;
int success_limit = 1;
- int result = LDAP_SUCCESS;
- int ldb_ret;
+ int result = -1;
+ int ldb_ret = -1;
int i, j;
DEBUG(10, (SearchRequest));
@@ -227,7 +227,8 @@
done-dn = NULL;
done-referral = NULL;
- if (ldb_ret == LDB_SUCCESS) {
+ if (result != -1) {
+ } else if (ldb_ret == LDB_SUCCESS) {
if (res-count = success_limit) {
DEBUG(10,(SearchRequest: results: [%d]\n,
res-count));
result = LDAP_SUCCESS;
svn commit: samba r14858 - in branches/SAMBA_4_0/source/utils: .
Author: metze
Date: 2006-04-02 11:18:34 + (Sun, 02 Apr 2006)
New Revision: 14858
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14858
Log:
fix bugs noticed by the ibm code checker
metze
Modified:
branches/SAMBA_4_0/source/utils/getntacl.c
branches/SAMBA_4_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/utils/getntacl.c
===
--- branches/SAMBA_4_0/source/utils/getntacl.c 2006-04-02 11:17:07 UTC (rev
14857)
+++ branches/SAMBA_4_0/source/utils/getntacl.c 2006-04-02 11:18:34 UTC (rev
14858)
@@ -65,12 +65,12 @@
}
blob.data = talloc_size(*ntacl, size);
- blob.length = getxattr(filename, XATTR_NTACL_NAME, blob.data, size);
-
- if (blob.length 0) {
+ size = getxattr(filename, XATTR_NTACL_NAME, blob.data, size);
+ if (size 0) {
fprintf(stderr, get_ntacl: %s\n, strerror(errno));
return NT_STATUS_INTERNAL_ERROR;
}
+ blob.length = size;
ndr = ndr_pull_init_blob(blob, NULL);
Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c 2006-04-02 11:17:07 UTC (rev
14857)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2006-04-02 11:18:34 UTC (rev
14858)
@@ -455,7 +455,8 @@
char *grouplist = NULL;
struct auth_session_info *session_info;
- if (!NT_STATUS_IS_OK(gensec_session_info(state-gensec_state,
session_info))) {
+ nt_status = gensec_session_info(state-gensec_state,
session_info);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(1, (gensec_session_info failed: %s\n,
nt_errstr(nt_status)));
mux_printf(mux_id, BH %s\n, nt_errstr(nt_status));
data_blob_free(in);
@@ -759,7 +760,7 @@
stdio_helper_function fn, void **private2)
{
char buf[SQUID_BUFFER_SIZE+1];
- unsigned int mux_id;
+ unsigned int mux_id = 0;
int length;
char *c;
static BOOL err;
svn commit: samba r14859 - in branches/SAMBA_4_0/source/libcli/raw: .
Author: metze
Date: 2006-04-02 11:19:21 + (Sun, 02 Apr 2006)
New Revision: 14859
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14859
Log:
fix bugs noticed by the ibm code checker
metze
Modified:
branches/SAMBA_4_0/source/libcli/raw/rawrequest.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawrequest.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawrequest.c 2006-04-02 11:18:34 UTC
(rev 14858)
+++ branches/SAMBA_4_0/source/libcli/raw/rawrequest.c 2006-04-02 11:19:21 UTC
(rev 14859)
@@ -850,13 +850,17 @@
int extra;
dest-s = NULL;
- /* this is here to cope with SMB2 calls using the SMB
- parsers. SMB2 will pass smbcli_session==NULL, which forces
- unicode on (as used by SMB2) */
- if (session == NULL !(flags STR_ASCII)) {
- flags |= STR_UNICODE;
+ if (!(flags STR_ASCII)) {
+ /* this is here to cope with SMB2 calls using the SMB
+ parsers. SMB2 will pass smbcli_session==NULL, which forces
+ unicode on (as used by SMB2) */
+ if (session == NULL) {
+ flags |= STR_UNICODE;
+ } else if (session-transport-negotiate.capabilities
CAP_UNICODE) {
+ flags |= STR_UNICODE;
+ }
}
-
+
if (flags STR_LEN8BIT) {
if (len_offset blob-length-1) {
return 0;
@@ -870,9 +874,7 @@
}
extra = 0;
dest-s = NULL;
- if (!(flags STR_ASCII)
- ((flags STR_UNICODE) ||
-(session-transport-negotiate.capabilities CAP_UNICODE))) {
+ if (!(flags STR_ASCII) (flags STR_UNICODE)) {
int align = 0;
if ((str_offset1) !(flags STR_NOALIGN)) {
align = 1;
svn commit: samba r14860 - in branches/SAMBA_4_0/source: auth client dsdb/samdb dsdb/samdb/ldb_modules lib/ldb/samba lib/samba3 libcli/cldap libcli/security libcli/smb_composite libcli/util libnet ntv
Author: metze Date: 2006-04-02 12:02:01 + (Sun, 02 Apr 2006) New Revision: 14860 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14860 Log: create libcli/security/security.h metze Added: branches/SAMBA_4_0/source/libcli/security/security.h Modified: branches/SAMBA_4_0/source/auth/auth_developer.c branches/SAMBA_4_0/source/auth/auth_sam.c branches/SAMBA_4_0/source/auth/auth_sam_reply.c branches/SAMBA_4_0/source/auth/auth_util.c branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c branches/SAMBA_4_0/source/lib/samba3/group.c branches/SAMBA_4_0/source/lib/samba3/idmap.c branches/SAMBA_4_0/source/libcli/cldap/cldap.c branches/SAMBA_4_0/source/libcli/security/access_check.c branches/SAMBA_4_0/source/libcli/security/sddl.c branches/SAMBA_4_0/source/libcli/security/security_descriptor.c branches/SAMBA_4_0/source/libcli/security/security_token.c branches/SAMBA_4_0/source/libcli/smb_composite/appendacl.c branches/SAMBA_4_0/source/libcli/util/clilsa.c branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c branches/SAMBA_4_0/source/libnet/userinfo.c branches/SAMBA_4_0/source/ntvfs/common/sidmap.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c branches/SAMBA_4_0/source/torture/auth/pac.c branches/SAMBA_4_0/source/torture/libnet/userinfo.c branches/SAMBA_4_0/source/torture/local/sddl.c branches/SAMBA_4_0/source/torture/raw/acls.c branches/SAMBA_4_0/source/torture/raw/composite.c branches/SAMBA_4_0/source/torture/rpc/lsa.c branches/SAMBA_4_0/source/torture/rpc/lsa_lookup.c branches/SAMBA_4_0/source/torture/rpc/rpc.c branches/SAMBA_4_0/source/torture/rpc/samr.c branches/SAMBA_4_0/source/torture/rpc/samsync.c branches/SAMBA_4_0/source/torture/rpc/schannel.c branches/SAMBA_4_0/source/torture/rpc/testjoin.c branches/SAMBA_4_0/source/torture/rpc/winreg.c branches/SAMBA_4_0/source/winbind/wb_async_helpers.c branches/SAMBA_4_0/source/winbind/wb_cmd_lookupsid.c branches/SAMBA_4_0/source/winbind/wb_cmd_userdomgroups.c branches/SAMBA_4_0/source/winbind/wb_cmd_usersids.c branches/SAMBA_4_0/source/winbind/wb_connect_sam.c branches/SAMBA_4_0/source/winbind/wb_dom_info.c branches/SAMBA_4_0/source/winbind/wb_dom_info_trusted.c branches/SAMBA_4_0/source/winbind/wb_init_domain.c branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c branches/SAMBA_4_0/source/winbind/wb_sid2domain.c Changeset: Sorry, the patch is too large (777 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14860
Re: svn commit: samba r14853 - in trunk/source/smbd: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Log: When going through ipc, trans2 and nttrans I had started from the 3_0 ipc.c. Fix the bug in the 3 new implementations that Jeremy just fixed in 3_0/smbd/ipc.c. Modified: trunk/source/smbd/ipc.c === --- trunk/source/smbd/ipc.c 2006-04-01 18:41:07 UTC (rev 14852) +++ trunk/source/smbd/ipc.c 2006-04-01 19:17:07 UTC (rev 14853) @@ -638,7 +638,7 @@ goto bad_param; if (pdisp state-total_param) goto bad_param; - if ((smb_base(inbuf) + poff + pcnt = inbuf + size) || + if ((smb_base(inbuf) + poff + pcnt inbuf + size) || (smb_base(inbuf) + poff + pcnt smb_base(inbuf))) goto bad_param; if (state-param + pdisp state-param) wouldn't it be better to define some macros, and use them, so only one place needs to be updated...? metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEL8JAm70gjA5TCD8RAnAkAKCkVxWZaw0mKkUhQJtkKKiYIcPoTQCgycDq doUT6i6enXYfDtVM5MkYR3w= =ik0Y -END PGP SIGNATURE-
svn commit: samba r14861 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: metze
Date: 2006-04-02 12:24:43 + (Sun, 02 Apr 2006)
New Revision: 14861
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14861
Log:
regenerate the proto headers when the .mk file changes
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-02
12:02:01 UTC (rev 14860)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-02
12:24:43 UTC (rev 14861)
@@ -191,6 +191,7 @@
$input-{$name}{NAME} = $name;
$input-{$name}{TYPE} = $type;
+ $input-{$name}{MK_FILE} = $srcdir./.$filename;
$input-{$name}{BASEDIR} = dirname($filename);
foreach my $key (values %{$result-{$section}}) {
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-02
12:02:01 UTC (rev 14860)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-02
12:24:43 UTC (rev 14861)
@@ -493,7 +493,7 @@
$ctx-{PUBLIC_PROTO_HEADER} = $ctx-{PRIVATE_PROTO_HEADER};
}
- $self-output($dir/$ctx-{PUBLIC_PROTO_HEADER}:
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST:.o=.c)\n);
+ $self-output($dir/$ctx-{PUBLIC_PROTO_HEADER}: $ctx-{MK_FILE}
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST:.o=.c)\n);
$self-output([EMAIL PROTECTED] \$comment\\n);
$self-output([EMAIL PROTECTED](PERL) \$(srcdir)/script/mkproto.pl
--private=$dir/$ctx-{PRIVATE_PROTO_HEADER}
--public=$dir/$ctx-{PUBLIC_PROTO_HEADER}
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST)\n\n);
svn commit: samba r14862 - in trunk/source: .
Author: metze Date: 2006-04-02 12:28:57 + (Sun, 02 Apr 2006) New Revision: 14862 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14862 Log: try to make the generation of bin/timelimit more portable jerry: can you test that please metze Modified: trunk/source/Makefile.in Changeset: Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2006-04-02 12:24:43 UTC (rev 14861) +++ trunk/source/Makefile.in2006-04-02 12:28:57 UTC (rev 14862) @@ -1424,8 +1424,9 @@ bin/[EMAIL PROTECTED]@: lib/snprintf.c $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm -bin/[EMAIL PROTECTED]@: script/tests/timelimit.c - $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c +bin/[EMAIL PROTECTED]@: script/tests/timelimit.o + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
svn commit: samba r14863 - in branches/SAMBA_3_0/source: .
Author: metze Date: 2006-04-02 12:29:13 + (Sun, 02 Apr 2006) New Revision: 14863 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14863 Log: try to make the generation of bin/timelimit more portable jerry: can you test that please metze Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-04-02 12:28:57 UTC (rev 14862) +++ branches/SAMBA_3_0/source/Makefile.in 2006-04-02 12:29:13 UTC (rev 14863) @@ -1395,8 +1395,9 @@ bin/[EMAIL PROTECTED]@: lib/snprintf.c $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm -bin/[EMAIL PROTECTED]@: script/tests/timelimit.c - $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c +bin/[EMAIL PROTECTED]@: script/tests/timelimit.o + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
svn commit: samba r14865 - in branches/SAMBA_3_0/source/script/tests: .
Author: metze Date: 2006-04-02 12:52:59 + (Sun, 02 Apr 2006) New Revision: 14865 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14865 Log: - enforce timelimits for the tests - and skip some long tests for now metze Modified: branches/SAMBA_3_0/source/script/tests/selftest.sh branches/SAMBA_3_0/source/script/tests/test_functions.sh branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh Changeset: Modified: branches/SAMBA_3_0/source/script/tests/selftest.sh === --- branches/SAMBA_3_0/source/script/tests/selftest.sh 2006-04-02 12:52:47 UTC (rev 14864) +++ branches/SAMBA_3_0/source/script/tests/selftest.sh 2006-04-02 12:52:59 UTC (rev 14865) @@ -21,6 +21,7 @@ if [ -z $TORTURE_MAXTIME ]; then TORTURE_MAXTIME=300 fi +export TORTURE_MAXTIME ## ## setup the various environment variables we need Modified: branches/SAMBA_3_0/source/script/tests/test_functions.sh === --- branches/SAMBA_3_0/source/script/tests/test_functions.sh2006-04-02 12:52:47 UTC (rev 14864) +++ branches/SAMBA_3_0/source/script/tests/test_functions.sh2006-04-02 12:52:59 UTC (rev 14865) @@ -161,7 +161,10 @@ return 1 fi - ( $cmdline $TEST_LOG 21 ) + if [ -z $TORTURE_MAXTIME ];then + TORTURE_MAXTIME=300 + fi + ( timelimit $TORTURE_MAXTIME $cmdline $TEST_LOG 21 ) status=$? if [ x$status != x0 ]; then echo TEST OUTPUT: Modified: branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh === --- branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-04-02 12:52:47 UTC (rev 14864) +++ branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-04-02 12:52:59 UTC (rev 14865) @@ -34,7 +34,7 @@ tests=$base -skipped=BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV +skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-OPENATTR BASE-TCONDEV echo WARNING: Skipping tests $skipped @@ -55,7 +55,7 @@ fi start= name=$t -testit $name $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U$username%$password $t || failed=`expr $failed + 1` +testit $name $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U$username%$password $t || failed=`expr $failed + 1` done testok $0 $failed
svn commit: samba r14866 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: jelmer Date: 2006-04-02 14:43:15 + (Sun, 02 Apr 2006) New Revision: 14866 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14866 Log: Fix CFLAGS when building compile_et. This should fix the build on some of the buildfarm hosts. Thanks to Richard Bollinger [EMAIL PROTECTED] for helping debug this. Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk === --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-02 12:52:59 UTC (rev 14865) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-02 14:43:15 UTC (rev 14866) @@ -403,6 +403,10 @@ ### # Start BINARY compile_et [BINARY::compile_et] +EXTRA_CFLAGS = \ + -Iheimdal_build -Iheimdal/lib/com_err \ + -Iheimdal/kdc -Iheimdal/lib/des \ + -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/com_err/lex.ho \ ../heimdal/lib/com_err/parse.ho \
svn commit: samba r14867 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl/Samba4 lib/Parse/Pidl/Samba4/NDR tests
Author: jelmer
Date: 2006-04-02 16:26:02 + (Sun, 02 Apr 2006)
New Revision: 14867
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14867
Log:
Include stdbool.h in external compiles
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
branches/SAMBA_4_0/source/pidl/tests/Util.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
2006-04-02 14:43:15 UTC (rev 14866)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
2006-04-02 16:26:02 UTC (rev 14867)
@@ -105,6 +105,7 @@
} else {
$res .= #define _GNU_SOURCE\n;
$res .= #include stdio.h\n;
+ $res .= #include stdbool.h\n;
$res .= #include stdlib.h\n;
$res .= #include stdint.h\n;
$res .= #include stdarg.h\n;
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
2006-04-02 14:43:15 UTC (rev 14866)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
2006-04-02 16:26:02 UTC (rev 14867)
@@ -2356,6 +2356,7 @@
pidl #include stdint.h;
pidl #include stdlib.h;
pidl #include stdio.h;
+ pidl #include stdbool.h;
pidl #include stdarg.h;
pidl #include string.h;
}
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm 2006-04-02
14:43:15 UTC (rev 14866)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm 2006-04-02
16:26:02 UTC (rev 14867)
@@ -242,6 +242,7 @@
pidl #include \includes.h\;
} else {
pidl #include stdio.h;
+ pidl #include stdbool.h;
pidl #include stdlib.h;
pidl #include stdint.h;
pidl #include stdarg.h;
Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-04-02 14:43:15 UTC
(rev 14866)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-04-02 16:26:02 UTC
(rev 14867)
@@ -54,6 +54,7 @@
print CC #include stdint.h\n;
print CC #include stdlib.h\n;
print CC #include stdio.h\n;
+ print CC #include stdbool.h\n;
print CC #include stdarg.h\n;
print CC $header;
print CC $ndrheader;
svn commit: samba r14868 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0/source/passdb trunk/source/lib trunk/source/nsswitch trunk/source/passdb
Author: jerry
Date: 2006-04-02 19:45:42 + (Sun, 02 Apr 2006)
New Revision: 14868
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14868
Log:
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time.
...
Fix my brain dead inverted logic for turning winbindd on and off
when run on a DC or when calling pdb functions from within winbindd.
Modified:
branches/SAMBA_3_0/source/lib/system_smbd.c
branches/SAMBA_3_0/source/nsswitch/wb_common.c
branches/SAMBA_3_0/source/nsswitch/winbindd.c
branches/SAMBA_3_0/source/passdb/pdb_interface.c
trunk/source/lib/system_smbd.c
trunk/source/nsswitch/wb_common.c
trunk/source/nsswitch/winbindd.c
trunk/source/passdb/pdb_interface.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/system_smbd.c
===
--- branches/SAMBA_3_0/source/lib/system_smbd.c 2006-04-02 16:26:02 UTC (rev
14867)
+++ branches/SAMBA_3_0/source/lib/system_smbd.c 2006-04-02 19:45:42 UTC (rev
14868)
@@ -132,13 +132,7 @@
* always determined by the info3 coming back from auth3 or the
* PAC. */
- if ( !winbind_putenv(0) ) {
- DEBUG(0,(sys_getgroup_list: Insufficient environment space
-for %s\n, WINBINDD_DONT_ENV));
- } else {
- DEBUG(10,(sys_getgrouplist(): disabled winbindd for group
- lookup [user == %s]\n, user));
- }
+ winbind_off() ;
#ifdef HAVE_GETGROUPLIST
retval = getgrouplist(user, gid, groups, grpcnt);
@@ -148,10 +142,12 @@
unbecome_root();
#endif
- /* allow winbindd lookups */
+ /* allow winbindd lookups , but only if they were not already disabled
*/
- winbind_putenv( winbindd_env ? winbindd_env : 1 );
-
+ if ( !(winbindd_env strequal(winbindd_env, 1)) ) {
+ winbind_on();
+ }
+
return retval;
}
Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-04-02 16:26:02 UTC
(rev 14867)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-04-02 19:45:42 UTC
(rev 14868)
@@ -618,15 +618,17 @@
/* Use putenv() instead of setenv() in these functions as not all
environments have the latter. */
-BOOL winbind_putenv( const char *s )
+BOOL winbind_off( void )
{
- fstring env;
+ static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV =1);
- if ( !s ) {
- return False;
- }
+ return putenv(s) != -1;
+}
- snprintf( env, sizeof(env), %s=%s, WINBINDD_DONT_ENV, s );
+BOOL winbind_on( void )
+{
+ static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV =0);
- return putenv(env) != -1;
+ return putenv(s) != -1;
}
+
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c 2006-04-02 16:26:02 UTC
(rev 14867)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c 2006-04-02 19:45:42 UTC
(rev 14868)
@@ -945,7 +945,7 @@
/* Set environment variable so we don't recursively call ourselves.
This may also be useful interactively. */
- if ( !winbind_putenv(0) ) {
+ if ( !winbind_off() ) {
DEBUG(0,(Failed to disable recusive winbindd calls.
Exiting.\n));
exit(1);
}
Modified: branches/SAMBA_3_0/source/passdb/pdb_interface.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_interface.c2006-04-02 16:26:02 UTC
(rev 14867)
+++ branches/SAMBA_3_0/source/passdb/pdb_interface.c2006-04-02 19:45:42 UTC
(rev 14868)
@@ -1509,11 +1509,13 @@
/* We only look at our own sam, so don't care about imported stuff */
winbindd_env = getenv(WINBINDD_DONT_ENV);
- winbind_putenv(0);
+ winbind_off();
if ((grp = getgrgid(gid)) == NULL) {
- /* allow winbindd lookups */
- winbind_putenv( winbindd_env ? winbindd_env : 1 );
+ /* allow winbindd lookups, but only if they weren't already
disabled */
+ if ( !(winbindd_env strequal(winbindd_env, 1)) ) {
+ winbind_on();
+ }
return False;
}
@@ -1539,9 +1541,12
svn commit: samba r14869 - branches/SAMBA_3_0/source/param trunk/source/param
Author: lmuelle
Date: 2006-04-02 21:12:23 + (Sun, 02 Apr 2006)
New Revision: 14869
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14869
Log:
Allow to dump a paramatrical option.
Flaw: We print an empty line if the paramatrical option is not defined
in the requested section.
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
trunk/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2006-04-02 19:45:42 UTC (rev
14868)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2006-04-02 21:12:23 UTC (rev
14869)
@@ -3880,13 +3880,31 @@
int i, result = False;
parm_class p_class;
unsigned flag = 0;
+ fstring local_parm_name;
+ char *parm_opt;
+ /* check for parametrical option */
+ fstrcpy( local_parm_name, parm_name);
+ parm_opt = strchr( local_parm_name, ':');
+
+ if (parm_opt) {
+ *parm_opt = '\0';
+ parm_opt++;
+ if (strlen(parm_opt)) {
+ printf( %s\n, lp_parm_const_string( snum,
+ local_parm_name, parm_opt, ));
+ result = True;
+ }
+ return result;
+ }
+
+ /* check for a key and print the value */
if (isGlobal) {
p_class = P_GLOBAL;
flag = FLAG_GLOBAL;
} else
p_class = P_LOCAL;
-
+
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0
(parm_table[i].p_class == p_class || parm_table[i].flags
flag)
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c 2006-04-02 19:45:42 UTC (rev 14868)
+++ trunk/source/param/loadparm.c 2006-04-02 21:12:23 UTC (rev 14869)
@@ -3880,13 +3880,31 @@
int i, result = False;
parm_class p_class;
unsigned flag = 0;
+ fstring local_parm_name;
+ char *parm_opt;
+ /* check for parametrical option */
+ fstrcpy( local_parm_name, parm_name);
+ parm_opt = strchr( local_parm_name, ':');
+
+ if (parm_opt) {
+ *parm_opt = '\0';
+ parm_opt++;
+ if (strlen(parm_opt)) {
+ printf( %s\n, lp_parm_const_string( snum,
+ local_parm_name, parm_opt, ));
+ result = True;
+ }
+ return result;
+ }
+
+ /* check for a key and print the value */
if (isGlobal) {
p_class = P_GLOBAL;
flag = FLAG_GLOBAL;
} else
p_class = P_LOCAL;
-
+
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0
(parm_table[i].p_class == p_class || parm_table[i].flags
flag)
Build status as of Mon Apr 3 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-04-02 00:00:04.0 + +++ /home/build/master/cache/broken_results.txt 2006-04-03 00:00:25.0 + @@ -1,17 +1,17 @@ -Build status as of Sun Apr 2 00:00:02 2006 +Build status as of Mon Apr 3 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 8 1 0 -distcc 10 2 0 -lorikeet-heimdal 12 12 0 -ppp 17 0 0 +ccache 31 3 0 +distcc 31 4 0 +lorikeet-heimdal 25 25 0 +ppp 18 0 0 rsync31 2 0 samba3 0 0 samba-docs 0 0 0 -samba4 35 30 1 +samba4 35 28 1 samba_3_033 7 0 -smb-build23 0 0 -talloc 9 7 0 -tdb 29 3 0 +smb-build25 0 0 +talloc 28 14 0 +tdb 29 4 0
svn commit: samba r14870 - in branches/SAMBA_4_0/source/scripting: .
Author: tpot Date: 2006-04-03 00:13:47 + (Mon, 03 Apr 2006) New Revision: 14870 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14870 Log: Update to link with dynamic instead of static objects. Modified: branches/SAMBA_4_0/source/scripting/config.mk Changeset: Modified: branches/SAMBA_4_0/source/scripting/config.mk === --- branches/SAMBA_4_0/source/scripting/config.mk 2006-04-02 21:12:23 UTC (rev 14869) +++ branches/SAMBA_4_0/source/scripting/config.mk 2006-04-03 00:13:47 UTC (rev 14870) @@ -27,17 +27,20 @@ scripting/swig/tdb_wrap.c: scripting/swig/tdb.i swig -python scripting/swig/tdb.i -scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o bin/subsystems/LIBRARY_LIBTDB.o - $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so \ - scripting/swig/tdb_wrap.o \ - bin/subsystems/LIBRARY_LIBTDB.o +scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o + $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so $(LOCAL_LINK_FLAGS) \ + bin/libtdb.$(SHLIBEXT).0.0.1 \ + scripting/swig/tdb_wrap.o scripting/swig/ldb_wrap.c: scripting/swig/ldb.i swig -python scripting/swig/ldb.i -scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_swig_ldb_DEPEND_LIST) - $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so scripting/swig/ldb_wrap.o \ - $(LIBRARY_swig_ldb_LINK_LIST) $(LIBRARY_swig_ldb_LINK_FLAGS) +scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_DYNCONFIG_OBJ_LIST) + $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so $(LOCAL_LINK_FLAGS) \ + $(LIBRARY_DYNCONFIG_LINK_LIST) \ + bin/libtdb.$(SHLIBEXT).0.0.1 \ + bin/libldb.$(SHLIBEXT).0.0.1 \ + scripting/swig/ldb_wrap.o SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
svn commit: samba r14871 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2006-04-03 00:20:04 + (Mon, 03 Apr 2006) New Revision: 14871 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14871 Log: We don't need to import UserDict anymore. Modified: branches/SAMBA_4_0/source/scripting/swig/Tdb.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/Tdb.py === --- branches/SAMBA_4_0/source/scripting/swig/Tdb.py 2006-04-03 00:13:47 UTC (rev 14870) +++ branches/SAMBA_4_0/source/scripting/swig/Tdb.py 2006-04-03 00:20:04 UTC (rev 14871) @@ -20,7 +20,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import tdb, os, UserDict +import tdb, os # Open flags
svn commit: samba r14872 - in branches/SAMBA_4_0/source/lib/tdb/bin: .
Author: tpot Date: 2006-04-03 00:23:22 + (Mon, 03 Apr 2006) New Revision: 14872 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14872 Log: Add tdbdump to svn:ignore. Modified: branches/SAMBA_4_0/source/lib/tdb/bin/ Changeset: Property changes on: branches/SAMBA_4_0/source/lib/tdb/bin ___ Name: svn:ignore - .sconsign tdbtool tdbtest tdbtorture + .sconsign tdbtool tdbtest tdbtorture tdbdump
svn commit: samba r14873 - in branches/SAMBA_4_0/source: script/tests scripting/swig scripting/swig/torture
Author: tpot Date: 2006-04-03 00:24:59 + (Mon, 03 Apr 2006) New Revision: 14873 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14873 Log: Add skeleton swig ldb interface. Added: branches/SAMBA_4_0/source/scripting/swig/Ldb.py branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py Modified: branches/SAMBA_4_0/source/script/tests/test_swig.sh branches/SAMBA_4_0/source/scripting/swig/ Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_swig.sh === --- branches/SAMBA_4_0/source/script/tests/test_swig.sh 2006-04-03 00:23:22 UTC (rev 14872) +++ branches/SAMBA_4_0/source/script/tests/test_swig.sh 2006-04-03 00:24:59 UTC (rev 14873) @@ -15,5 +15,6 @@ export PYTHONPATH=scripting/swig:$PYTHONPATH scripting/swig/torture/torture_tdb.py || failed=`expr $failed + 1` +scripting/swig/torture/torture_ldb.py || failed=`expr $failed + 1` testok $0 $failed Property changes on: branches/SAMBA_4_0/source/scripting/swig ___ Name: svn:ignore - *.pyc _*.so *_wrap.c dcerpc.py tdb.py + *.pyc _*.so *_wrap.c dcerpc.py tdb.py ldb.py Added: branches/SAMBA_4_0/source/scripting/swig/Ldb.py === --- branches/SAMBA_4_0/source/scripting/swig/Ldb.py 2006-04-03 00:23:22 UTC (rev 14872) +++ branches/SAMBA_4_0/source/scripting/swig/Ldb.py 2006-04-03 00:24:59 UTC (rev 14873) @@ -0,0 +1,26 @@ +Provide a more Pythonic and object-oriented interface to ldb. + +# +# Swig interface to Samba +# +# Copyright (C) Tim Potter 2006 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +import ldb + +class Ldb: +pass Added: branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py === --- branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py 2006-04-03 00:23:22 UTC (rev 14872) +++ branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py 2006-04-03 00:24:59 UTC (rev 14873) @@ -0,0 +1,8 @@ +#!/usr/bin/python + +import Ldb + +def fail(msg): +print 'FAILED:', msg +sys.exit(1) + Property changes on: branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py ___ Name: svn:executable + *
svn commit: samba r14874 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: jelmer
Date: 2006-04-03 00:46:17 + (Mon, 03 Apr 2006)
New Revision: 14874
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14874
Log:
Allow overriding LIBRARY_REALNAME
Modified:
branches/SAMBA_4_0/source/build/smb_build/TODO
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/output.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===
--- branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-03 00:24:59 UTC
(rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-03 00:46:17 UTC
(rev 14874)
@@ -1,3 +1,5 @@
+- make --enable-dso the default
+- per-subsystem CFLAGS (which are inherited)
- pregenerate more stuff (IDL, manpages, lex/yacc?)
- saner names for:
libcli.so.0.0.1 (rename to libsmb?)
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-03
00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-03
00:46:17 UTC (rev 14874)
@@ -74,6 +74,7 @@
LIBRARY = {
VERSION = string,
SO_VERSION= string,
+ LIBRARY_REALNAME = string,
INIT_FUNCTION_TYPE= string,
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-03
00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-03
00:46:17 UTC (rev 14874)
@@ -204,7 +204,7 @@
}
if ($ctx-{TYPE} eq LIBRARY) {
- push (@{$self-{shared_libs}},
$ctx-{DEBUGDIR}/$ctx-{LIBRARY_REALNAME});
+ push (@{$self-{shared_libs}},
$ctx-{DEBUGDIR}/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
push (@{$self-{installable_shared_libs}},
$installdir/$ctx-{LIBRARY_REALNAME}) if (defined($ctx-{SO_VERSION}));
} elsif ($ctx-{TYPE} eq MODULE) {
push (@{$self-{shared_modules}}, $ctx-{TARGET});
@@ -260,7 +260,7 @@
my $singlesoarg = ;
- if ($self-{duplicate_build}) {
+ if ($ctx-{DEBUGDIR} ne $installdir) {
$self-output( __EOD__
#
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-03 00:24:59 UTC
(rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-03 00:46:17 UTC
(rev 14874)
@@ -58,16 +58,22 @@
$lib_name = lib$link_name;
}
- if ($lib-{TYPE} eq MODULE) {
- $lib-{DEBUGDIR} = bin/modules/$lib-{SUBSYSTEM};
- $lib-{RELEASEDIR} = bin/install/modules/$lib-{SUBSYSTEM};
- $lib-{LIBRARY_REALNAME} = $link_name;
- $lib-{LIBRARY_REALNAME} =~ s/^$lib-{SUBSYSTEM}_//g;
- $lib-{LIBRARY_REALNAME}.= .\$(SHLIBEXT);
+ if (defined($lib-{LIBRARY_REALNAME})) {
+ $lib-{BASEDIR} =~ s/^\.\///g;
+ $lib-{LIBRARY_REALNAME} = $lib-{LIBRARY_REALNAME};
+ $lib-{DEBUGDIR} = $lib-{RELEASEDIR} = $lib-{BASEDIR};
} else {
- $lib-{DEBUGDIR} = bin;
- $lib-{RELEASEDIR} = bin/install;
- $lib-{LIBRARY_REALNAME} = $lib_name.\$(SHLIBEXT);
+ if ($lib-{TYPE} eq MODULE) {
+ $lib-{DEBUGDIR} = bin/modules/$lib-{SUBSYSTEM};
+ $lib-{RELEASEDIR} =
bin/install/modules/$lib-{SUBSYSTEM};
+ $lib-{LIBRARY_REALNAME} = $link_name;
+ $lib-{LIBRARY_REALNAME} =~ s/^$lib-{SUBSYSTEM}_//g;
+ $lib-{LIBRARY_REALNAME}.= .\$(SHLIBEXT);
+ } else {
+ $lib-{DEBUGDIR} = bin;
+ $lib-{RELEASEDIR} = bin/install;
+ $lib-{LIBRARY_REALNAME} = $lib_name.\$(SHLIBEXT);
+ }
}
if (defined($lib-{VERSION})) {
svn commit: samba r14875 - in branches/SAMBA_4_0/source/scripting: .
Author: jelmer Date: 2006-04-03 00:51:28 + (Mon, 03 Apr 2006) New Revision: 14875 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=14875 Log: Make better use of the build system Modified: branches/SAMBA_4_0/source/scripting/config.mk Changeset: Modified: branches/SAMBA_4_0/source/scripting/config.mk === --- branches/SAMBA_4_0/source/scripting/config.mk 2006-04-03 00:46:17 UTC (rev 14874) +++ branches/SAMBA_4_0/source/scripting/config.mk 2006-04-03 00:51:28 UTC (rev 14875) @@ -3,56 +3,45 @@ ### # Start LIBRARY swig_tdb [LIBRARY::swig_tdb] -REQUIRED_SUBSYSTEMS = LIBTDB +LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT) +OBJ_FILES = swig/tdb_wrap.o +REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG # End LIBRARY swig_tdb ### ### # Start LIBRARY swig_ldb [LIBRARY::swig_ldb] -REQUIRED_SUBSYSTEMS = ldb +REQUIRED_SUBSYSTEMS = ldb DYNCONFIG +LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT) +OBJ_FILES = swig/ldb_wrap.o # End LIBRARY swig_ldb ### ### # Start LIBRARY swig_dcerpc [LIBRARY::swig_dcerpc] -REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA +LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT) +REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG +OBJ_FILES = swig/dcerpc_wrap.o # End LIBRARY swig_dcerpc ### # Swig extensions -swig: scripting/swig/_tdb.so scripting/swig/_ldb.so +swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT) -scripting/swig/tdb_wrap.c: scripting/swig/tdb.i - swig -python scripting/swig/tdb.i +.SUFFIXES: _wrap.c .i -scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o - $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so $(LOCAL_LINK_FLAGS) \ - bin/libtdb.$(SHLIBEXT).0.0.1 \ - scripting/swig/tdb_wrap.o +.i_wrap.c: + swig -python $ -scripting/swig/ldb_wrap.c: scripting/swig/ldb.i - swig -python scripting/swig/ldb.i - -scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_DYNCONFIG_OBJ_LIST) - $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so $(LOCAL_LINK_FLAGS) \ - $(LIBRARY_DYNCONFIG_LINK_LIST) \ - bin/libtdb.$(SHLIBEXT).0.0.1 \ - bin/libldb.$(SHLIBEXT).0.0.1 \ - scripting/swig/ldb_wrap.o - SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES) - swig -python scripting/swig/dcerpc.i -scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST) - $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_LINK_LIST) $(LIBRARY_swig_dcerpc_LINK_FLAGS) +clean:: + -rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py -swig_clean: - -rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o - # Swig testing swigtest: swig
