svn commit: samba r6129 - in branches/SAMBA_4_0/source: . lib lib/compression librpc librpc/ndr
Author: metze Date: 2005-03-30 10:48:52 + (Wed, 30 Mar 2005) New Revision: 6129 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6129 Log: - add our own MSZIP decompression implementation (taken from cabextract.c from KDE) this code maybe need to be rewritten and the compression side needs to be done, but for now it seems to works - remove the dependency to zlib metze Added: branches/SAMBA_4_0/source/lib/compression/ branches/SAMBA_4_0/source/lib/compression/mszip.c branches/SAMBA_4_0/source/lib/compression/mszip.h Removed: branches/SAMBA_4_0/source/librpc/config.m4 Modified: branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/lib/basic.mk branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/librpc/ndr/libndr.h branches/SAMBA_4_0/source/librpc/ndr/ndr_compression.c Changeset: Sorry, the patch is too large (1078 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6129
svn commit: samba r6131 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-30 11:26:02 + (Wed, 30 Mar 2005)
New Revision: 6131
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6131
Log:
decompression of DsGetNCChanges level 2 responses works now
(and the push side isn't used currently...)
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-30 11:15:51 UTC
(rev 6130)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-30 11:26:02 UTC
(rev 6131)
@@ -500,8 +500,7 @@
typedef struct {
uint32 decompressed_length;
uint32 compressed_length;
-
[subcontext(4),subcontext_size(r-compressed_length),compression(NDR_COMPRESSION_ZLIB,compressed_length,decompressed_length),flag(NDR_REMAINING)]
DATA_BLOB *decompressed;
-
/*[subcontext(4),subcontext_size(r-compressed_length),compression(NDR_COMPRESSION_ZLIB,compressed_length,decompressed_length)]
drsuapi_DsGetNCChangesCtr1 *ctr1;*/
+
[subcontext(4),subcontext_size(r-compressed_length),compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
drsuapi_DsGetNCChangesCtr1 *ctr1;
} drsuapi_DsGetNCChangesCompressedInfo;
typedef struct {
svn commit: samba r6132 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-30 12:27:01 + (Wed, 30 Mar 2005)
New Revision: 6132
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6132
Log:
allow up to 15 sub_auth in a dom_sid
(tridge: asked me for that commit)
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/security.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/security.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/security.idl 2005-03-30 11:26:02 UTC
(rev 6131)
+++ branches/SAMBA_4_0/source/librpc/idl/security.idl 2005-03-30 12:27:01 UTC
(rev 6132)
@@ -186,7 +186,7 @@
so you can't copy them using assignment */
typedef [public,noprint] struct {
uint8 sid_rev_num; /** SID revision number */
- [range(0,5)] int8 num_auths; /** Number of sub-authorities */
+ [range(0,15)] int8 num_auths; /** Number of sub-authorities
*/
uint8 id_auth[6]; /** Identifier Authority */
uint32 sub_auths[num_auths];
} dom_sid;
svn commit: samba r6133 - in trunk: source/web swat/include swat/js
Author: deryck
Date: 2005-03-30 13:02:23 + (Wed, 30 Mar 2005)
New Revision: 6133
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6133
Log:
More of my SWAT work. Just getting the globals/conf
page format right.
deryck
Modified:
trunk/source/web/swat.c
trunk/swat/include/main.css
trunk/swat/js/ui.js
Changeset:
Modified: trunk/source/web/swat.c
===
--- trunk/source/web/swat.c 2005-03-30 12:27:01 UTC (rev 6132)
+++ trunk/source/web/swat.c 2005-03-30 13:02:23 UTC (rev 6133)
@@ -572,17 +572,6 @@
}
/
- display splash page with conf options
-/
-static void conf_page(void)
-{
- printf( div class=\whereto\\n);
- printf(h2Configuring Samba/h2\n\n);
- printf(pThe following options are available for editing your
Samba configuration/p\n);
- printf( /div\n);
-}
-
-/
display help page
/
static void help_page(void)
@@ -837,15 +826,20 @@
/
- display a globals editing page
+ display a conf page for editing global parameters
/
-static void globals_page(void)
+static void conf_page(void)
{
unsigned int parm_filter = FLAG_BASIC;
int mode = 0;
- printf(H2%s/H2\n, _(Global Parameters));
+ printf( div class=\whereto\\n);
+ printf(h2Configuring Samba/h2\n\n);
+ printf(pThe following menu allows for editing of global
parameters affecting your Samba configuration./p\n);
+ printf( /div\n);
+ printf( div class=\view_conf\a href=\viewconfig\
onclick=\openHelp(this.href); return false\View smb.conf
file/a/div\n\n);
+
if (cgi_variable(Commit)) {
commit_parameters(GLOBAL_SECTION_SNUM);
save_reload(0);
@@ -858,7 +852,7 @@
if ( cgi_variable(AdvMode))
mode = 1;
- printf(form name=\swatform\ method=post action=globals\n);
+ printf(form name=\swatform\ method=post action=conf\n);
ViewModeBoxes( mode );
switch ( mode ) {
@@ -1423,8 +1417,6 @@
viewconfig_page();
} else if (have_read_access strcmp(page,rewritecfg)==0) {
rewritecfg_file();
- } else if (have_read_access strcmp(page, globals)==0) {
- globals_page();
} else if (have_read_access strcmp(page,services)==0) {
services_page();
} else if (have_read_access strcmp(page,shares)==0) {
Modified: trunk/swat/include/main.css
===
--- trunk/swat/include/main.css 2005-03-30 12:27:01 UTC (rev 6132)
+++ trunk/swat/include/main.css 2005-03-30 13:02:23 UTC (rev 6133)
@@ -69,4 +69,9 @@
width:84px;
height:40px;
}
-
+.view_conf {
+ float:right;
+ position:relative;
+ top:-130px;
+}
+}
Modified: trunk/swat/js/ui.js
===
--- trunk/swat/js/ui.js 2005-03-30 12:27:01 UTC (rev 6132)
+++ trunk/swat/js/ui.js 2005-03-30 13:02:23 UTC (rev 6133)
@@ -95,7 +95,7 @@
window.captureEvents(Event.KEYPRESS);
window.onkeypress = catchHardReload;
- if (location.href.indexOf('help') -1) {
+ if (location.href.indexOf('help') -1 ||
location.href.indexOf('viewconfig') -1) {
// Init iframe for file loads
setStage();
Re: svn commit: samba r6127 - in branches/SAMBA_3_0/source: include lib libads libsmb nsswitch rpc_server tdb utils
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] wrote: | | The flag -Wall should be added permanently to CFLAGS, and all warnings then | generated should be eliminated. Derrell, It is defined when you set --enable-developer cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCSr0gIR7qMdg1EfYRArEMAKCuMrg5d6HVLCQ1mXEMqs/Dm7tQ3QCg2Fqt BtY5yUTwZdWN/rViLx+2Gt8= =fKAw -END PGP SIGNATURE-
svn commit: samba r6134 - in branches/SAMBA_4_0/source: include librpc/ndr
Author: metze
Date: 2005-03-30 15:04:19 + (Wed, 30 Mar 2005)
New Revision: 6134
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6134
Log:
add a new type dom_sid28 which is a 28 byte fixed buffer with a dom_sid in it
metze
Modified:
branches/SAMBA_4_0/source/include/smb_interfaces.h
branches/SAMBA_4_0/source/librpc/ndr/ndr_sec.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/smb_interfaces.h
===
--- branches/SAMBA_4_0/source/include/smb_interfaces.h 2005-03-30 13:02:23 UTC
(rev 6133)
+++ branches/SAMBA_4_0/source/include/smb_interfaces.h 2005-03-30 15:04:19 UTC
(rev 6134)
@@ -55,7 +55,10 @@
*/
#define dom_sid2 dom_sid
+/* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */
+#define dom_sid28 dom_sid
+
/*
this header defines the structures and unions used between the SMB
parser and the backends.
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_sec.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_sec.c 2005-03-30 13:02:23 UTC
(rev 6133)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_sec.c 2005-03-30 15:04:19 UTC
(rev 6134)
@@ -56,8 +56,67 @@
return ndr_push_dom_sid(ndr, ndr_flags, sid);
}
+/*
+ parse a dom_sid28 - this is a dom_sid in a fixed 28 byte buffer, so we need
to ensure there are only upto 5 sub_auth
+*/
+NTSTATUS ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct
dom_sid *sid)
+{
+ NTSTATUS status;
+ struct ndr_pull *subndr;
+ if (!(ndr_flags NDR_SCALARS)) {
+ return NT_STATUS_OK;
+ }
+
+ subndr = talloc_zero(ndr, struct ndr_pull);
+ NT_STATUS_HAVE_NO_MEMORY(subndr);
+
+ subndr-data= ndr-data + ndr-offset;
+ subndr-data_size = 28;
+ subndr-offset = 0;
+
+ NDR_CHECK(ndr_pull_advance(ndr, 28));
+
+ status = ndr_pull_dom_sid(subndr, ndr_flags, sid);
+ if (!NT_STATUS_IS_OK(status)) {
+ /* handle a w2k bug which send random data in the buffer */
+ ZERO_STRUCTP(sid);
+ }
+
+ return NT_STATUS_OK;
+}
+
/*
+ push a dom_sid28 - this is a dom_sid in a 28 byte fixed buffer
+*/
+NTSTATUS ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, struct
dom_sid *sid)
+{
+ uint32_t old_offset;
+ uint32_t padding;
+
+ if (!(ndr_flags NDR_SCALARS)) {
+ return NT_STATUS_OK;
+ }
+
+ if (sid-num_auths 5) {
+ return ndr_push_error(ndr, NDR_ERR_RANGE,
+ dom_sid28 allows only upto 5 sub auth
[%u],
+ sid-num_auths);
+ }
+
+ old_offset = ndr-offset;
+ NDR_CHECK(ndr_push_dom_sid(ndr, ndr_flags, sid));
+
+ padding = 28 - (ndr-offset - old_offset);
+
+ if (padding 0) {
+ NDR_CHECK(ndr_push_zero(ndr, padding));
+ }
+
+ return NT_STATUS_OK;
+}
+
+/*
print a dom_sid
*/
void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, struct dom_sid
*sid)
@@ -65,11 +124,16 @@
ndr-print(ndr, %-25s: %s, name, dom_sid_string(ndr, sid));
}
-void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, struct
dom_sid2 *sid)
+void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, struct
dom_sid *sid)
{
ndr_print_dom_sid(ndr, name, sid);
}
+void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, struct
dom_sid *sid)
+{
+ ndr_print_dom_sid(ndr, name, sid);
+}
+
/*
return the wire size of a dom_sid
*/
svn commit: samba r6135 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-30 15:07:14 + (Wed, 30 Mar 2005)
New Revision: 6135
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6135
Log:
- make use of the new dom_sid28 type
(this fixes parsing of w2k blob, which some times have random gargabe data in
the sid buffer)
- make the names of the DsReplicaCoursor*Ctr* 's more consistent
and fix DsGetNCchangesCtr6 parsing
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-30 15:04:19 UTC
(rev 6134)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-30 15:07:14 UTC
(rev 6135)
@@ -116,9 +116,9 @@
/* Function 0x02 */
typedef [gensize] struct {
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r,
ndr-flags)-4)] uint32 __ndr_size;
- [value(ndr_length_dom_sid(r-sid))] uint32 __ndr_size_sid;
+ /*[value(ndr_length_dom_sid(r-sid))]*/ uint32 __ndr_size_sid;
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
} drsuapi_DsReplicaObjectIdentifier;
@@ -185,7 +185,7 @@
[range(0,0x10)] uint32 count;
uint32 u3;
[size_is(count)] drsuapi_DsReplicaCoursor coursors[];
- } drsuapi_DsReplicaCoursor05Ctr;
+ } drsuapi_DsReplicaCoursorCtrEx;
typedef [public] bitmap {
/* the _WRITEABLE flag seems to indicate a replication with all
attributes,
@@ -224,7 +224,7 @@
GUID source_dsa_guid;
[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsReplicaNeighbourFlags replica_flags;
uint32 unknown2;
uint32 unknown3;
@@ -252,7 +252,7 @@
GUID source_dsa_guid;
[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsReplicaNeighbourFlags replica_flags;
uint32 unknown2;
uint32 unknown3;
@@ -280,7 +280,7 @@
[range(0,0x10)] uint32 count;
uint32 u3;
[size_is(count)] drsuapi_DsReplicaCoursor2 coursors[];
- } drsuapi_DsReplicaCoursor2Ctr2;
+ } drsuapi_DsReplicaCoursor2CtrEx;
typedef [v1_enum] enum {
DRSUAPI_OBJECTCLASS_top = 0x0001,
@@ -345,7 +345,7 @@
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r,
ndr-flags)-4)] uint32 __ndr_size;
[value(ndr_length_dom_sid(r-sid))] uint32 __ndr_size_sid;
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN)] string dn;
} drsuapi_DsReplicaObjectIdentifier3;
@@ -487,7 +487,7 @@
drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark old_highwatermark;
drsuapi_DsReplicaHighWaterMark new_highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
uint32 unknown1;
uint32 object_count;
@@ -519,7 +519,7 @@
drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark old_highwatermark;
drsuapi_DsReplicaHighWaterMark new_highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursor2CtrEx *uptodateness_vector;
drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
uint32 unknown1;
uint32 unknown2;
@@ -852,7 +852,7 @@
typedef struct {
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
} drsuapi_DsReplicaObjectIdentifier2;
typedef struct {
@@ -1143,7 +1143,7 @@
[case(DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2)]
drsuapi_DsReplicaAttrValMetaData2Ctr *attrvalmetadata2;
[case(DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02)]
drsuapi_DsReplicaNeighbourCtr *neighbours02;
[case(DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04)]
svn commit: samba-docs r456 - in trunk/Samba-HOWTO-Collection: .
Author: jht Date: 2005-03-30 15:11:31 + (Wed, 30 Mar 2005) New Revision: 456 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=456 Log: Another ACLs Installment. Modified: trunk/Samba-HOWTO-Collection/AccessControls.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/AccessControls.xml === --- trunk/Samba-HOWTO-Collection/AccessControls.xml 2005-03-29 19:24:12 UTC (rev 455) +++ trunk/Samba-HOWTO-Collection/AccessControls.xml 2005-03-30 15:11:31 UTC (rev 456) @@ -420,7 +420,7 @@ Unfortunately, the implementation of the immutible flag is NOT consistent with published documentation. For example, the man page for the commandchattr/command on SUSE Linux 9.2 says: screen -A file with thei attribute cannot be modified: it cannot be deleted +A file with the i attribute cannot be modified: it cannot be deleted or renamed, no link can be created to this file and no data can be written to the file. Only the superuser or a process possessing the CAP_LINUX_IMMUTABLE capability can set or clear this attribute. @@ -1237,6 +1237,9 @@ the way in which Windows ACLs must be implemented. /para + sect3 + titleUNIX POSIX ACL Overview/title + para In examining POSIX ACLs we must consider the manner in which they operate for both files and directories. File ACLs have the following significance: @@ -1268,6 +1271,106 @@ /screen /para + /sect3 + + sect3 + titleMapping of Windows File ACLs to UNIX POSIX ACLs/title + + para + Microsoft Windows NT4/200X ACLs must of necessity be mapped to POSIX ACLs. + The mappings for file permissions are shown in link linkend=fdsacls/. + /para + + table frame='all' pgwide='0' id=fdsaclstitleHow Windows File ACLs Map to UNIX POSIX File ACLs/title + tgroup cols='2' + colspec align=left/ + colspec align=center/ + thead + row + entry align=centerWindows ACE/entry + entry align=centerFile Attribute Flag/entry + /row + /thead + tbody + row + entryparaFull Control/para/entry + entrypara#/para/entry + /row + row + entryparaTraverse Folder / Execute File/para/entry + entryparax/para/entry + /row + row + entryparaList Folder / Read Data/para/entry + entryparar/para/entry + /row + row + entryparaRead Attributes/para/entry + entryparar/para/entry + /row + row + entryparaRead Extended Attribures/para/entry + entryparar/para/entry + /row + row + entryparaCreate Files / Write Data/para/entry + entryparaw/para/entry + /row + row + entryparaCreate Folders / Append Data/para/entry + entryparaw/para/entry + /row + row + entryparaWrite Attributes/para/entry + entryparaw/para/entry + /row + row + entryparaWrite Extended Attributes/para/entry + entryparaw/para/entry + /row + row + entryparaDelete Subfolders and Files/para/entry + entryparaw/para/entry + /row + row + entryparaDelete/para/entry + entrypara#/para/entry + /row + row + entryparaRead Permissions/para/entry + entryparaall/para/entry + /row + row + entryparaChange Permissions/para/entry + entrypara#/para/entry + /row + row + entryparaTake Ownership/para/entry + entrypara#/para/entry + /row + /tbody + /tgroup + /table + + para + As can be seen from the mapping table, there is no 1:1 mapping capability and therefore + Samba must make a logical mapping that will permit Windows to operate more-or-less the way + that is intended by the Administrator. + /para + + /sect3 + + sect3 + titleMapping of Windows Directory ACLs to UNIX POSIX ACLs/title + + para + Interesting things happen in the mapping of UNIX POSIX directory permissions as well + as UNIX POSIX ACLs to Windows ACEs (Access
Re: svn commit: samba r6127 - in branches/SAMBA_3_0/source: include lib libads libsmb nsswitch rpc_server tdb utils
Gerald (Jerry) Carter [EMAIL PROTECTED] writes: [EMAIL PROTECTED] wrote: | The flag -Wall should be added permanently to CFLAGS, and all warnings | then generated should be eliminated. Derrell, It is defined when you set --enable-developer There's no reason that I can think of not to have -Wall in CFLAGS all the time. --enable-developer isn't obvious, and for those who don't know about that (as I didn't and surely most of the non-team developers don't), errors can be missed that the compiler could have caught. I try to use -Wall in everything I work on. Compilers these days are just too good not to take advantage of the bugs they can discover. Derrell
svn commit: samba r6136 - in trunk/swat/include: .
Author: deryck
Date: 2005-03-30 15:48:49 + (Wed, 30 Mar 2005)
New Revision: 6136
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6136
Log:
Minor style fix to SWAT stylesheet for larger resolutions.
deryck
Modified:
trunk/swat/include/main.css
Changeset:
Modified: trunk/swat/include/main.css
===
--- trunk/swat/include/main.css 2005-03-30 15:07:14 UTC (rev 6135)
+++ trunk/swat/include/main.css 2005-03-30 15:48:49 UTC (rev 6136)
@@ -72,6 +72,6 @@
.view_conf {
float:right;
position:relative;
- top:-130px;
+ top:-100px;
}
}
svn commit: samba r6137 - in trunk/source/smbd: .
Author: jra
Date: 2005-03-30 20:52:52 + (Wed, 30 Mar 2005)
New Revision: 6137
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6137
Log:
Refactor length reading out of EA code so we can read length
external to buffer. Needed to add EA code to create calls.
Jeremy.
Modified:
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/smbd/trans2.c
===
--- trunk/source/smbd/trans2.c 2005-03-30 15:48:49 UTC (rev 6136)
+++ trunk/source/smbd/trans2.c 2005-03-30 20:52:52 UTC (rev 6137)
@@ -387,7 +387,7 @@
static struct ea_list *read_ea_name_list(TALLOC_CTX *ctx, const char *pdata,
size_t data_size)
{
struct ea_list *ea_list_head = NULL;
- size_t offset = 4;
+ size_t offset = 0;
while (offset + 2 data_size) {
struct ea_list *tmp;
@@ -426,17 +426,12 @@
static struct ea_list *read_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t
data_size)
{
struct ea_list *ea_list_head = NULL;
- size_t offset = 4;
+ size_t offset = 0;
if (data_size 10) {
return NULL;
}
-if (IVAL(pdata,0) data_size) {
-DEBUG(10,(read_ea_list: bad total data size (%u) %u\n,
IVAL(pdata,0), (unsigned int)data_size));
- return NULL;
-}
-
/* Each entry must be at least 6 bytes in length. */
while (offset + 6 = data_size) {
struct ea_list *tmp;
@@ -1589,11 +1584,11 @@
if (info_level == SMB_FIND_EA_LIST) {
uint32 ea_size;
-
+
if (total_data 4) {
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
-
+
ea_size = IVAL(pdata,0);
if (ea_size != total_data) {
DEBUG(4,(call_trans2findfirst: Rejecting EA request
with incorrect \
@@ -1610,7 +1605,7 @@
}
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -1863,9 +1858,9 @@
if ((ea_ctx = talloc_init(findnext_ea_list)) == NULL) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
}
-
+
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -2772,7 +2767,7 @@
}
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -3644,11 +3639,23 @@
case SMB_INFO_SET_EA:
{
struct ea_list *ea_list = NULL;
- TALLOC_CTX *ctx = talloc_init(SMB_INFO_SET_EA);
+ TALLOC_CTX *ctx = NULL;
+
+ if (total_data 10) {
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+
+ if (IVAL(pdata,0) total_data) {
+ DEBUG(10,(call_trans2setfilepathinfo: bad
total data size (%u) %u\n,
+ IVAL(pdata,0), (unsigned
int)total_data));
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+
+ ctx = talloc_init(SMB_INFO_SET_EA);
if (!ctx) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
}
- ea_list = read_ea_list(ctx, pdata, total_data);
+ ea_list = read_ea_list(ctx, pdata + 4, total_data - 4);
if (!ea_list) {
svn commit: samba r6138 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-30 20:53:02 + (Wed, 30 Mar 2005)
New Revision: 6138
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6138
Log:
Refactor length reading out of EA code so we can read length
external to buffer. Needed to add EA code to create calls.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-30 20:52:52 UTC (rev
6137)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-30 20:53:02 UTC (rev
6138)
@@ -387,7 +387,7 @@
static struct ea_list *read_ea_name_list(TALLOC_CTX *ctx, const char *pdata,
size_t data_size)
{
struct ea_list *ea_list_head = NULL;
- size_t offset = 4;
+ size_t offset = 0;
while (offset + 2 data_size) {
struct ea_list *tmp;
@@ -426,17 +426,12 @@
static struct ea_list *read_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t
data_size)
{
struct ea_list *ea_list_head = NULL;
- size_t offset = 4;
+ size_t offset = 0;
if (data_size 10) {
return NULL;
}
-if (IVAL(pdata,0) data_size) {
-DEBUG(10,(read_ea_list: bad total data size (%u) %u\n,
IVAL(pdata,0), (unsigned int)data_size));
- return NULL;
-}
-
/* Each entry must be at least 6 bytes in length. */
while (offset + 6 = data_size) {
struct ea_list *tmp;
@@ -1589,11 +1584,11 @@
if (info_level == SMB_FIND_EA_LIST) {
uint32 ea_size;
-
+
if (total_data 4) {
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
-
+
ea_size = IVAL(pdata,0);
if (ea_size != total_data) {
DEBUG(4,(call_trans2findfirst: Rejecting EA request
with incorrect \
@@ -1610,7 +1605,7 @@
}
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -1863,9 +1858,9 @@
if ((ea_ctx = talloc_init(findnext_ea_list)) == NULL) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
}
-
+
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -2772,7 +2767,7 @@
}
/* Pull out the list of names. */
- ea_list = read_ea_name_list(ea_ctx, pdata, ea_size);
+ ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
if (!ea_list) {
talloc_destroy(ea_ctx);
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -3644,11 +3639,23 @@
case SMB_INFO_SET_EA:
{
struct ea_list *ea_list = NULL;
- TALLOC_CTX *ctx = talloc_init(SMB_INFO_SET_EA);
+ TALLOC_CTX *ctx = NULL;
+
+ if (total_data 10) {
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+
+ if (IVAL(pdata,0) total_data) {
+ DEBUG(10,(call_trans2setfilepathinfo: bad
total data size (%u) %u\n,
+ IVAL(pdata,0), (unsigned
int)total_data));
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+
+ ctx = talloc_init(SMB_INFO_SET_EA);
if (!ctx) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
}
- ea_list = read_ea_list(ctx, pdata, total_data);
+ ea_list = read_ea_list(ctx, pdata + 4, total_data -
svn commit: linux-cifs-client r24 - in branches: . linux-2.6.9-RHEL4 linux-2.6.9-RHEL4/fs linux-2.6.9-RHEL4/fs/cifs linux-2.6bk/fs/cifs
Author: sfrench Date: 2005-03-30 21:47:12 + (Wed, 30 Mar 2005) New Revision: 24 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=linux-cifs-clientrev=24 Log: Merge current 1.31 cifs vfs into svn and add new RHEL4 branch Added: branches/linux-2.6.9-RHEL4/ branches/linux-2.6.9-RHEL4/README branches/linux-2.6.9-RHEL4/convert-mainline-2.6.12-kernel-version-of-cifs-to-build-on-rhel4.patch branches/linux-2.6.9-RHEL4/fs/ branches/linux-2.6.9-RHEL4/fs/cifs/ branches/linux-2.6.9-RHEL4/fs/cifs/AUTHORS branches/linux-2.6.9-RHEL4/fs/cifs/CHANGES branches/linux-2.6.9-RHEL4/fs/cifs/Makefile branches/linux-2.6.9-RHEL4/fs/cifs/README branches/linux-2.6.9-RHEL4/fs/cifs/TODO branches/linux-2.6.9-RHEL4/fs/cifs/asn1.c branches/linux-2.6.9-RHEL4/fs/cifs/cifs_debug.c branches/linux-2.6.9-RHEL4/fs/cifs/cifs_debug.h branches/linux-2.6.9-RHEL4/fs/cifs/cifs_fs_sb.h branches/linux-2.6.9-RHEL4/fs/cifs/cifs_unicode.c branches/linux-2.6.9-RHEL4/fs/cifs/cifs_unicode.h branches/linux-2.6.9-RHEL4/fs/cifs/cifs_uniupr.h branches/linux-2.6.9-RHEL4/fs/cifs/cifsencrypt.c branches/linux-2.6.9-RHEL4/fs/cifs/cifsencrypt.h branches/linux-2.6.9-RHEL4/fs/cifs/cifsfs.c branches/linux-2.6.9-RHEL4/fs/cifs/cifsfs.h branches/linux-2.6.9-RHEL4/fs/cifs/cifsglob.h branches/linux-2.6.9-RHEL4/fs/cifs/cifspdu.h branches/linux-2.6.9-RHEL4/fs/cifs/cifsproto.h branches/linux-2.6.9-RHEL4/fs/cifs/cifssmb.c branches/linux-2.6.9-RHEL4/fs/cifs/connect.c branches/linux-2.6.9-RHEL4/fs/cifs/dir.c branches/linux-2.6.9-RHEL4/fs/cifs/fcntl.c branches/linux-2.6.9-RHEL4/fs/cifs/file.c branches/linux-2.6.9-RHEL4/fs/cifs/inode.c branches/linux-2.6.9-RHEL4/fs/cifs/ioctl.c branches/linux-2.6.9-RHEL4/fs/cifs/link.c branches/linux-2.6.9-RHEL4/fs/cifs/md4.c branches/linux-2.6.9-RHEL4/fs/cifs/md5.c branches/linux-2.6.9-RHEL4/fs/cifs/md5.h branches/linux-2.6.9-RHEL4/fs/cifs/misc.c branches/linux-2.6.9-RHEL4/fs/cifs/netmisc.c branches/linux-2.6.9-RHEL4/fs/cifs/nterr.c branches/linux-2.6.9-RHEL4/fs/cifs/nterr.h branches/linux-2.6.9-RHEL4/fs/cifs/ntlmssp.h branches/linux-2.6.9-RHEL4/fs/cifs/readdir.c branches/linux-2.6.9-RHEL4/fs/cifs/rfc1002pdu.h branches/linux-2.6.9-RHEL4/fs/cifs/smbdes.c branches/linux-2.6.9-RHEL4/fs/cifs/smbencrypt.c branches/linux-2.6.9-RHEL4/fs/cifs/smberr.h branches/linux-2.6.9-RHEL4/fs/cifs/transport.c branches/linux-2.6.9-RHEL4/fs/cifs/xattr.c Modified: branches/linux-2.6bk/fs/cifs/CHANGES branches/linux-2.6bk/fs/cifs/cifs_debug.c branches/linux-2.6bk/fs/cifs/cifsfs.c branches/linux-2.6bk/fs/cifs/cifsfs.h branches/linux-2.6bk/fs/cifs/cifsglob.h branches/linux-2.6bk/fs/cifs/cifspdu.h branches/linux-2.6bk/fs/cifs/cifsproto.h branches/linux-2.6bk/fs/cifs/cifssmb.c branches/linux-2.6bk/fs/cifs/connect.c branches/linux-2.6bk/fs/cifs/file.c branches/linux-2.6bk/fs/cifs/inode.c branches/linux-2.6bk/fs/cifs/md4.c branches/linux-2.6bk/fs/cifs/misc.c branches/linux-2.6bk/fs/cifs/ntlmssp.h branches/linux-2.6bk/fs/cifs/smbdes.c branches/linux-2.6bk/fs/cifs/smbencrypt.c Changeset: Sorry, the patch is too large (29532 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=linux-cifs-clientrev=24
svn commit: samba r6139 - in branches/SAMBA_4_0/source: build/smb_build include/system lib lib/socket_wrapper
Author: jelmer Date: 2005-03-30 22:09:16 + (Wed, 30 Mar 2005) New Revision: 6139 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6139 Log: Move socket_wrapper to a seperate directory Added: branches/SAMBA_4_0/source/lib/socket_wrapper/ branches/SAMBA_4_0/source/lib/socket_wrapper/config.mk branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.h Removed: branches/SAMBA_4_0/source/lib/socket_wrapper.c branches/SAMBA_4_0/source/lib/socket_wrapper.h Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm branches/SAMBA_4_0/source/include/system/network.h branches/SAMBA_4_0/source/lib/basic.mk Changeset: Sorry, the patch is too large (524 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6139
svn commit: linux-cifs-client r25 - in branches: . 2.6.8-Suse-Workstation-9.2 2.6.8-Suse-Workstation-9.2/fs 2.6.8-Suse-Workstation-9.2/fs/cifs
Author: sfrench Date: 2005-03-30 22:38:59 + (Wed, 30 Mar 2005) New Revision: 25 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=linux-cifs-clientrev=25 Log: Add SuSE workstation 9.2 branch for cifs client Added: branches/2.6.8-Suse-Workstation-9.2/ branches/2.6.8-Suse-Workstation-9.2/convert-mainline-2.6.12-kernel-version-of-cifs-to-build-on-suse-workstation-9.2.patch branches/2.6.8-Suse-Workstation-9.2/fs/ branches/2.6.8-Suse-Workstation-9.2/fs/cifs/ branches/2.6.8-Suse-Workstation-9.2/fs/cifs/AUTHORS branches/2.6.8-Suse-Workstation-9.2/fs/cifs/CHANGES branches/2.6.8-Suse-Workstation-9.2/fs/cifs/Makefile branches/2.6.8-Suse-Workstation-9.2/fs/cifs/README branches/2.6.8-Suse-Workstation-9.2/fs/cifs/TODO branches/2.6.8-Suse-Workstation-9.2/fs/cifs/asn1.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_debug.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_debug.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_fs_sb.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_unicode.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_unicode.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifs_uniupr.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsencrypt.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsencrypt.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsfs.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsfs.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsglob.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifspdu.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifsproto.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/cifssmb.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/connect.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/dir.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/fcntl.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/file.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/inode.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/ioctl.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/link.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/md4.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/md5.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/md5.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/misc.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/netmisc.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/nterr.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/nterr.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/ntlmssp.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/readdir.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/rfc1002pdu.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/smbdes.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/smbencrypt.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/smberr.h branches/2.6.8-Suse-Workstation-9.2/fs/cifs/transport.c branches/2.6.8-Suse-Workstation-9.2/fs/cifs/xattr.c Changeset: Sorry, the patch is too large (24927 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=linux-cifs-clientrev=25
svn commit: samba r6145 - in trunk/source/smbd: .
Author: jra Date: 2005-03-31 02:11:58 + (Thu, 31 Mar 2005) New Revision: 6145 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6145 Log: Added OS/2 EA support in trans2_open and trans2_mkdir. Fixed in nttrans_create. Jeremy. Modified: trunk/source/smbd/nttrans.c trunk/source/smbd/trans2.c Changeset: Sorry, the patch is too large (302 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6145
svn commit: samba r6146 - in branches/SAMBA_3_0/source/smbd: .
Author: jra Date: 2005-03-31 02:12:09 + (Thu, 31 Mar 2005) New Revision: 6146 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6146 Log: Added OS/2 EA support in trans2_open and trans2_mkdir. Fixed in nttrans_create. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/trans2.c Changeset: Sorry, the patch is too large (302 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6146
svn commit: samba r6147 - in branches/SAMBA_4_0/source/lib/events: .
Author: tridge
Date: 2005-03-31 02:14:31 + (Thu, 31 Mar 2005)
New Revision: 6147
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6147
Log:
The maxfd was being recalculated on every event loop, which made us
less scalable. It only needs to be recalculated when we the highest fd
is destroyed.
Modified:
branches/SAMBA_4_0/source/lib/events/events_standard.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===
--- branches/SAMBA_4_0/source/lib/events/events_standard.c 2005-03-31
02:12:09 UTC (rev 6146)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c 2005-03-31
02:14:31 UTC (rev 6147)
@@ -514,7 +514,6 @@
struct std_event_context *std_ev = talloc_get_type(ev-additional_data,
struct
std_event_context);
std_ev-exit_code = 0;
- std_ev-maxfd = EVENT_INVALID_MAXFD;
while (std_ev-fd_events std_ev-exit_code == 0) {
if (std_event_loop_once(ev) != 0) {
svn commit: samba r6148 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tpot Date: 2005-03-31 02:40:08 + (Thu, 31 Mar 2005) New Revision: 6148 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6148 Log: Add a showflags target to display the various compiler flags a la showlayout. There seems to be a bunch of -D and -I stuff in LD_FLAGS which I don't think should be there. Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm === --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-03-31 02:14:31 UTC (rev 6147) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-03-31 02:40:08 UTC (rev 6148) @@ -600,6 +600,13 @@ [EMAIL PROTECTED] \ piddir: \$(PIDDIR)\ [EMAIL PROTECTED] \ lockdir: \$(LOCKDIR)\ +showflags: + [EMAIL PROTECTED] \Samba will be compiled with flags:\ + [EMAIL PROTECTED] \ CC_FLAGS = \$(CC_FLAGS)\ + [EMAIL PROTECTED] \ LD_FLAGS = \$(LD_FLAGS)\ + [EMAIL PROTECTED] \ STLD_FLAGS = \$(STLD_FLAGS)\ + [EMAIL PROTECTED] \ SHLD_FLAGS = \$(SHLD_FLAGS)\ + SBIN_PROGS = bin/smbd BIN_PROGS = bin/smbclient \\
svn commit: samba r6149 - in branches/SAMBA_3_0: examples/libsmbclient source source/client source/include source/intl source/lib source/libads source/libsmb source/modules source/nsswitch source/passdb source/rpc_server source/smbd source/tdb source/utils source/web
Author: derrell Date: 2005-03-31 05:06:04 + (Thu, 31 Mar 2005) New Revision: 6149 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6149 Log: Fixes bugs #2498 and 2484. 1. using smbc_getxattr() et al, one may now request all access control entities in the ACL without getting all other NT attributes. 2. added the ability to exclude specified attributes from the result set provided by smbc_getxattr() et al, when requesting all attributes, all NT attributes, or all DOS attributes. 3. eliminated all compiler warnings, including when --enable-developer compiler flags are in use. removed -Wcast-qual flag from list, as that is specifically to force warnings in the case of casting away qualifiers. Note: In the process of eliminating compiler warnings, a few nasties were discovered. In the file libads/sasl.c, PRIVATE kerberos interfaces are being used; and in libsmb/clikrb5.c, both PRIAVE and DEPRECATED kerberos interfaces are being used. Someone who knows kerberos should look at these and determine if there is an alternate method of accomplishing the task. Modified: branches/SAMBA_3_0/examples/libsmbclient/README branches/SAMBA_3_0/examples/libsmbclient/testacl.c branches/SAMBA_3_0/examples/libsmbclient/testbrowse.c branches/SAMBA_3_0/examples/libsmbclient/testsmbc.c branches/SAMBA_3_0/examples/libsmbclient/teststat.c branches/SAMBA_3_0/source/client/smbspool.c branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/smb_macros.h branches/SAMBA_3_0/source/intl/lang_tdb.c branches/SAMBA_3_0/source/lib/access.c branches/SAMBA_3_0/source/lib/iconv.c branches/SAMBA_3_0/source/lib/smbldap.c branches/SAMBA_3_0/source/lib/util_str.c branches/SAMBA_3_0/source/lib/util_unistr.c branches/SAMBA_3_0/source/lib/util_uuid.c branches/SAMBA_3_0/source/libads/kerberos.c branches/SAMBA_3_0/source/libads/ldap.c branches/SAMBA_3_0/source/libads/ldap_printer.c branches/SAMBA_3_0/source/libads/sasl.c branches/SAMBA_3_0/source/libsmb/clikrb5.c branches/SAMBA_3_0/source/libsmb/clispnego.c branches/SAMBA_3_0/source/libsmb/libsmbclient.c branches/SAMBA_3_0/source/libsmb/spnego.c branches/SAMBA_3_0/source/modules/getdate.c branches/SAMBA_3_0/source/modules/getdate.y branches/SAMBA_3_0/source/modules/weird.c branches/SAMBA_3_0/source/nsswitch/wb_common.c branches/SAMBA_3_0/source/nsswitch/winbindd_nss.h branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c branches/SAMBA_3_0/source/nsswitch/winbindd_util.c branches/SAMBA_3_0/source/passdb/pdb_get_set.c branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c branches/SAMBA_3_0/source/smbd/notify_kernel.c branches/SAMBA_3_0/source/smbd/oplock_linux.c branches/SAMBA_3_0/source/smbd/sesssetup.c branches/SAMBA_3_0/source/tdb/tdb.c branches/SAMBA_3_0/source/tdb/tdbutil.c branches/SAMBA_3_0/source/utils/net_ads.c branches/SAMBA_3_0/source/utils/net_lookup.c branches/SAMBA_3_0/source/utils/smbcontrol.c branches/SAMBA_3_0/source/web/neg_lang.c Changeset: Sorry, the patch is too large (2146 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6149
Build status as of Thu Mar 31 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-03-30 00:00:28.0 + +++ /home/build/master/cache/broken_results.txt 2005-03-31 00:00:18.0 + @@ -1,15 +1,15 @@ -Build status as of Wed Mar 30 00:00:01 2005 +Build status as of Thu Mar 31 00:00:02 2005 Build counts: Tree Total Broken Panic -ccache 37 3 0 -distcc 37 5 0 -ppp 21 2 0 -rsync37 5 0 +ccache 38 3 0 +distcc 38 3 0 +ppp 22 2 0 +rsync38 4 0 samba1 1 1 samba-docs 0 0 0 -samba4 42 31 0 -samba_3_039 11 0 +samba4 43 18 0 +samba_3_039 9 0 Currently broken builds: Host Tree Compiler Status @@ -20,28 +20,15 @@ rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? -aretnapsamba4 gccok/ 1/?/? +aretnapsamba_3_0gccok/ok/ok/ 1 aretnapccache iccok/ok/ok/ 1 aretnapdistcc icc 77/?/?/? -aretnapsamba4 iccok/ 1/?/? -gc4samba4 gccok/ 1/?/? -manhattan samba4 cc ok/ 1/?/? -sbfsamba4 gccok/ 1/?/? -smartserv1 distcc gcc 1/?/?/? -smartserv1 samba4 gccok/ 2/?/? -smartserv1 samba_3_0gcc 1/?/?/? -smartserv1 distcc gcc-4.0 1/?/?/? -smartserv1 samba4 gcc-4.0 1/?/?/? -smartserv1 samba_3_0gcc-4.0 1/?/?/? gwen distcc cc ok/ 1/?/? gwen samba4 cc ok/ 1/?/? gwen samba_3_0cc ok/ 1/?/? -us4samba4 cc ok/ 1/?/? us4samba_3_0cc ok/ 1/?/? -us4samba4 gccok/ 1/?/? us4samba_3_0gccok/ 1/?/? flock samba4 gccok/ 1/?/? -homer samba4 gccok/ 2/?/? shubnigurath samba4 cc ok/ 1/?/? sol10 samba4 gccok/ 1/?/? gc20 samba4 gccok/ 2/?/? @@ -63,12 +50,7 @@ m30rsyncgccok/ok/ok/ 2 m30samba4 gccok/ 2/?/? m30samba_3_0gccok/ok/ok/ 1 -metze02rsyncgcc 1/?/?/? metze02sambagccok/ok/ok/ 1/PANIC -metze02samba4 gccok/ 2/?/? -metze02samba_3_0gccok/ 2/?/? -metze02samba4 gcc-3.4ok/ 2/?/? -metze01samba4 gccok/ 2/?/? l390vme1 samba4 gccok/ 2/?/? opippp gccok/ 2/?/?
svn commit: samba r6141 - in branches/SAMBA_3_0/source: include smbd
Author: jra Date: 2005-03-31 00:36:22 + (Thu, 31 Mar 2005) New Revision: 6141 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6141 Log: Fix OS/2 EA's for NTcreate. OpenX and mkdir to follow. Jeremy. Modified: branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/trans2.c Changeset: Sorry, the patch is too large (374 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6141
svn commit: samba r6142 - in trunk/source: include smbd
Author: jra Date: 2005-03-31 00:36:23 + (Thu, 31 Mar 2005) New Revision: 6142 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6142 Log: Fix OS/2 EA's for NTcreate. OpenX and mkdir to follow. Jeremy. Modified: trunk/source/include/smb.h trunk/source/smbd/nttrans.c trunk/source/smbd/trans2.c Changeset: Sorry, the patch is too large (374 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6142
svn commit: samba r6143 - in branches/SAMBA_4_0/source/build/pidl: .
Author: jelmer
Date: 2005-03-31 00:37:01 + (Thu, 31 Mar 2005)
New Revision: 6143
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6143
Log:
Put compression support in the subcontext handling functions rather
then at the element level.
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-03-31 00:36:23 UTC
(rev 6142)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-03-31 00:37:01 UTC
(rev 6143)
@@ -560,6 +560,8 @@
{
my $e = shift;
my $ndr_flags = shift;
+ my $compression = util::has_property($e, compression);
+ my $retndr;
pidl if (($ndr_flags) NDR_SCALARS) {;
indent;
@@ -570,7 +572,13 @@
pidl _ndr_$e-{NAME}-flags = ndr-flags;;
pidl ;
- return _ndr_$e-{NAME};
+ $retndr = _ndr_$e-{NAME};
+
+ if (defined $compression) {
+ $retndr = ParseCompressionPushStart($e, $retndr, NDR_SCALARS);
+ }
+
+ return $retndr
}
sub ParseSubcontextPushEnd($)
@@ -578,13 +586,19 @@
my $e = shift;
my $header_size = util::has_property($e, subcontext);
my $size_is = util::has_property($e, subcontext_size);
+ my $compression = util::has_property($e, compression);
+ my $ndr = _ndr_$e-{NAME};
+ if (defined $compression) {
+ ParseCompressionPushEnd($e, $ndr);
+ }
+
if (not defined($size_is)) {
$size_is = -1;
}
- pidl NDR_CHECK(ndr_push_subcontext_header(ndr, $header_size, $size_is,
_ndr_$e-{NAME}));;
- pidl NDR_CHECK(ndr_push_bytes(ndr, _ndr_$e-{NAME}-data,
_ndr_$e-{NAME}-offset));;
+ pidl NDR_CHECK(ndr_push_subcontext_header(ndr, $header_size, $size_is,
$ndr));;
+ pidl NDR_CHECK(ndr_push_bytes(ndr, $ndr-data, $ndr-offset));;
deindent;
pidl };
}
@@ -595,6 +609,8 @@
my $ndr_flags = shift;
my $header_size = util::has_property($e, subcontext);
my $size_is = util::has_property($e, subcontext_size);
+ my $retndr = _ndr_$e-{NAME};
+ my $compression = util::has_property($e, compression);
if (not defined($size_is)) {
$size_is = -1;
@@ -602,10 +618,15 @@
pidl if (($ndr_flags) NDR_SCALARS) {;
indent;
- pidl struct ndr_pull *_ndr_$e-{NAME};;
- pidl NDR_ALLOC(ndr, _ndr_$e-{NAME});;
- pidl NDR_CHECK(ndr_pull_subcontext_header(ndr, $header_size, $size_is,
_ndr_$e-{NAME}));;
- return _ndr_$e-{NAME};
+ pidl struct ndr_pull *$retndr;;
+ pidl NDR_ALLOC(ndr, $retndr);;
+ pidl NDR_CHECK(ndr_pull_subcontext_header(ndr, $header_size, $size_is,
$retndr));;
+
+ if (defined $compression) {
+ $retndr = ParseCompressionPullStart($e, $retndr, $ndr_flags);
+ }
+
+ return $retndr;
}
sub ParseSubcontextPullEnd($)
@@ -613,14 +634,20 @@
my $e = shift;
my $header_size = util::has_property($e, subcontext);
my $size_is = util::has_property($e, subcontext_size);
+ my $subndr = _ndr_$e-{NAME};
+ my $compression = util::has_property($e, compression);
+ if (defined $compression) {
+ ParseCompressionPullEnd($e, $subndr);
+ }
+
my $advance;
if (defined ($size_is)) {
$advance = $size_is;
} elsif ($header_size) {
- $advance = _ndr_$e-{NAME}-data_size;
+ $advance = $subndr-data_size;
} else {
- $advance = _ndr_$e-{NAME}-offset;
+ $advance = $subndr-offset;
}
pidl NDR_CHECK(ndr_pull_advance(ndr, $advance));;
deindent;
@@ -637,10 +664,8 @@
my $cprefix = c_push_prefix($e);
my $ptr_prefix = c_ptr_prefix($e);
my $sub_size = util::has_property($e, subcontext);
- my $compression = util::has_property($e, compression);
my $ndr = ndr;
my $subndr = undef;
- my $comndr = undef;
start_flags($e);
@@ -651,10 +676,6 @@
if (defined $sub_size and $e-{POINTERS} == 0) {
$subndr = ParseSubcontextPushStart($e, NDR_SCALARS);
$ndr = $subndr;
- if (defined $compression) {
- $comndr = ParseCompressionPushStart($e, $subndr,
NDR_SCALARS);
- $ndr = $comndr;
- }
}
if (Ndr::need_wire_pointer($e)) {
@@ -672,9 +693,6 @@
}
if (defined $sub_size and $e-{POINTERS} == 0) {
- if (defined $compression) {
- ParseCompressionPushEnd($e, $subndr);
- }
ParseSubcontextPushEnd($e);
}
@@ -795,10 +813,8 @@
my $cprefix = c_pull_prefix($e);
my
svn commit: samba r6144 - in branches/SAMBA_4_0/source/lib/socket_wrapper: .
Author: jelmer
Date: 2005-03-31 00:43:26 + (Thu, 31 Mar 2005)
New Revision: 6144
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6144
Log:
Apparently there are more systems that have AF_UNIX then
AF_LOCAL (we already use AF_UNIX in other places).
Modified:
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
2005-03-31 00:37:01 UTC (rev 6143)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
2005-03-31 00:43:26 UTC (rev 6144)
@@ -129,12 +129,12 @@
if (!out_addr)
return 0;
- out_addr-sun_family = AF_LOCAL;
+ out_addr-sun_family = AF_UNIX;
switch (in_addr-sa_family) {
case AF_INET:
return convert_in_un(si-type, (const struct sockaddr_in
*)in_addr, out_addr);
- case AF_LOCAL:
+ case AF_UNIX:
memcpy(out_addr, in_addr, sizeof(*out_addr));
return 0;
default:
@@ -157,7 +157,7 @@
switch (family) {
case AF_INET:
return convert_un_in(in_addr, (struct sockaddr_in *)out_addr,
out_len);
- case AF_LOCAL:
+ case AF_UNIX:
memcpy(out_addr, in_addr, sizeof(*in_addr));
*out_len = sizeof(*in_addr);
return 0;
@@ -178,7 +178,7 @@
return real_socket(domain, type, protocol);
}
- fd = real_socket(PF_LOCAL, type, 0);
+ fd = real_socket(AF_UNIX, type, 0);
if (fd 0)
return fd;
@@ -330,7 +330,7 @@
}
switch (si-domain) {
- case AF_LOCAL:
+ case AF_UNIX:
return real_getsockopt(s, level, optname, optval, optlen);
default:
errno = ENOPROTOOPT;
@@ -351,7 +351,7 @@
}
switch (si-domain) {
- case AF_LOCAL:
+ case AF_UNIX:
return real_setsockopt(s, level, optname, optval, optlen);
case AF_INET:
/* Silence some warnings */
