svn commit: samba r5828 - in branches/SAMBA_4_0/source: include librpc/idl librpc/ndr
Author: metze
Date: 2005-03-16 09:25:52 + (Wed, 16 Mar 2005)
New Revision: 5828
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5828
Log:
add some idl for DsAddEntry()
metze
Modified:
branches/SAMBA_4_0/source/include/structs.h
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-03-16 06:18:20 UTC (rev
5827)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-03-16 09:25:52 UTC (rev
5828)
@@ -29,7 +29,8 @@
struct spoolss_EnumPrinterDrivers;
struct spoolss_EnumPorts;
-struct drsuapi_DsGetNCChangesInfo1;
+struct drsuapi_DsReplicaObjectListItem;
+struct drsuapi_DsReplicaObjectListItemEx;
struct MULTI_QI;
struct COSERVERINFO;
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-16 06:18:20 UTC
(rev 5827)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-16 09:25:52 UTC
(rev 5828)
@@ -114,7 +114,7 @@
/*/
/* Function 0x02 */
- typedef [gensize,flag(NDR_PAHEX)] struct {
+ 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;
GUID guid;
@@ -295,12 +295,12 @@
} drsuapi_DsReplicaObject;
typedef [noprint] struct {
- drsuapi_DsGetNCChangesInfo1 *next;
+ drsuapi_DsReplicaObjectListItemEx *next_object;
drsuapi_DsReplicaObject object;
uint32 unknown1;
GUID *guid;
drsuapi_DsReplicaMetaDataCtr *meta_data_ctr;
- } drsuapi_DsGetNCChangesInfo1;
+ } drsuapi_DsReplicaObjectListItemEx;
typedef struct {
GUID guid1;
@@ -311,7 +311,7 @@
drsuapi_DsReplicaCoursorEx05Ctr *coursor_ex;
drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
uint32 u1[3];
- drsuapi_DsGetNCChangesInfo1 *info1;
+ drsuapi_DsReplicaObjectListItemEx *first_object;
uint32 u2;
} drsuapi_DsGetNCChangesCtr1;
@@ -630,8 +630,53 @@
/*/
/* Function 0x11 */
- WERROR drsuapi_DsAddEntry();
+ typedef [noprint] struct {
+ drsuapi_DsReplicaObjectListItem *next_object;
+ drsuapi_DsReplicaObject object;
+ } drsuapi_DsReplicaObjectListItem;
+ typedef struct {
+ drsuapi_DsReplicaObjectListItem first_object;
+ } drsuapi_DsAddEntryRequest2;
+
+ typedef [switch_type(int32)] union {
+ [case(2)] drsuapi_DsAddEntryRequest2 req2;
+ } drsuapi_DsAddEntryRequest;
+
+ typedef struct {
+ uint32 unknown1;
+ uint32 unknown2;
+ uint32 unknown3;
+ } drsuapi_DsAddEntryCtr3Info1;
+
+ typedef [switch_type(uint32)] union {
+ [case(1)] drsuapi_DsAddEntryCtr3Info1 info1;
+ } drsuapi_DsAddEntryCtr3Info;
+
+ typedef struct {
+ GUID guid;
+ [subcontext_size(28),subcontext(0)] dom_sid sid;
+ } drsuapi_DsReplicaObjectIdentifier2;
+
+ typedef struct {
+ drsuapi_DsReplicaObjectIdentifier *id;
+ uint32 level;
+ [switch_is(level)] drsuapi_DsAddEntryCtr3Info *info;
+ [range(0,1)] uint32 count;
+ [size_is(count)] drsuapi_DsReplicaObjectIdentifier2 *objects[];
+ } drsuapi_DsAddEntryCtr3;
+
+ typedef [switch_type(int32)] union {
+ [case(3)] drsuapi_DsAddEntryCtr3 ctr3;
+ } drsuapi_DsAddEntryCtr;
+
+ WERROR drsuapi_DsAddEntry(
+ [in,ref] policy_handle *bind_handle,
+ [in,out] int32 level,
+ [in,switch_is(level)] drsuapi_DsAddEntryRequest req,
+ [out,switch_is(level)] drsuapi_DsAddEntryCtr ctr
+ );
+
/*/
/* Function 0x12 */
WERROR DRSUAPI_EXECUTE_KCC();
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2005-03-16 06:18:20 UTC
(rev 5827)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2005-03-16 09:25:52 UTC
(rev 5828)
@@ -24,12 +24,23 @@
#include includes.h
#include librpc/gen_ndr/ndr_drsuapi.h
+void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const
char *name, struct drsuapi_DsReplicaObjectListItem *r)
+{
+ ndr_print_struct(ndr, name, drsuapi_DsReplicaObjectListItem);
+
svn commit: samba-docs r424 - in trunk: .
Author: jelmer Date: 2005-03-16 13:01:59 + (Wed, 16 Mar 2005) New Revision: 424 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=424 Log: Update list of (possible) dependencies Allow multiple possible programs (will be used to support multiple xslt processors later on) Modified: trunk/README trunk/aclocal.m4 Changeset: Modified: trunk/README === --- trunk/README2005-03-16 01:57:56 UTC (rev 423) +++ trunk/README2005-03-16 13:01:59 UTC (rev 424) @@ -12,8 +12,6 @@ Run: -autoreconf -./configure make all What are DocBook documents doing in the Samba Distribution ? @@ -53,10 +51,12 @@ To generate the docs, you need to have the following packages installed: - * autoconf + * GNU Make + * GNU autoconf * docbook-utils * xsltproc * pngtopnm and pnmtops (from the netpbm utilities) + * dia For generating PDF (thru LaTeX): * db2latex (from http://db2latex.sf.net/). Make sure to get CVS version @@ -65,13 +65,27 @@ * pdflatex * thumbpdf +For generating PDF (thru FO): + * fop (http://xml.apache.org/fop/) + For generating PostScript (thru LaTeX): + * db2latex * latex * dvips For generating ASCII: * html2text +For generating Palm-viewable docs: + * plucker-build + +For generating texi files: + * docbook2x-texi + * makeinfo + +For validating: + * xmllint + This directory now contains a ./configure script and Makefile to support the automated building of man pages (including HTML versions), and the building of the Samba-HOWTO-Collection and the Modified: trunk/aclocal.m4 === --- trunk/aclocal.m42005-03-16 01:57:56 UTC (rev 423) +++ trunk/aclocal.m42005-03-16 13:01:59 UTC (rev 424) @@ -27,7 +27,7 @@ dnl arg3: target that requires it AC_DEFUN(DOCS_TARGET_REQUIRE_PROGRAM, [ - AC_PATH_PROG([$1], [$2]) + AC_CHECK_PROGS([$1], [$2]) if test x$$1 = x; then if test x$$3_REQUIRES = x; then $3_REQUIRES=$2
svn commit: samba r5829 - in trunk/source/rpc_server: .
Author: jerry
Date: 2005-03-16 14:31:36 + (Wed, 16 Mar 2005)
New Revision: 5829
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5829
Log:
event log read fixups from Marcin Porwit [EMAIL PROTECTED]
Modified:
trunk/source/rpc_server/srv_eventlog_nt.c
Changeset:
Modified: trunk/source/rpc_server/srv_eventlog_nt.c
===
--- trunk/source/rpc_server/srv_eventlog_nt.c 2005-03-16 09:25:52 UTC (rev
5828)
+++ trunk/source/rpc_server/srv_eventlog_nt.c 2005-03-16 14:31:36 UTC (rev
5829)
@@ -71,7 +71,7 @@
handle-data5[4]);
}
-/*
+/**
* Callout to open the specified event log
*
* smbrun calling convention --
@@ -176,7 +176,7 @@
return WERR_OK;
}
-/*
+/**
* Callout to get the number of records in the specified event log
*
* smbrun calling convention --
@@ -252,7 +252,7 @@
return WERR_OK;
}
-/*
+/**
* Callout to find the oldest record in the log
*
* smbrun calling convention --
@@ -330,7 +330,7 @@
return WERR_OK;
}
-/*
+/**
* Callout to close the specified event log
*
* smbrun calling convention --
@@ -419,8 +419,8 @@
{
char *start = NULL, *stop = NULL;
pstring temp;
-int temp_len = 0;
-
+int temp_len = 0, i;
+
start = line;
if(start == NULL || strlen(start) == 0)
@@ -528,7 +528,6 @@
rpcstr_push((void *)(entry-data_record.computer_name), temp,
sizeof(entry-data_record.computer_name), STR_TERMINATE);
entry-data_record.computer_name_len =
(strlen_w(entry-data_record.computer_name)* 2) + 2;
- entry-record.num_strings++;
}
else if(0 == strncmp(start, SID, stop - start))
{
@@ -546,15 +545,27 @@
/* now skip any other leading whitespace */
while(isspace(stop[0]))
stop++;
+ temp_len = strlen(stop);
memset(temp, 0, sizeof(temp));
- temp_len = strlen(stop);
strncpy(temp, stop, temp_len);
- rpcstr_push((void *)(entry-data_record.strings), temp,
- sizeof(entry-data_record.strings), STR_TERMINATE);
- entry-data_record.strings_len = (strlen_w(entry-data_record.strings)
* 2) + 2;
+ rpcstr_push((void *)(entry-data_record.strings +
entry-data_record.strings_len),
+ temp,
+ sizeof(entry-data_record.strings) -
entry-data_record.strings_len,
+ STR_TERMINATE);
+ entry-data_record.strings_len += temp_len + 1;
+ fprintf(stderr, Dumping strings:\n);
+ for(i = 0; i entry-data_record.strings_len; i++)
+ {
+ fputc((char)entry-data_record.strings[i], stderr);
+ }
+ fprintf(stderr, \nDone\n);
+ entry-record.num_strings++;
}
else if(0 == strncmp(start, DAT, stop - start))
{
+ /* Now that we're done processing the STR data, adjust the length to
account for
+ unicode, then proceed with the DAT data. */
+ entry-data_record.strings_len *= 2;
/* skip past initial : */
stop++;
/* now skip any other leading whitespace */
@@ -577,7 +588,7 @@
}
return True;
}
-/*
+/**
* Callout to read entries from the specified event log
*
* smbrun calling convention --
@@ -594,7 +605,6 @@
* TMW:(uint32) - time written, seconds since January 1, 1970,
UTC
* EID:(uint32) - eventlog source defined event identifier. If
there's a stringfile for the event, it is an index into that
* ETP:(uint16) - eventlog type - one of ERROR, WARNING, INFO,
AUDIT_SUCCESS, AUDIT_FAILURE
- * NST:(uint16) - number of strings in this log entry -- for now
we only handle one string, so 0 or 1
* ECT:(uint16) - event category - depends on the eventlog
generator...
* RS2:(uint16) - reserved, make it
* CRN:(uint32) - reserved, make it for now
@@ -602,9 +612,8 @@
* SRC:[(uint8)] - Name of the source, for example ccPwdSvc, in
hex bytes. Can not be multiline.
* SRN:[(uint8)] - Name of the computer on which this is
generated, the short hostname usually.
* SID:[(uint8)] - User sid if one exists. Must be present even
if there is no SID.
- * STR:[(uint8)] - String data. First WORD specifies which
string this is. Would be nice for this to ascend by one each time, maybe start
from zero?
- * followed by the actual string information,
encoded into hex8 characters... If two-plus consecutive lines have same #, it's
means string concats.
- * If two have same #, but not consecutive,
that's an error. If there is no String Data (and NST==0), must include the
specifier.
+ * STR:[(uint8)] - String data. One string per line. Multiple
strings can be specified using consecutive STR lines,
+ *
svn commit: samba-docs r425 - in trunk/xslt: .
Author: jelmer
Date: 2005-03-16 15:33:49 + (Wed, 16 Mar 2005)
New Revision: 425
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=425
Log:
Add xslt script that can generate dependency makefiles
Added:
trunk/xslt/generate-dependencies.xsl
Changeset:
Copied: trunk/xslt/generate-dependencies.xsl (from rev 415,
trunk/xslt/find-image-dependencies.xsl)
===
--- trunk/xslt/find-image-dependencies.xsl 2005-03-13 19:20:25 UTC (rev
415)
+++ trunk/xslt/generate-dependencies.xsl2005-03-16 15:33:49 UTC (rev
425)
@@ -0,0 +1,52 @@
+?xml version='1.0'?
+!--
+ Find the image dependencies of a certain XML file
+ Generates (part of) a Makefile
+
+ - $(FNAME)-images-latex-{png,dvi} for role=latex
+ - $(FNAME)-images-role for all other roles
+ - $(TXTDIR)/$(FNAME)-text
+
+ (C) Jelmer Vernooij 2004-2005
+--
+xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; version=1.1
+ xsl:output method=text/
+
+ xsl:template match=/
+ xsl:for-each select=//mediaobject/[EMAIL PROTECTED] and
not(@role=following::imageobject/@role)]
+ xsl:call-template name=generate-images
+ xsl:with-param name=rolexsl:value-of
select=@role//xsl:with-param
+ /xsl:call-template
+ /xsl:for-each
+ xsl:call-template name=generate-images
+ xsl:with-param name=role/
+ /xsl:call-template
+ xsl:call-template name=generate-txt-chunks/
+ /xsl:template
+
+ xsl:template name=generate-images
+ xsl:value-of
select=$target/xsl:text-images-/xsl:textxsl:value-of
select=$role/xsl:text = /xsl:text
+ xsl:for-each select=//mediaobject/[EMAIL PROTECTED]
+ xsl:value-of select=imagedata/@fileref/
+ xsl:text /xsl:text
+ /xsl:for-each
+ xsl:text#10;/xsl:text
+ /xsl:template
+
+ xsl:template name=generate-txt-chunks
+ xsl:value-of select=$target/xsl:text-txt-chunks:
/xsl:text
+ xsl:for-each select=(//chapter|//preface|//appendix)[EMAIL
PROTECTED]|book
+ xsl:value-of select=$txtbasedir/
+ xsl:choose
+ xsl:when test=name() = 'book'
+ xsl:textindex/xsl:text
+ /xsl:when
+ xsl:when test=@id != ''
+ xsl:value-of select=@id/
+ /xsl:when
+ /xsl:choose
+ xsl:text.txt /xsl:text
+ /xsl:for-each
+ xsl:text#10;/xsl:text
+ /xsl:template
+/xsl:stylesheet
svn commit: samba r5830 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: metze Date: 2005-03-16 15:47:19 + (Wed, 16 Mar 2005) New Revision: 5830 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5830 Log: start to analyse the attribute values, depending on the attribute type metze Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl branches/SAMBA_4_0/source/torture/rpc/drsuapi.c Changeset: Sorry, the patch is too large (273 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5830
svn commit: samba r5831 - in branches/SAMBA_3_0/source/smbd: .
Author: jmcd
Date: 2005-03-16 16:14:04 + (Wed, 16 Mar 2005)
New Revision: 5831
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5831
Log:
Along with jra's recent checkins, fix dir/xcopy of empty dirs on OS/2. Bugs
2335, 2337.
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-16 15:47:19 UTC (rev
5830)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-16 16:14:04 UTC (rev
5831)
@@ -1484,13 +1484,13 @@
}
/*
-* If there are no matching entries we must return ERRDOS/ERRbadfile -
+* If there are no matching entries we must return ERRDOS/ERRnofiles -
* from observation of NT.
*/
if(numentries == 0) {
dptr_close(dptr_num);
- return ERROR_DOS(ERRDOS,ERRbadfile);
+ return ERROR_DOS(ERRDOS,ERRnofiles);
}
/* At this point pdata points to numentries directory entries. */
svn commit: samba-docs r426 - in trunk: .
Author: jelmer Date: 2005-03-16 17:14:05 + (Wed, 16 Mar 2005) New Revision: 426 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=426 Log: Use document names rather then file locations in the makefile. Modified: trunk/Makefile Changeset: Modified: trunk/Makefile === --- trunk/Makefile 2005-03-16 15:33:49 UTC (rev 425) +++ trunk/Makefile 2005-03-16 17:14:05 UTC (rev 426) @@ -7,13 +7,15 @@ -include Makefile.settings # Docs to build -MAIN_DOCS = $(patsubst %/index.xml,$(DOCBOOKDIR)/%.xml,$(wildcard */index.xml)) +MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml)) MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml) # Lists of files to process LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES)) +DATETIME := $(shell date +%Y%m%d%H%M%S) + ifndef OUTPUTDIR Makefile.settings: Makefile.settings.in configure @echo Makefile.settings not present, trying to run configure... @@ -43,29 +45,29 @@ # Pseudo targets all: $(TARGETS) -everything: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson validate +everything: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson release: manpages htmlman html pdf # Output format targets -pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(PDFDIR)/%.pdf,$(MAIN_DOCS)) -dvi: $(patsubst $(DOCBOOKDIR)/%.xml,$(DVIDIR)/%.dvi,$(MAIN_DOCS)) -ps: $(patsubst $(DOCBOOKDIR)/%.xml,$(PSDIR)/%.ps,$(MAIN_DOCS)) -txt: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%.txt,$(MAIN_DOCS)) -txt-chunks: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%/,$(MAIN_DOCS)) -fo: $(patsubst $(DOCBOOKDIR)/%.xml,$(FODIR)/%.fo,$(MAIN_DOCS)) -fo-pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS)) -tex: $(patsubst $(DOCBOOKDIR)/%.xml,%.tex,$(MAIN_DOCS)) -texi: $(patsubst $(DOCBOOKDIR)/%.xml,$(TEXINFODIR)/%.texi,$(MAIN_DOCS)) -texiinfo: $(patsubst $(DOCBOOKDIR)/%.xml,$(TEXINFODIR)/%.info,$(MAIN_DOCS)) +pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS)) +dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS)) +ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS)) +txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS)) +txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS)) +fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS)) +fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS)) +tex: $(addsuffix .tex,$(MAIN_DOCS)) +texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS)) +texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS)) manpages: $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES)) pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html -plucker: $(patsubst $(DOCBOOKDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS)) +plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS)) htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR)/manpages.html -html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS)) -html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html -htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS)) -validate: $(patsubst $(DOCBOOKDIR)/%.xml,%-validate,$(MAIN_DOCS)) +html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)) +html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html +htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS)) +validate: $(addsuffix -validate,$(MAIN_DOCS)) # Intermediate docbook docs @@ -245,8 +247,8 @@ # Archiving archive: pdf mkdir -p $(ARCHIVEDIR) - cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-$(shell date +%Y%m%d%H%M%S).pdf - cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-$(shell date +%Y%m%d%H%M%S).pdf + cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-$(DATETIME).pdf + cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-$(DATETIME).pdf # XSL scripts xslt/html.xsl: xslt/html-common.xsl settings.xsl @@ -265,7 +267,7 @@ rm -f *.xml rm -f xslt/figures/*pdf rm -f $(SMBDOTCONFDOC)/parameters.*.xml - rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS)) + rm -f $(addsuffix .*,$(MAIN_DOCS)) # Always keep intermediate files if we can .SECONDARY:
svn commit: samba-web r583 - in trunk: .
Author: deryck Date: 2005-03-16 18:05:39 + (Wed, 16 Mar 2005) New Revision: 583 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=583 Log: Add link to news RSS feed within header for main samba.org. deryck Modified: trunk/header2.html Changeset: Modified: trunk/header2.html === --- trunk/header2.html 2005-03-14 18:37:04 UTC (rev 582) +++ trunk/header2.html 2005-03-16 18:05:39 UTC (rev 583) @@ -2,6 +2,7 @@ link rel=stylesheet href=/samba/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/style/main.css type=text/css media=all / link rel=shortcut icon href=/samba/images/favicon.ico / +link rel=alternate href=/samba/news/sambanews.xml type=application/rss+xml title=Samba News / !--[if gte IE 5.5] style type=text/css
svn commit: samba r5832 - in trunk/source: include rpc_parse rpc_server
Author: jerry Date: 2005-03-16 18:22:32 + (Wed, 16 Mar 2005) New Revision: 5832 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5832 Log: * add QueryServiceConfig() ControlService() parsing code and stub server support * add prs_io_uinstr2[_p]() for dealing with UNISTR2* rpc elements. (tested it out on QueryServiceConfig() and the SPOOL_USER_1 structure in spoolss code). * started svcctl.tdb interface for persistent storage of service properties. Modified: trunk/source/include/rpc_spoolss.h trunk/source/include/rpc_svcctl.h trunk/source/rpc_parse/parse_misc.c trunk/source/rpc_parse/parse_spoolss.c trunk/source/rpc_parse/parse_svcctl.c trunk/source/rpc_server/srv_svcctl.c trunk/source/rpc_server/srv_svcctl_nt.c Changeset: Sorry, the patch is too large (689 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5832
svn commit: samba r5833 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-16 19:31:15 + (Wed, 16 Mar 2005)
New Revision: 5833
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5833
Log:
Revert change for bug #2335. Tested with a Win9x client and the original
error code is correct. I have some theories as to why this is different,
I'll add some code to the torture tester to confirm.
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-16 18:22:32 UTC (rev
5832)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-16 19:31:15 UTC (rev
5833)
@@ -1484,13 +1484,13 @@
}
/*
-* If there are no matching entries we must return ERRDOS/ERRnofiles -
+* If there are no matching entries we must return ERRDOS/ERRbadfile -
* from observation of NT.
*/
if(numentries == 0) {
dptr_close(dptr_num);
- return ERROR_DOS(ERRDOS,ERRnofiles);
+ return ERROR_DOS(ERRDOS,ERRbadfile);
}
/* At this point pdata points to numentries directory entries. */
svn commit: samba r5834 - in trunk/source: client libsmb
Author: jra Date: 2005-03-16 20:06:58 + (Wed, 16 Mar 2005) New Revision: 5834 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5834 Log: Make smbclient obey the max protocol argument again. Jeremy. Modified: trunk/source/client/client.c trunk/source/libsmb/clidfs.c Changeset: Modified: trunk/source/client/client.c === --- trunk/source/client/client.c2005-03-16 19:31:15 UTC (rev 5833) +++ trunk/source/client/client.c2005-03-16 20:06:58 UTC (rev 5834) @@ -43,7 +43,7 @@ static int io_bufsize = 64512; static int name_type = 0x20; -static int max_protocol = PROTOCOL_NT1; +extern int max_protocol; static int process_tok(pstring tok); static int cmd_help(void); Modified: trunk/source/libsmb/clidfs.c === --- trunk/source/libsmb/clidfs.c2005-03-16 19:31:15 UTC (rev 5833) +++ trunk/source/libsmb/clidfs.c2005-03-16 20:06:58 UTC (rev 5834) @@ -37,10 +37,10 @@ static BOOL use_kerberos; static BOOL got_pass; static int signing_state; +int max_protocol = PROTOCOL_NT1; static int port; static int name_type = 0x20; -static int max_protocol = PROTOCOL_NT1; static BOOL have_ip; static struct in_addr dest_ip;
svn commit: samba r5835 - in branches/SAMBA_3_0/source: client libsmb
Author: jra Date: 2005-03-16 20:07:08 + (Wed, 16 Mar 2005) New Revision: 5835 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5835 Log: Make smbclient obey the max protocol argument again. Jeremy. Modified: branches/SAMBA_3_0/source/client/client.c branches/SAMBA_3_0/source/libsmb/clidfs.c Changeset: Modified: branches/SAMBA_3_0/source/client/client.c === --- branches/SAMBA_3_0/source/client/client.c 2005-03-16 20:06:58 UTC (rev 5834) +++ branches/SAMBA_3_0/source/client/client.c 2005-03-16 20:07:08 UTC (rev 5835) @@ -43,7 +43,7 @@ static int io_bufsize = 64512; static int name_type = 0x20; -static int max_protocol = PROTOCOL_NT1; +extern int max_protocol; static int process_tok(pstring tok); static int cmd_help(void); Modified: branches/SAMBA_3_0/source/libsmb/clidfs.c === --- branches/SAMBA_3_0/source/libsmb/clidfs.c 2005-03-16 20:06:58 UTC (rev 5834) +++ branches/SAMBA_3_0/source/libsmb/clidfs.c 2005-03-16 20:07:08 UTC (rev 5835) @@ -37,10 +37,10 @@ static BOOL use_kerberos; static BOOL got_pass; static int signing_state; +int max_protocol = PROTOCOL_NT1; static int port; static int name_type = 0x20; -static int max_protocol = PROTOCOL_NT1; static BOOL have_ip; static struct in_addr dest_ip;
svn commit: samba-web r584 - in trunk/news/developers: .
Author: deryck Date: 2005-03-16 20:22:50 + (Wed, 16 Mar 2005) New Revision: 584 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=584 Log: Adding news item about crh's jCIFS piece in Linux Magazine. deryck Added: trunk/news/developers/crh_jcifs_can_opener.html Changeset: Added: trunk/news/developers/crh_jcifs_can_opener.html === --- trunk/news/developers/crh_jcifs_can_opener.html 2005-03-16 18:05:39 UTC (rev 583) +++ trunk/news/developers/crh_jcifs_can_opener.html 2005-03-16 20:22:50 UTC (rev 584) @@ -0,0 +1,23 @@ +h3a name=crh_jcifs_can_openerjCIFS Possibilities in Linux Magazine/a/h3 + +div class=article +pSamba Team member Chris Hertel has a new article up on +a href=http://www.linux-mag.com/;Linux Magazine/a. The article +provides a nice introduction to jCIFS and outlines some possible ways +to use jCIFS as an interface to your CIFS server./p + +pHere's a teaser from the piece:/p + +blockquote +jCIFS (http://jcifs.samba.org/) is the product of an unlikely union +between Sun's Java and Microsoft's SMB/CIFS file sharing suite. jCIFS +provides all of the tools a Java coder needs to get along in a Windows +Network Neighborhood; jCIFS dances elegantly with Samba; and jCIFS runs +on everything from palmtops to mainframes. Where else but in open source +could such a story be told? +/blockquote + +pFor the complete article, please see +a href=http://www.linux-mag.com/content/view/127/2123/; jCIFS: The +SMB Can Opener/a./p +/div
svn commit: samba-docs r427 - in trunk/Samba-Guide: .
Author: jht
Date: 2005-03-16 20:24:47 + (Wed, 16 Mar 2005)
New Revision: 427
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=427
Log:
More review needed - this fixes a big glitch.
Modified:
trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
Changeset:
Modified: trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
===
--- trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml 2005-03-16 17:14:05 UTC
(rev 426)
+++ trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml 2005-03-16 20:24:47 UTC
(rev 427)
@@ -862,17 +862,18 @@
# Where are stored Computers
# Ex: computersdn=ou=Computers,dc=IDEALX,dc=ORG
-computersdn=ou=Computers,${suffix}
+computersdn=ou=People,${suffix}
# Where are stored Groups
# Ex groupsdn=ou=Groups,dc=IDEALX,dc=ORG
groupsdn=ou=Groups,${suffix}
+
# Where are stored Idmap entries (used if samba is a domain member server)
# Ex groupsdn=ou=Idmap,dc=IDEALX,dc=ORG
-idmapdn=ou=People,${suffix}
+idmapdn=ou=Idmap,${suffix}
# Where to store next uidNumber and gidNumber available
-sambaUnixIdPooldn=ou=People,${suffix}
+sambaUnixIdPooldn=sambaDomainName=MEGANET2,dc=abmas,dc=biz
# Default scope Used
scope=sub
@@ -883,7 +884,7 @@
titleIdealx smbldap-tools Control File smbmdash; Part C/title
screen
# Unix password encryption (CRYPT, MD5, SMD5, SSHA, SHA)
-hash_encrypt=SSHA
+hash_encrypt=MD5
# if hash_encrypt is set to CRYPT, you may set a salt format.
# default is %s, but many systems will generate MD5 hashed
svn commit: samba r5836 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-16 23:32:42 + (Wed, 16 Mar 2005)
New Revision: 5836
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5836
Log:
Correct fix for OS/2 bug #2335. The error return code in this case is protocol
level dependent.
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-16 20:07:08 UTC (rev
5835)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-16 23:32:42 UTC (rev
5836)
@@ -1485,12 +1485,18 @@
/*
* If there are no matching entries we must return ERRDOS/ERRbadfile -
-* from observation of NT.
+* from observation of NT. NB. This changes to ERRDOS,ERRnofiles if
+* the protocol level is less than NT1. Tested with smbclient. JRA.
+* This should fix the OS/2 client bug #2335.
*/
if(numentries == 0) {
dptr_close(dptr_num);
- return ERROR_DOS(ERRDOS,ERRbadfile);
+ if (protocol PROTOCOL_NT1) {
+ return ERROR_DOS(ERRDOS,ERRnofiles);
+ } else {
+ return
ERROR_BOTH(NT_STATUS_NO_SUCH_FILE,ERRDOS,ERRbadfile);
+ }
}
/* At this point pdata points to numentries directory entries. */
svn commit: samba r5837 - in trunk/source/smbd: .
Author: jra
Date: 2005-03-16 23:32:50 + (Wed, 16 Mar 2005)
New Revision: 5837
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5837
Log:
Correct fix for OS/2 bug #2335. The error return code in this case is protocol
level dependent.
Jeremy
Modified:
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/smbd/trans2.c
===
--- trunk/source/smbd/trans2.c 2005-03-16 23:32:42 UTC (rev 5836)
+++ trunk/source/smbd/trans2.c 2005-03-16 23:32:50 UTC (rev 5837)
@@ -1485,12 +1485,18 @@
/*
* If there are no matching entries we must return ERRDOS/ERRbadfile -
-* from observation of NT.
+* from observation of NT. NB. This changes to ERRDOS,ERRnofiles if
+* the protocol level is less than NT1. Tested with smbclient. JRA.
+* This should fix the OS/2 client bug #2335.
*/
if(numentries == 0) {
dptr_close(dptr_num);
- return ERROR_DOS(ERRDOS,ERRbadfile);
+ if (protocol PROTOCOL_NT1) {
+ return ERROR_DOS(ERRDOS,ERRnofiles);
+ } else {
+ return
ERROR_BOTH(NT_STATUS_NO_SUCH_FILE,ERRDOS,ERRbadfile);
+ }
}
/* At this point pdata points to numentries directory entries. */
Build status as of Thu Mar 17 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-03-16 00:00:39.0 + +++ /home/build/master/cache/broken_results.txt 2005-03-17 00:00:22.0 + @@ -1,39 +1,38 @@ -Build status as of Wed Mar 16 00:00:01 2005 +Build status as of Thu Mar 17 00:00:01 2005 Build counts: Tree Total Broken Panic -ccache 36 3 0 +ccache 37 3 0 distcc 36 2 0 ppp 21 2 0 -rsync36 5 0 +rsync36 4 0 samba1 1 1 samba-docs 0 0 0 -samba4 40 13 0 -samba_3_038 15 1 +samba4 40 11 0 +samba_3_038 18 0 Currently broken builds: Host Tree Compiler Status fusberta samba4 gccok/ 2/?/? -fusberta samba_3_0gccok/ok/ok/ 6/PANIC -yurok samba_3_0gccok/ok/ok/ 1 -samba-s390 samba4 gccok/ 2/?/? +fusberta samba_3_0gccok/ 2/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? -superego rsyncgcc 77/?/?/? superego samba_3_0gccok/ok/ 2/? -cl012 samba_3_0gccok/ok/ok/ 1 +cl012 samba_3_0gccok/ 2/?/? +dev4-003 samba_3_0gccok/ 2/?/? +aretnapsamba_3_0gccok/ 1/?/? aretnapccache iccok/ok/ok/ 1 +sbfsamba_3_0gccok/ 1/?/? +wetlizard samba_3_0gccok/ 2/?/? gwen distcc cc ok/ 1/?/? gwen samba4 cc ok/ 1/?/? gwen samba_3_0cc ok/ 1/?/? us4samba_3_0cc ok/ok/ok/ 2 -us4samba4 gcc 127/?/?/? us4samba_3_0gccok/ok/ok/ 2 flock samba4 gccok/ 1/?/? shubnigurath samba4 cc ok/ 1/?/? -sol10 samba4 gcc 127/?/?/? -sol10 samba_3_0gcc 127/?/?/? +sol10 samba_3_0gccok/ 1/?/? gc20 samba_3_0gccok/ 2/?/? sun1 rsynccc ok/ok/ok/ 2 sun1 samba4 cc ok/ 2/?/? @@ -52,6 +51,7 @@ m30samba4 gccok/ 2/?/? m30samba_3_0gccok/ok/ok/ 1 metze02sambagccok/ok/ok/ 1/PANIC +metze02samba4 gcc-3.4ok/ 2/?/? l390vme1 samba_3_0gccok/ 2/?/? opippp gccok/ 2/?/?
svn commit: samba r5838 - in trunk/source: include rpc_parse rpc_server
Author: jerry Date: 2005-03-17 00:11:26 + (Thu, 17 Mar 2005) New Revision: 5838 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5838 Log: * add InitiateSystemShutdownEx() server support (based on patch by Marcin Porwit [EMAIL PROTECTED] * add UNISTR4 for deal with combined (UNIHDR + UNISTR2*) structures. Includes prs_unistr4_p() Modified: trunk/source/include/rpc_misc.h trunk/source/include/rpc_reg.h trunk/source/rpc_parse/parse_misc.c trunk/source/rpc_parse/parse_prs.c trunk/source/rpc_parse/parse_reg.c trunk/source/rpc_server/srv_reg.c trunk/source/rpc_server/srv_reg_nt.c Changeset: Sorry, the patch is too large (607 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5838
svn commit: samba-docs r428 - in trunk: . scripts xslt
Author: jelmer Date: 2005-03-17 00:13:11 + (Thu, 17 Mar 2005) New Revision: 428 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=428 Log: Autogenerate parts of the makefile rather then calling seperate shell scripts. Avoids a lot of copying images that are already present. Removed: trunk/scripts/copy-images.sh trunk/xslt/find-image-dependencies.xsl Modified: trunk/Makefile trunk/configure.in Changeset: Modified: trunk/Makefile === --- trunk/Makefile 2005-03-16 20:24:47 UTC (rev 427) +++ trunk/Makefile 2005-03-17 00:13:11 UTC (rev 428) @@ -4,7 +4,7 @@ # James Moore [EMAIL PROTECTED] # Gerald Carter [EMAIL PROTECTED] # Jelmer Vernooij [EMAIL PROTECTED] --include Makefile.settings +include Makefile.settings # Docs to build MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml)) @@ -17,7 +17,7 @@ DATETIME := $(shell date +%Y%m%d%H%M%S) ifndef OUTPUTDIR -Makefile.settings: Makefile.settings.in configure +Makefile.settings: configure @echo Makefile.settings not present, trying to run configure... @./configure @@ -91,20 +91,18 @@ mkdir -p $(@D) cp $ $@ -$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl +$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl %-images-html-chunks mkdir -p $(@D) $(XSLTPROC) --stringparam base.dir $(HTMLDIR)/$*/ xslt/html-chunk.xsl $ - mkdir -p $(@D)/images - $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D) # Single large HTML files $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css mkdir -p $(@D) cp $ $@ +$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-html-single + $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl - mkdir -p $(@D)/images - $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D) $(XSLTPROC) --output $@ xslt/html.xsl $ # Attributions @@ -116,15 +114,13 @@ mkdir -p $(@D) $(HTML2TEXT) -nobs -style pretty -o $@ $ -$(TXTDIR)/%/: $(HTMLDIR)/%/index.html - $(MAKE) `echo $(HTMLDIR)/$*/*.html | $(PERL) -p -e 's|$(HTMLDIR)|$(TXTDIR)|g;s/\.html/\.txt/g;'` - # Tex files %.tex: $(DOCBOOKDIR)/%.xml xslt/latex.xsl mkdir -p $(@D) $(XSLTPROC) --output $@ xslt/latex.xsl $ latexfigures: $(LATEX_FIGURES) + touch $@ $(PDFDIR)/%.pdf: %.pdf mkdir -p $(@D) @@ -136,11 +132,46 @@ %.ind: %.idx $(MAKEINDEX) $ +# Dependency files +%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl + $(XSLTPROC) \ + --novalid \ + --stringparam txtbasedir $(TXTDIR)/$*/ \ + --stringparam target $* \ + -o $@ xslt/generate-dependencies.xsl $ + @echo $*-images-latex-png: \$$(addsuffix .png, \$$($*-images-latex)) $@ + @echo touch \$$@ $@ + @echo $@ + @echo $*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex)) $@ + @echo touch \$$@ $@ + @echo $@ + @echo \$$(HTMLDIR)/%: $*/% $@ + @echo mkdir -p \$$(@D) $@ + @echo cp \$$ \$$@ $@ + @echo $@ + @echo \$$(HTMLDIR)/$*/%: $*/% $@ + @echo mkdir -p \$$(@D) $@ + @echo cp \$$ \$$@ $@ + @echo $@ + @echo \$$(HTMLHELPDIR)/$*/%: $*/% $@ + @echo mkdir -p \$$(@D) $@ + @echo cp \$$ \$$@ $@ + @echo $@ + @echo $*-images-html-single: \$$(addprefix \$$(HTMLDIR)/, \$$($*-images-html)) $@ + @echo touch \$$@ $@ + @echo $*-images-html-chunks: \$$(addprefix \$$(HTMLDIR)/$*/, \$$($*-images-html)) $@ + @echo touch \$$@ $@ + @echo $*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/, \$$($*-images-html)) $@ + @echo touch \$$@ $@ + +ifdef OUTPUTDIR +include $(addsuffix .d,$(MAIN_DOCS)) +endif + # Adobe PDF files -%.pdf: %.tex %.ind latexfigures - $(MAKE) $(shell $(XSLTPROC) --stringparam prepend --stringparam append .png --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) +%.pdf: %.tex %.ind latexfigures %-images-latex-png -$(PDFLATEX) $ - $(THUMBPDF) $*.pdf + $(THUMBPDF) --quiet $*.pdf -$(PDFLATEX) $ # DVI files @@ -148,8 +179,7 @@ mkdir -p $(@D) cp $ $@ -%.dvi: %.tex %.idx - $(MAKE) $(shell $(XSLTPROC) --stringparam prepend --stringparam append .eps --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) +%.dvi: %.tex %.idx %-images-latex-eps -$(LATEX) $ %.png: %.dia @@ -176,10 +206,11 @@ mkdir -p $(@D) JAVA_OPTS=-Xmx250m $(FOP) -q -d $ -pdf $@ -$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml - mkdir -p $@/images - $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@ - $(XSLTPROC) --stringparam htmlhelp.chm
svn commit: samba r5839 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-17 00:33:56 + (Thu, 17 Mar 2005)
New Revision: 5839
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5839
Log:
add LDAP DirSync control idl
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2005-03-17 00:11:26 UTC
(rev 5838)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2005-03-17 00:33:56 UTC
(rev 5839)
@@ -126,4 +126,30 @@
void decode_repsFromTo(
[in] repsFromToBlob blob
);
+
+ typedef struct {
+ GUID guid1;
+ dlong usn;
+ } ldapControlDirSyncArray;
+
+ typedef [public] struct {
+ uint8 prefix[4];
+ uint32 u1;
+ NTTIME time;
+ uint32 u2;
+ uint32 u3;
+ uint32 u4;
+ dlong usn1;
+ dlong usn2;
+ dlong usn3;
+ GUID guid1;
+ dlong h4;
+ uint32 count;
+ uint32 u5;
+ ldapControlDirSyncArray array[count];
+ } ldapControlDirSyncBlob;
+
+ void decode_ldapControlDirSync(
+ [in] ldapControlDirSyncBlob blob
+ );
}
svn commit: samba r5840 - in branches/SAMBA_3_0/source/libsmb: .
Author: jra
Date: 2005-03-17 00:37:39 + (Thu, 17 Mar 2005)
New Revision: 5840
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5840
Log:
Fix findfirst/findnext with protocol level NT1.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libsmb/clitrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clitrans.c
===
--- branches/SAMBA_3_0/source/libsmb/clitrans.c 2005-03-17 00:33:56 UTC (rev
5839)
+++ branches/SAMBA_3_0/source/libsmb/clitrans.c 2005-03-17 00:37:39 UTC (rev
5840)
@@ -195,11 +195,12 @@
/*
* An NT RPC pipe call can return ERRDOS, ERRmoredata
* to a trans call. This is not an error and should not
-* be treated as such.
+* be treated as such. Note that STATUS_NO_MORE_FILES is
+* returned when a trans2 findfirst/next finishes.
*/
status = cli_nt_error(cli);
- if (NT_STATUS_IS_ERR(status)) {
+ if (NT_STATUS_IS_ERR(status) ||
NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES)) {
cli_signing_trans_stop(cli);
return False;
}
svn commit: samba r5841 - in trunk/source/libsmb: .
Author: jra
Date: 2005-03-17 00:37:43 + (Thu, 17 Mar 2005)
New Revision: 5841
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5841
Log:
Fix findfirst/findnext with protocol level NT1.
Jeremy.
Modified:
trunk/source/libsmb/clitrans.c
Changeset:
Modified: trunk/source/libsmb/clitrans.c
===
--- trunk/source/libsmb/clitrans.c 2005-03-17 00:37:39 UTC (rev 5840)
+++ trunk/source/libsmb/clitrans.c 2005-03-17 00:37:43 UTC (rev 5841)
@@ -195,11 +195,12 @@
/*
* An NT RPC pipe call can return ERRDOS, ERRmoredata
* to a trans call. This is not an error and should not
-* be treated as such.
+* be treated as such. Note that STATUS_NO_MORE_FILES is
+* returned when a trans2 findfirst/next finishes.
*/
status = cli_nt_error(cli);
- if (NT_STATUS_IS_ERR(status)) {
+ if (NT_STATUS_IS_ERR(status) ||
NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES)) {
cli_signing_trans_stop(cli);
return False;
}
svn commit: samba r5842 - in trunk/source/smbd: .
Author: jra
Date: 2005-03-17 01:02:29 + (Thu, 17 Mar 2005)
New Revision: 5842
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5842
Log:
Removed unused variable - pointed out by [EMAIL PROTECTED] in bugid #2460.
Jeremy.
Modified:
trunk/source/smbd/dir.c
Changeset:
Modified: trunk/source/smbd/dir.c
===
--- trunk/source/smbd/dir.c 2005-03-17 00:37:43 UTC (rev 5841)
+++ trunk/source/smbd/dir.c 2005-03-17 01:02:29 UTC (rev 5842)
@@ -594,10 +594,8 @@
BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset,
SMB_STRUCT_STAT *pst)
{
- BOOL ret;
-
ZERO_STRUCTP(pst);
- while ((ret = SearchDir(dptr-dir_hnd, name, poffset)) == True) {
+ while (SearchDir(dptr-dir_hnd, name, poffset) == True) {
if (is_visible_file(dptr-conn, dptr-path, name, pst, True)) {
return True;
}
svn commit: samba r5843 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-17 01:02:30 + (Thu, 17 Mar 2005)
New Revision: 5843
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5843
Log:
Removed unused variable - pointed out by [EMAIL PROTECTED] in bugid #2460.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/dir.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/dir.c
===
--- branches/SAMBA_3_0/source/smbd/dir.c2005-03-17 01:02:29 UTC (rev
5842)
+++ branches/SAMBA_3_0/source/smbd/dir.c2005-03-17 01:02:30 UTC (rev
5843)
@@ -594,10 +594,8 @@
BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset,
SMB_STRUCT_STAT *pst)
{
- BOOL ret;
-
ZERO_STRUCTP(pst);
- while ((ret = SearchDir(dptr-dir_hnd, name, poffset)) == True) {
+ while (SearchDir(dptr-dir_hnd, name, poffset) == True) {
if (is_visible_file(dptr-conn, dptr-path, name, pst, True)) {
return True;
}
svn commit: samba r5844 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-17 01:19:49 + (Thu, 17 Mar 2005)
New Revision: 5844
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5844
Log:
Fix typo. Add cast for bug #2464 reported by [EMAIL PROTECTED]
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-17 01:02:30 UTC (rev
5843)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-03-17 01:19:49 UTC (rev
5844)
@@ -143,7 +143,7 @@
} else {
pea-name = ea_name;
}
- pea-value.data = val;
+ pea-value.data = (unsigned char *)val;
pea-value.length = (size_t)sizeret;
return True;
}
@@ -1492,7 +1492,7 @@
if(numentries == 0) {
dptr_close(dptr_num);
- if (protocol PROTOCOL_NT1) {
+ if (Protocol PROTOCOL_NT1) {
return ERROR_DOS(ERRDOS,ERRnofiles);
} else {
return
ERROR_BOTH(NT_STATUS_NO_SUCH_FILE,ERRDOS,ERRbadfile);
svn commit: samba r5845 - in trunk/source/smbd: .
Author: jra
Date: 2005-03-17 01:19:50 + (Thu, 17 Mar 2005)
New Revision: 5845
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5845
Log:
Fix typo. Add cast for bug #2464 reported by [EMAIL PROTECTED]
Jeremy.
Modified:
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/smbd/trans2.c
===
--- trunk/source/smbd/trans2.c 2005-03-17 01:19:49 UTC (rev 5844)
+++ trunk/source/smbd/trans2.c 2005-03-17 01:19:50 UTC (rev 5845)
@@ -143,7 +143,7 @@
} else {
pea-name = ea_name;
}
- pea-value.data = val;
+ pea-value.data = (unsigned char *)val;
pea-value.length = (size_t)sizeret;
return True;
}
@@ -1492,7 +1492,7 @@
if(numentries == 0) {
dptr_close(dptr_num);
- if (protocol PROTOCOL_NT1) {
+ if (Protocol PROTOCOL_NT1) {
return ERROR_DOS(ERRDOS,ERRnofiles);
} else {
return
ERROR_BOTH(NT_STATUS_NO_SUCH_FILE,ERRDOS,ERRbadfile);
svn commit: samba r5846 - in trunk/examples/LDAP: .
Author: jra
Date: 2005-03-17 01:24:57 + (Thu, 17 Mar 2005)
New Revision: 5846
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5846
Log:
Fixes from Lars M?\195?\188ller and Vince Brimhall @Novell for NDS
schema.
Jeremy.
Modified:
trunk/examples/LDAP/samba-nds.schema
Changeset:
Modified: trunk/examples/LDAP/samba-nds.schema
===
--- trunk/examples/LDAP/samba-nds.schema2005-03-17 01:19:50 UTC (rev
5845)
+++ trunk/examples/LDAP/samba-nds.schema2005-03-17 01:24:57 UTC (rev
5846)
@@ -128,7 +128,7 @@
dn: cn=schema
changetype: modify
add: attributetypes
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC
'Concatenated MD4 hashes of the unicode passwords used on this account'
EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC
'Concatenated MD4 hashes of the unicode passwords used on this account'
EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
##
## SID, of any type
svn commit: samba r5847 - in branches/SAMBA_3_0/examples/LDAP: .
Author: jra
Date: 2005-03-17 01:25:16 + (Thu, 17 Mar 2005)
New Revision: 5847
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5847
Log:
Fixes from Lars M?\195?\188ller and Vince Brimhall @Novell for NDS
schema.
Jeremy.
Modified:
branches/SAMBA_3_0/examples/LDAP/samba-nds.schema
Changeset:
Modified: branches/SAMBA_3_0/examples/LDAP/samba-nds.schema
===
--- branches/SAMBA_3_0/examples/LDAP/samba-nds.schema 2005-03-17 01:24:57 UTC
(rev 5846)
+++ branches/SAMBA_3_0/examples/LDAP/samba-nds.schema 2005-03-17 01:25:16 UTC
(rev 5847)
@@ -128,7 +128,7 @@
dn: cn=schema
changetype: modify
add: attributetypes
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC
'Concatenated MD4 hashes of the unicode passwords used on this account'
EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC
'Concatenated MD4 hashes of the unicode passwords used on this account'
EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
##
## SID, of any type
svn commit: samba r5848 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-03-17 01:50:09 + (Thu, 17 Mar 2005)
New Revision: 5848
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5848
Log:
Fix inherit owner to chown directories in a porable and secure way (from
just secure on Linux). Idea from tridge.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/open.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===
--- branches/SAMBA_3_0/source/smbd/open.c 2005-03-17 01:25:16 UTC (rev
5847)
+++ branches/SAMBA_3_0/source/smbd/open.c 2005-03-17 01:50:09 UTC (rev
5848)
@@ -115,67 +115,55 @@
} else {
/* We've already done an lstat into psbuf, and we know it's a
directory. If
- we can do an open/fstat and the dev/ino are the same then we
can safely
- fchown without races. This works under Linux - but should
just fail gracefully
- if any step on the way fails. JRA */
+ we can cd into the directory and the dev/ino are the same
then we can safely
+ chown without races as we're locking the directory in place
by being in it.
+ This should work on any UNIX (thanks tridge :-). JRA.
+ */
- BOOL need_close_fsp = False;
+ pstring saved_dir;
SMB_STRUCT_STAT sbuf;
- int fd = -1;
- if (!fsp) {
- int action;
- fsp = open_directory(conn, fname, psbuf,
FILE_GENERIC_READ,
-
SET_DENY_MODE(DENY_NONE)|SET_OPEN_MODE(DOS_OPEN_RDONLY),
- FILE_EXISTS_OPEN, action);
- if (!fsp) {
- DEBUG(10,(change_owner_to_parent:
open_directory on %s failed. Error was %s\n,
- fname, strerror(errno) ));
- return;
- }
- need_close_fsp = True;
- }
- fd = SMB_VFS_OPEN(conn,fname,O_RDONLY,0);
- if (fd == -1) {
- DEBUG(10,(change_owner_to_parent: failed to VFS_OPEN
directory %s. Error was %s\n,
- fname, strerror(errno) ));
+ if (!vfs_GetWd(conn,saved_dir)) {
+ DEBUG(0,(change_owner_to_parent: failed to get current
working directory\n));
+ return;
+ }
+
+ /* Chdir into the new path. */
+ if (vfs_ChDir(conn, fname) == -1) {
+ DEBUG(0,(change_owner_to_parent: failed to change
current working directory to %s. \
+Error was %s\n, fname, strerror(errno) ));
goto out;
}
- ret = SMB_VFS_FSTAT(fsp,fd,sbuf);
- if (ret == -1) {
- DEBUG(10,(change_owner_to_parent: failed to VFS_STAT
directory %s. Error was %s\n,
- fname, strerror(errno) ));
+
+ if (SMB_VFS_STAT(conn,.,sbuf) == -1) {
+ DEBUG(0,(change_owner_to_parent: failed to stat
directory '.' (%s) \
+Error was %s\n, fname, strerror(errno)));
goto out;
}
/* Ensure we're pointing at the same place. */
- if (sbuf.st_dev != psbuf-st_dev || sbuf.st_ino !=
psbuf-st_ino || !S_ISDIR(sbuf.st_mode)) {
- DEBUG(0,(change_owner_to_parent: device/inode/mode on
director %s changed. Refusing to fchown !\n,
+ if (sbuf.st_dev != psbuf-st_dev || sbuf.st_ino !=
psbuf-st_ino || sbuf.st_mode != psbuf-st_mode ) {
+ DEBUG(0,(change_owner_to_parent: device/inode/mode on
directory %s changed. Refusing to chown !\n,
fname ));
goto out;
}
become_root();
- ret = SMB_VFS_FCHOWN(fsp, fd, parent_st.st_uid, (gid_t)-1);
+ ret = SMB_VFS_CHOWN(conn, ., parent_st.st_uid, (gid_t)-1);
unbecome_root();
if (ret == -1) {
- DEBUG(10,(change_owner_to_parent: failed to fchown
directory %s to parent directory uid %u. \
+ DEBUG(10,(change_owner_to_parent: failed to chown
directory %s to parent directory uid %u. \
Error was %s\n,
fname, (unsigned int)parent_st.st_uid,
strerror(errno) ));
goto out;
}
- DEBUG(10,(change_owner_to_parent: changed new directory %s to
parent directory uid %u.\n,
+ DEBUG(10,(change_owner_to_parent: changed ownership of new
directory %s to parent directory uid %u.\n,
fname, (unsigned int)parent_st.st_uid ));
out:
- if (fd != -1)
svn commit: samba r5849 - in trunk/source/smbd: .
Author: jra
Date: 2005-03-17 01:50:09 + (Thu, 17 Mar 2005)
New Revision: 5849
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5849
Log:
Fix inherit owner to chown directories in a porable and secure way (from
just secure on Linux). Idea from tridge.
Jeremy.
Modified:
trunk/source/smbd/open.c
Changeset:
Modified: trunk/source/smbd/open.c
===
--- trunk/source/smbd/open.c2005-03-17 01:50:09 UTC (rev 5848)
+++ trunk/source/smbd/open.c2005-03-17 01:50:09 UTC (rev 5849)
@@ -115,67 +115,55 @@
} else {
/* We've already done an lstat into psbuf, and we know it's a
directory. If
- we can do an open/fstat and the dev/ino are the same then we
can safely
- fchown without races. This works under Linux - but should
just fail gracefully
- if any step on the way fails. JRA */
+ we can cd into the directory and the dev/ino are the same
then we can safely
+ chown without races as we're locking the directory in place
by being in it.
+ This should work on any UNIX (thanks tridge :-). JRA.
+ */
- BOOL need_close_fsp = False;
+ pstring saved_dir;
SMB_STRUCT_STAT sbuf;
- int fd = -1;
- if (!fsp) {
- int action;
- fsp = open_directory(conn, fname, psbuf,
FILE_GENERIC_READ,
-
SET_DENY_MODE(DENY_NONE)|SET_OPEN_MODE(DOS_OPEN_RDONLY),
- FILE_EXISTS_OPEN, action);
- if (!fsp) {
- DEBUG(10,(change_owner_to_parent:
open_directory on %s failed. Error was %s\n,
- fname, strerror(errno) ));
- return;
- }
- need_close_fsp = True;
- }
- fd = SMB_VFS_OPEN(conn,fname,O_RDONLY,0);
- if (fd == -1) {
- DEBUG(10,(change_owner_to_parent: failed to VFS_OPEN
directory %s. Error was %s\n,
- fname, strerror(errno) ));
+ if (!vfs_GetWd(conn,saved_dir)) {
+ DEBUG(0,(change_owner_to_parent: failed to get current
working directory\n));
+ return;
+ }
+
+ /* Chdir into the new path. */
+ if (vfs_ChDir(conn, fname) == -1) {
+ DEBUG(0,(change_owner_to_parent: failed to change
current working directory to %s. \
+Error was %s\n, fname, strerror(errno) ));
goto out;
}
- ret = SMB_VFS_FSTAT(fsp,fd,sbuf);
- if (ret == -1) {
- DEBUG(10,(change_owner_to_parent: failed to VFS_STAT
directory %s. Error was %s\n,
- fname, strerror(errno) ));
+
+ if (SMB_VFS_STAT(conn,.,sbuf) == -1) {
+ DEBUG(0,(change_owner_to_parent: failed to stat
directory '.' (%s) \
+Error was %s\n, fname, strerror(errno)));
goto out;
}
/* Ensure we're pointing at the same place. */
- if (sbuf.st_dev != psbuf-st_dev || sbuf.st_ino !=
psbuf-st_ino || !S_ISDIR(sbuf.st_mode)) {
- DEBUG(0,(change_owner_to_parent: device/inode/mode on
director %s changed. Refusing to fchown !\n,
+ if (sbuf.st_dev != psbuf-st_dev || sbuf.st_ino !=
psbuf-st_ino || sbuf.st_mode != psbuf-st_mode ) {
+ DEBUG(0,(change_owner_to_parent: device/inode/mode on
directory %s changed. Refusing to chown !\n,
fname ));
goto out;
}
become_root();
- ret = SMB_VFS_FCHOWN(fsp, fd, parent_st.st_uid, (gid_t)-1);
+ ret = SMB_VFS_CHOWN(conn, ., parent_st.st_uid, (gid_t)-1);
unbecome_root();
if (ret == -1) {
- DEBUG(10,(change_owner_to_parent: failed to fchown
directory %s to parent directory uid %u. \
+ DEBUG(10,(change_owner_to_parent: failed to chown
directory %s to parent directory uid %u. \
Error was %s\n,
fname, (unsigned int)parent_st.st_uid,
strerror(errno) ));
goto out;
}
- DEBUG(10,(change_owner_to_parent: changed new directory %s to
parent directory uid %u.\n,
+ DEBUG(10,(change_owner_to_parent: changed ownership of new
directory %s to parent directory uid %u.\n,
fname, (unsigned int)parent_st.st_uid ));
out:
- if (fd != -1) {
- SMB_VFS_CLOSE(fsp,fd);
-
svn commit: samba r5850 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-17 04:24:35 + (Thu, 17 Mar 2005)
New Revision: 5850
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5850
Log:
enable parsing of revision 4 security acl's
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
branches/SAMBA_4_0/source/librpc/idl/security.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-17 01:50:09 UTC
(rev 5849)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-17 04:24:35 UTC
(rev 5850)
@@ -384,9 +384,7 @@
[case(DRSUAPI_ATTRIBUTE_objectSid)]
drsuapi_DsAttributeValueCtrSID sid;
/* SecurityDescriptor */
- /* we can't parse some ads specific security_descriptors yet
[case(DRSUAPI_ATTRIBUTE_ntSecurityDescriptor)]
drsuapi_DsAttributeValueCtrSecurityDescriptor security_descriptor;
- */
/* UnicodeString */
[case(DRSUAPI_ATTRIBUTE_description)]
drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
Modified: branches/SAMBA_4_0/source/librpc/idl/security.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/security.idl 2005-03-17 01:50:09 UTC
(rev 5849)
+++ branches/SAMBA_4_0/source/librpc/idl/security.idl 2005-03-17 04:24:35 UTC
(rev 5850)
@@ -214,28 +214,55 @@
SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT= 8
} security_ace_type;
+ typedef bitmap {
+ SEC_ACE_OBJECT_TYPE_PRESENT = 0x0001,
+ SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT = 0x0002
+ } security_ace_object_flags;
+
+ typedef [nodiscriminant] union {
+ /* this is the 'schemaIDGUID' attribute of the attribute object
in the schema naming context */
+ [case(SEC_ACE_OBJECT_TYPE_PRESENT)] GUID type;
+ [default];
+ } security_ace_object_type;
+
+ typedef [nodiscriminant] union {
+ /* this is the 'schemaIDGUID' attribute of the objectclass
object in the schema naming context
+* (of the parent container)
+*/
+ [case(SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)] GUID
inherited_type;
+ [default];
+ } security_ace_object_inherited_type;
+
+ typedef struct {
+ security_ace_object_flags flags;
+ [switch_is(flags SEC_ACE_OBJECT_TYPE_PRESENT)]
security_ace_object_type type;
+ [switch_is(flags SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)]
security_ace_object_inherited_type inherited_type;
+ } security_ace_object;
+
+ typedef [nodiscriminant] union {
+ [case(SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT)] security_ace_object
object;
+ [case(SEC_ACE_TYPE_ACCESS_DENIED_OBJECT)] security_ace_object
object;
+ [case(SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT)] security_ace_object
object;
+ [case(SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT)] security_ace_object
object;
+ [default];
+ } security_ace_object_ctr;
+
typedef [public] struct {
security_ace_type type; /* SEC_ACE_TYPE_* */
security_ace_flags flags; /* SEC_ACE_FLAG_* */
[value(ndr_size_security_ace(r))] uint16 size;
uint32 access_mask;
-
-#if 0
- /* the 'obj' part is present when type is _TYPE__OBJECT
*/
- struct {
- uint32 flags;
- GUID object_guid;
- GUID inherit_guid;
- } *obj;
-#endif
-
+ [switch_is(type)] security_ace_object_ctr object;
dom_sid trustee;
} security_ace;
typedef enum {
- NT4_ACL_REVISION = 2
+ SECURITY_ACL_REVISION_NT4 = 2,
+ SECURITY_ACL_REVISION_ADS = 4
} security_acl_revision;
+ const uint NT4_ACL_REVISION = SECURITY_ACL_REVISION_NT4;
+
typedef [public] struct {
security_acl_revision revision;
[value(ndr_size_security_acl(r))] uint16 size;
@@ -245,10 +272,10 @@
/* default revision for new ACLs */
typedef [enum8bit] enum {
- SEC_DESC_REVISION_1 = 1
+ SECURITY_DESCRIPTOR_REVISION_1 = 1
} security_descriptor_revision;
- const int SD_REVISION= SEC_DESC_REVISION_1;
+ const int SD_REVISION=
SECURITY_DESCRIPTOR_REVISION_1;
/* security_descriptor-type bits */
typedef [bitmap16bit] bitmap {
@@ -277,7 +304,6 @@
const int SECINFO_DACL = 0x0004;
const int SECINFO_SACL = 0x0008;
-
typedef
svn commit: samba r5851 - in branches/SAMBA_3_0/source/libsmb: .
Author: jerry Date: 2005-03-17 04:55:00 + (Thu, 17 Mar 2005) New Revision: 5851 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5851 Log: BUG 2456: reported by Jason Mader; remove non standard pragma (my fault); should fix some builds with non-gcc compilers Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c Changeset: Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c === --- branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-03-17 04:24:35 UTC (rev 5850) +++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-03-17 04:55:00 UTC (rev 5851) @@ -4094,7 +4094,6 @@ dos_attr_parse(context, dad, srv, namevalue); /* Set the new DOS attributes */ -#warning Should try Set Path Info first, but it's not yet implemented #if 0 /* not yet implemented */ if (! cli_setpathinfo(srv-cli, path, dad-c_time, @@ -4233,7 +4232,6 @@ dos_attr_parse(context, dad, srv, namevalue); /* Set the new DOS attributes */ -#warning Should try Set Path Info first, but it's not yet implemented #if 0 /* not yet implemented */ ret2 = cli_setpathinfo(srv-cli, path, dad-c_time,
