svn commit: samba-docs r254 - in trunk/Samba-Guide: .
Author: jht Date: 2004-10-20 06:16:43 + (Wed, 20 Oct 2004) New Revision: 254 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba-docspath=/trunk/Samba-Guiderev=254nolog=1 Log: Updates and fixes. Modified: trunk/Samba-Guide/Chap05-500UserNetwork.xml trunk/Samba-Guide/Chap06-MakingHappyUsers.xml trunk/Samba-Guide/Chap07-2000UserNetwork.xml Changeset: Modified: trunk/Samba-Guide/Chap05-500UserNetwork.xml === --- trunk/Samba-Guide/Chap05-500UserNetwork.xml 2004-10-20 05:58:37 UTC (rev 253) +++ trunk/Samba-Guide/Chap05-500UserNetwork.xml 2004-10-20 06:16:43 UTC (rev 254) @@ -952,12 +952,12 @@ smbconfoptionnameinterfaces/namevalueeth1, lo/value/smbconfoption smbconfoptionnamebind interfaces only/namevalueYes/value/smbconfoption smbconfoptionnamepassdb backend/namevaluetdbsam/value/smbconfoption -smbconfoptionnameadd user script/namevalue/usr/sbin/useradd -m %u/value/smbconfoption -smbconfoptionnamedelete user script/namevalue/usr/sbin/userdel -r %u/value/smbconfoption -smbconfoptionnameadd group script/namevalue/usr/sbin/groupadd %g/value/smbconfoption -smbconfoptionnamedelete group script/namevalue/usr/sbin/groupdel %g/value/smbconfoption -smbconfoptionnameadd user to group script/namevalue/usr/sbin/usermod -G %g %u/value/smbconfoption -smbconfoptionnameadd machine script/namevalue/usr/sbin/useradd -s /bin/false -d /dev/null %u/value/smbconfoption +smbconfoptionnameadd user script/namevalue/usr/sbin/useradd -m '%u'/value/smbconfoption +smbconfoptionnamedelete user script/namevalue/usr/sbin/userdel -r '%u'/value/smbconfoption +smbconfoptionnameadd group script/namevalue/usr/sbin/groupadd '%g'/value/smbconfoption +smbconfoptionnamedelete group script/namevalue/usr/sbin/groupdel '%g'/value/smbconfoption +smbconfoptionnameadd user to group script/namevalue/usr/sbin/usermod -G '%g' '%u'/value/smbconfoption +smbconfoptionnameadd machine script/namevalue/usr/sbin/useradd -s /bin/false -d /dev/null '%u'/value/smbconfoption smbconfoptionnamepreferred master/namevalueYes/value/smbconfoption smbconfoptionnamewins support/namevalueYes/value/smbconfoption smbconfoptionnameinclude/namevalue/etc/samba/dc-common.conf/value/smbconfoption Modified: trunk/Samba-Guide/Chap06-MakingHappyUsers.xml === --- trunk/Samba-Guide/Chap06-MakingHappyUsers.xml 2004-10-20 05:58:37 UTC (rev 253) +++ trunk/Samba-Guide/Chap06-MakingHappyUsers.xml 2004-10-20 06:16:43 UTC (rev 254) @@ -1479,7 +1479,7 @@ smbconfoptionnameprintcap name/namevalueCUPS/value/smbconfoption smbconfoptionnameshow add printer wizard/namevalueNo/value/smbconfoption smbconfoptionnameadd user script/namevalue/var/lib/samba/sbin/smbldap-useradd.pl -a -m '%u'/value/smbconfoption - smbconfoptionnamedelete user script/namevalue/var/lib/samba/sbin/smbldap-userdel.pl %u/value/smbconfoption + smbconfoptionnamedelete user script/namevalue/var/lib/samba/sbin/smbldap-userdel.pl '%u'/value/smbconfoption smbconfoptionnameadd group script/namevalue/var/lib/samba/sbin/smbldap-groupadd.pl -p '%g'/value/smbconfoption smbconfoptionnamedelete group script/namevalue/var/lib/samba/sbin/smbldap-groupdel.pl '%g'/value/smbconfoption smbconfoptionnameadd user to group script/namevalue/var/lib/samba/sbin//value/smbconfoption @@ -3145,35 +3145,35 @@ tbody row entryCache/entry - entry\\%LOGONSERVER%\profdata\%USERNAME%\InternetFiles/entry + entry%LOGONSERVER%\profdata\%USERNAME%\InternetFiles/entry /row row entryCookies/entry - entry\\%LOGONSERVER%\profdata\%USERNAME%\Cookies/entry + entry%LOGONSERVER%\profdata\%USERNAME%\Cookies/entry /row row entryHistory/entry - entry\\%LOGONSERVER%\profdata\%USERNAME%\History/entry + entry%LOGONSERVER%\profdata\%USERNAME%\History/entry /row row entryLocal AppData/entry - entry\\%LOGONSERVER%\profdata\%USERNAME%\AppData/entry + entry%LOGONSERVER%\profdata\%USERNAME%\AppData/entry /row row entryLocal Settings/entry - entry\\%LOGONSERVER%\profdata\%USERNAME%\LocalSettings/entry + entry%LOGONSERVER%\profdata\%USERNAME%\LocalSettings/entry /row row
svn commit: lorikeet r95 - in trunk/samba4-ad-thesis: .
Author: abartlet Date: 2004-10-20 06:25:33 + (Wed, 20 Oct 2004) New Revision: 95 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=lorikeetpath=/trunk/samba4-ad-thesisrev=95nolog=1 Log: Add details on kerberos, fill in the results of the 'experiment'. Spellcheck. Only the crypto-challenges to go. Andrew Bartlett Modified: trunk/samba4-ad-thesis/chapters.lyx trunk/samba4-ad-thesis/rfc.bib trunk/samba4-ad-thesis/thesis.bib Changeset: Sorry, the patch is too large (448 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=lorikeetpath=/trunk/samba4-ad-thesisrev=95nolog=1
svn commit: samba r3081 - in branches/SAMBA_4_0/source: include libcli/raw ntvfs ntvfs/cifs ntvfs/ipc ntvfs/nbench ntvfs/posix smb_server
Author: tridge Date: 2004-10-20 08:28:31 + (Wed, 20 Oct 2004) New Revision: 3081 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=3081nolog=1 Log: several updates to ntvfs and server side async request handling in preparation for the full share modes and ntcreatex code that I am working on. highlights include: - changed the way a backend determines if it is allowed to process a request asynchronously. The previous method of looking at the send_fn caused problems when an intermediate ntvfs module disabled it, and the caller then wanted to finished processing using this function. The new method is a REQ_CONTROL_MAY_ASYNC flag in req-control_flags, which is also a bit easier to read - fixed 2 bugs in the readbraw server code. One related to trying to answer a readbraw with smb signing (which can't work, and crashed our signing code), the second related to error handling, which attempted to send a normal SMB error packet, when readbraw must send a 0 read reply (as it has no header) - added several more ntvfs_generic.c generic mapping functions. This means that backends no longer need to implement such esoteric functions as SMBwriteunlock() if they don't want to. The backend can just request the mapping layer turn it into a write followed by an unlock. This makes the backends considerably simpler as they only need to implement one style of each function for lock, read, write, open etc, rather than the full host of functions that SMB provides. A backend can still choose to implement them individually, of course, and the CIFS backend does that. - simplified the generic structures to make them identical to the principal call for several common SMB calls (such as RAW_WRITE_GENERIC now being an alias for RAW_WRITE_WRITEX). - started rewriting the pvfs_open() code in preparation for the full ntcreatex semantics. - in pvfs_open and ipc_open, initially allocate the open file structure as a child of the request, so on error we don't need to clean up. Then when we are going to succeed the open steal the pointer into the long term backend context. This makes for much simpler error handling (and fixes some bugs) - use a destructor in the ipc backend to make sure that everthing is cleaned up on receive error conditions. - switched the ipc backend to using idtree for fnum allocation - in the ntvfs_generic mapping routines, use a allocated secondary structure not a stack structure to ensure the request pointer remains valid even if the backend replies async. Modified: branches/SAMBA_4_0/source/include/smb.h branches/SAMBA_4_0/source/include/smb_interfaces.h branches/SAMBA_4_0/source/libcli/raw/rawfile.c branches/SAMBA_4_0/source/libcli/raw/rawreadwrite.c branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_write.c branches/SAMBA_4_0/source/smb_server/reply.c branches/SAMBA_4_0/source/smb_server/search.c branches/SAMBA_4_0/source/smb_server/smb_server.h Changeset: Sorry, the patch is too large (2383 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=3081nolog=1
svn commit: lorikeet r96 - in trunk/heimdal: . kdc kuser lib/asn1 lib/hdb lib/kadm5 lib/krb5 lib/roken
Author: abartlet Date: 2004-10-20 10:39:55 + (Wed, 20 Oct 2004) New Revision: 96 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=lorikeetpath=/trunk/heimdalrev=96nolog=1 Log: Merge Heimdal up to snapshot 20041020. This includes Heimdal upstreams's move of string2key code into hdb (thanks lha!) Andrew Bartlett Modified: trunk/heimdal/ChangeLog trunk/heimdal/kdc/pkinit.c trunk/heimdal/kuser/kinit.c trunk/heimdal/kuser/klist.c trunk/heimdal/lib/asn1/k5.asn1 trunk/heimdal/lib/asn1/lex.l trunk/heimdal/lib/asn1/parse.y trunk/heimdal/lib/hdb/keys.c trunk/heimdal/lib/kadm5/ChangeLog trunk/heimdal/lib/kadm5/default_keys.c trunk/heimdal/lib/kadm5/keys.c trunk/heimdal/lib/kadm5/set_keys.c trunk/heimdal/lib/krb5/crypto.c trunk/heimdal/lib/krb5/keytab.c trunk/heimdal/lib/krb5/krb5-private.h trunk/heimdal/lib/krb5/krb5-protos.h trunk/heimdal/lib/krb5/krb5.conf.5 trunk/heimdal/lib/krb5/krb5.conf.cat5 trunk/heimdal/lib/krb5/krb5_err.et trunk/heimdal/lib/krb5/pkinit.c trunk/heimdal/lib/krb5/time.c trunk/heimdal/lib/roken/ChangeLog trunk/heimdal/lib/roken/getprogname.c trunk/heimdal/lib/roken/ndbm_wrap.c trunk/heimdal/lib/roken/resolve.c trunk/heimdal/lib/roken/resolve.h trunk/heimdal/lib/roken/roken.h.in trunk/heimdal/lib/roken/setprogname.c Changeset: Sorry, the patch is too large (2206 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=lorikeetpath=/trunk/heimdalrev=96nolog=1
svn commit: samba r3082 - in branches/SAMBA_4_0/source: include ntvfs/cifs
Author: tridge
Date: 2004-10-20 11:08:58 + (Wed, 20 Oct 2004)
New Revision: 3082
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=3082nolog=1
Log:
added a cifs:mapgeneric option, which tells the cifs backend to use
the ntvfs_generic mapping functions rather than sending the exact
function asked for. This allows the generic mapping functions to be
tested by comparing the behaviour of smbtorture against two cifs
backend shares, one using cifs:mapgeneric = true and the other
cifs:mapgeneric = False
Modified:
branches/SAMBA_4_0/source/include/smb_interfaces.h
branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/smb_interfaces.h
===
--- branches/SAMBA_4_0/source/include/smb_interfaces.h 2004-10-20 08:28:31 UTC (rev
3081)
+++ branches/SAMBA_4_0/source/include/smb_interfaces.h 2004-10-20 11:08:58 UTC (rev
3082)
@@ -1327,7 +1327,8 @@
enum smb_write_level {RAW_WRITE_WRITEUNLOCK, RAW_WRITE_WRITE,
- RAW_WRITE_WRITEX, RAW_WRITE_WRITECLOSE, RAW_WRITE_SPLWRITE};
+ RAW_WRITE_WRITEX, RAW_WRITE_WRITECLOSE,
+ RAW_WRITE_SPLWRITE};
#define RAW_WRITE_GENERIC RAW_WRITE_WRITEX
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2004-10-20 08:28:31 UTC (rev
3081)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2004-10-20 11:08:58 UTC (rev
3082)
@@ -32,7 +32,7 @@
struct smbcli_tree *tree;
struct smbcli_transport *transport;
struct smbsrv_tcon *tcon;
- /*const struct ntvfs_ops *ops;*/
+ BOOL map_generic;
};
@@ -152,6 +152,8 @@
private-transport-event.ctx =
event_context_merge(tcon-smb_conn-connection-event.ctx,
private-transport-event.ctx);
talloc_reference(private, private-transport-event.ctx);
+ private-map_generic = lp_parm_bool(req-tcon-service,
+ cifs, mapgeneric, False);
return NT_STATUS_OK;
}
@@ -370,6 +372,11 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ if (io-generic.level != RAW_OPEN_GENERIC
+ private-map_generic) {
+ return ntvfs_map_open(req, io, ntvfs);
+ }
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_open(private-tree, req, io);
}
@@ -461,6 +468,11 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ if (rd-generic.level != RAW_READ_GENERIC
+ private-map_generic) {
+ return ntvfs_map_read(req, rd, ntvfs);
+ }
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_read(private-tree, rd);
}
@@ -490,6 +502,11 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ if (wr-generic.level != RAW_WRITE_GENERIC
+ private-map_generic) {
+ return ntvfs_map_write(req, wr, ntvfs);
+ }
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_write(private-tree, wr);
}
@@ -503,18 +520,36 @@
seek in a file
*/
static NTSTATUS cvfs_seek(struct ntvfs_module_context *ntvfs,
- struct smbsrv_request *req, struct smb_seek *io)
+ struct smbsrv_request *req, struct smb_seek *io)
{
- return NT_STATUS_NOT_SUPPORTED;
+ struct cvfs_private *private = ntvfs-private_data;
+ struct smbcli_request *c_req;
+
+ if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
+ return smb_raw_seek(private-tree, io);
+ }
+
+ c_req = smb_raw_seek_send(private-tree, io);
+
+ SIMPLE_ASYNC_TAIL;
}
/*
flush a file
*/
static NTSTATUS cvfs_flush(struct ntvfs_module_context *ntvfs,
- struct smbsrv_request *req, struct smb_flush *io)
+ struct smbsrv_request *req, struct smb_flush *io)
{
- return NT_STATUS_OK;
+ struct cvfs_private *private = ntvfs-private_data;
+ struct smbcli_request *c_req;
+
+ if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
+ return smb_raw_flush(private-tree, io);
+ }
+
+ c_req = smb_raw_flush_send(private-tree, io);
+
+ SIMPLE_ASYNC_TAIL;
}
/*
@@ -526,6 +561,11 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ if (io-generic.level != RAW_CLOSE_GENERIC
+ private-map_generic) {
+ return ntvfs_map_close(req, io, ntvfs);
+ }
+
if (!(req-control_flags
svn commit: samba r3083 - in branches/SAMBA_4_0/source/ntvfs: .
Author: tridge
Date: 2004-10-20 11:10:51 + (Wed, 20 Oct 2004)
New Revision: 3083
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ntvfsrev=3083nolog=1
Log:
fixed a couple of generic mapping errors found with RAW-* and cifs:mapgeneric
Modified:
branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2004-10-20 11:08:58 UTC (rev
3082)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2004-10-20 11:10:51 UTC (rev
3083)
@@ -773,7 +773,8 @@
wr-writeunlock.out.nwritten = wr2-generic.out.nwritten;
- if (NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status)
+ lck-unlock.in.count != 0) {
status = ntvfs-ops-lock(ntvfs, req, lck);
}
break;
@@ -798,7 +799,8 @@
status = ntvfs-ops-write(ntvfs, req, wr2);
wr-writeclose.out.nwritten= wr2-generic.out.nwritten;
- if (NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status)
+ wr2-generic.in.count != 0) {
status = ntvfs-ops-close(ntvfs, req, cl);
}
break;
svn commit: samba r3084 - in branches/SAMBA_4_0/source/smb_server: .
Author: tridge Date: 2004-10-20 11:11:55 + (Wed, 20 Oct 2004) New Revision: 3084 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/smb_serverrev=3084nolog=1 Log: mincnt and maxcnt were the wrong way around in readbraw server code Modified: branches/SAMBA_4_0/source/smb_server/reply.c Changeset: Modified: branches/SAMBA_4_0/source/smb_server/reply.c === --- branches/SAMBA_4_0/source/smb_server/reply.c2004-10-20 11:10:51 UTC (rev 3083) +++ branches/SAMBA_4_0/source/smb_server/reply.c2004-10-20 11:11:55 UTC (rev 3084) @@ -675,8 +675,8 @@ io.readbraw.in.fnum= req_fnum(req, req-in.vwv, VWV(0)); io.readbraw.in.offset = IVAL(req-in.vwv, VWV(1)); - io.readbraw.in.mincnt = SVAL(req-in.vwv, VWV(3)); - io.readbraw.in.maxcnt = SVAL(req-in.vwv, VWV(4)); + io.readbraw.in.maxcnt = SVAL(req-in.vwv, VWV(3)); + io.readbraw.in.mincnt = SVAL(req-in.vwv, VWV(4)); io.readbraw.in.timeout = IVAL(req-in.vwv, VWV(5)); /* the 64 bit variant */
svn commit: samba r3085 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2004-10-20 11:13:54 + (Wed, 20 Oct 2004)
New Revision: 3085
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/torture/rawrev=3085nolog=1
Log:
make the RAW-WRITE tests more robust to errors in previous parts of the test
Modified:
branches/SAMBA_4_0/source/torture/raw/write.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/write.c
===
--- branches/SAMBA_4_0/source/torture/raw/write.c 2004-10-20 11:11:55 UTC (rev
3084)
+++ branches/SAMBA_4_0/source/torture/raw/write.c 2004-10-20 11:13:54 UTC (rev
3085)
@@ -58,6 +58,18 @@
#define BASEDIR \\testwrite
+static BOOL setup_dir(struct smbcli_state *cli, const char *dname)
+{
+ smb_raw_exit(cli-session);
+ if (smbcli_deltree(cli-tree, dname) == -1 ||
+ NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, dname))) {
+ printf(Unable to setup %s - %s\n, dname, smbcli_errstr(cli-tree));
+ return False;
+ }
+ return True;
+}
+
+
/*
setup a random buffer based on a seed
*/
@@ -103,9 +115,7 @@
buf = talloc_zero(mem_ctx, maxsize);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
@@ -222,9 +232,7 @@
buf = talloc_zero(mem_ctx, maxsize);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
@@ -396,9 +404,7 @@
buf = talloc_zero(mem_ctx, maxsize);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
@@ -535,9 +541,7 @@
buf = talloc_zero(mem_ctx, maxsize);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
@@ -682,9 +686,7 @@
printf(Testing delayed update of write time\n);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
@@ -715,7 +717,7 @@
written = smbcli_write(cli-tree, fnum1, 0, x, 0, 1);
if (written != 1) {
- printf(write failed - wrote %d bytes\n, written);
+ printf(write failed - wrote %d bytes (%s)\n, written, __location__);
return False;
}
@@ -776,9 +778,7 @@
printf(Testing finfo update on close\n);
- if (smbcli_deltree(cli-tree, BASEDIR) == -1 ||
- NT_STATUS_IS_ERR(smbcli_mkdir(cli-tree, BASEDIR))) {
- printf(Unable to setup %s - %s\n, BASEDIR, smbcli_errstr(cli-tree));
+ if (!setup_dir(cli, BASEDIR)) {
return False;
}
svn commit: samba r3086 - in branches/SAMBA_4_0/source/ntvfs/cifs: .
Author: tridge
Date: 2004-10-20 12:08:40 + (Wed, 20 Oct 2004)
New Revision: 3086
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ntvfs/cifsrev=3086nolog=1
Log:
fixed smbpid handling in the cifs backend
Modified:
branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2004-10-20 11:13:54 UTC (rev
3085)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2004-10-20 12:08:40 UTC (rev
3086)
@@ -42,6 +42,8 @@
void *parms;
};
+#define SETUP_PID private-tree-session-pid = SVAL(req-in.hdr, HDR_PID)
+
/*
an idle function to cope with messages from the smbd client while
waiting for a reply from the server
@@ -136,7 +138,7 @@
}
private-transport = private-tree-session-transport;
- private-tree-session-pid = SVAL(req-in.hdr, HDR_PID);
+ SETUP_PID;
private-tcon = req-tcon;
tcon-fs_type = talloc_strdup(tcon, NTFS);
@@ -209,11 +211,13 @@
The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
*/
static NTSTATUS cvfs_unlink(struct ntvfs_module_context *ntvfs,
- struct smbsrv_request *req, struct smb_unlink *unl)
+ struct smbsrv_request *req, struct smb_unlink *unl)
{
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
/* see if the front end will allow us to perform this
function asynchronously. */
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
@@ -245,6 +249,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
/* see if the front end will allow us to perform this
function asynchronously. */
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
@@ -265,6 +271,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_chkpath(private-tree, cp);
}
@@ -294,6 +302,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_pathinfo(private-tree, req, info);
}
@@ -323,6 +333,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_fileinfo(private-tree, req, info);
}
@@ -342,6 +354,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_setpathinfo(private-tree, st);
}
@@ -372,6 +386,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (io-generic.level != RAW_OPEN_GENERIC
private-map_generic) {
return ntvfs_map_open(req, io, ntvfs);
@@ -395,6 +411,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_mkdir(private-tree, md);
}
@@ -413,6 +431,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_rmdir(private-tree, rd);
}
@@ -430,6 +450,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
return smb_raw_rename(private-tree, ren);
}
@@ -468,6 +490,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (rd-generic.level != RAW_READ_GENERIC
private-map_generic) {
return ntvfs_map_read(req, rd, ntvfs);
@@ -502,6 +526,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (wr-generic.level != RAW_WRITE_GENERIC
private-map_generic) {
return ntvfs_map_write(req, wr, ntvfs);
@@ -525,6 +551,8 @@
struct cvfs_private *private = ntvfs-private_data;
struct smbcli_request *c_req;
+ SETUP_PID;
+
if (!(req-control_flags REQ_CONTROL_MAY_ASYNC)) {
svn commit: samba r3087 - in branches/SAMBA_4_0/source/ntvfs: .
Author: tridge
Date: 2004-10-20 12:24:31 + (Wed, 20 Oct 2004)
New Revision: 3087
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ntvfsrev=3087nolog=1
Log:
fixed a typo
Modified:
branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2004-10-20 12:08:40 UTC (rev
3086)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2004-10-20 12:24:31 UTC (rev
3087)
@@ -913,7 +913,7 @@
return NT_STATUS_NO_MEMORY;
}
- switch (cl2-generic.level) {
+ switch (cl-generic.level) {
case RAW_CLOSE_CLOSE:
return NT_STATUS_INVALID_LEVEL;
svn commit: samba r3088 - in branches/SAMBA_3_0/examples/LDAP: .
Author: jerry Date: 2004-10-20 15:37:47 + (Wed, 20 Oct 2004) New Revision: 3088 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_3_0/examples/LDAPrev=3088nolog=1 Log: update nds schema file from Uli Iske [EMAIL PROTECTED] Modified: branches/SAMBA_3_0/examples/LDAP/samba-nds.schema Changeset: Sorry, the patch is too large (345 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_3_0/examples/LDAPrev=3088nolog=1
svn commit: samba r3089 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
Author: metze
Date: 2004-10-20 17:42:17 + (Wed, 20 Oct 2004)
New Revision: 3089
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldb/ldb_tdbrev=3089nolog=1
Log:
fix memleak
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-10-20 15:37:47
UTC (rev 3088)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-10-20 17:42:17
UTC (rev 3089)
@@ -266,6 +266,7 @@
void ltdb_search_dn1_free(struct ldb_context *ldb, struct ldb_message *msg)
{
unsigned int i;
+ ldb_free(ldb, msg-dn);
ldb_free(ldb, msg-private_data);
for (i=0;imsg-num_elements;i++) {
ldb_free(ldb, msg-elements[i].values);
svn commit: samba r3090 - in branches/SAMBA_4_0/source/lib/ldb/tests: .
Author: metze Date: 2004-10-20 17:43:38 + (Wed, 20 Oct 2004) New Revision: 3090 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldb/testsrev=3090nolog=1 Log: make this execultable metze Modified: branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh Changeset: Property changes on: branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh ___ Name: svn:executable + *
svn commit: samba r3091 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: metze Date: 2004-10-20 19:19:03 + (Wed, 20 Oct 2004) New Revision: 3091 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/tdbrev=3091nolog=1 Log: link only the needed stuff metze Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk === --- branches/SAMBA_4_0/source/lib/tdb/config.mk 2004-10-20 17:43:38 UTC (rev 3090) +++ branches/SAMBA_4_0/source/lib/tdb/config.mk 2004-10-20 19:19:03 UTC (rev 3091) @@ -39,7 +39,7 @@ OBJ_FILES= \ lib/tdb/tools/tdbtool.o REQUIRED_SUBSYSTEMS = \ - LIBBASIC CONFIG LIBCMDLINE LIBTDB + LIBTDB # End BINARY tdbtool @@ -69,6 +69,6 @@ OBJ_FILES= \ lib/tdb/tools/tdbbackup.o REQUIRED_SUBSYSTEMS = \ - LIBBASIC CONFIG LIBCMDLINE LIBTDB + LIBTDB # End BINARY tdbbackup
svn commit: samba r3092 - in branches/SAMBA_4_0/source/lib/ldb/tools: .
Author: metze
Date: 2004-10-20 19:21:10 + (Wed, 20 Oct 2004)
New Revision: 3092
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldb/toolsrev=3092nolog=1
Log:
prepare for build inside samba
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2004-10-20 19:19:03 UTC (rev
3091)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2004-10-20 19:21:10 UTC (rev
3092)
@@ -39,12 +39,12 @@
static struct timeval tp1,tp2;
-static void start_timer(void)
+static void _start_timer(void)
{
gettimeofday(tp1,NULL);
}
-static double end_timer(void)
+static double _end_timer(void)
{
gettimeofday(tp2,NULL);
return((tp2.tv_sec - tp1.tv_sec) +
@@ -259,9 +259,9 @@
add_records(ldb, base_dn, nrecords);
printf(Starting search on uid\n);
- start_timer();
+ _start_timer();
search_uid(ldb, nrecords, nsearches);
- printf(uid search took %.2f seconds\n, end_timer());
+ printf(uid search took %.2f seconds\n, _end_timer());
printf(Modifying records\n);
modify_records(ldb, base_dn, nrecords);
svn commit: samba r3093 - in branches/SAMBA_4_0/source/lib/ldb: . common include ldb_ldap ldb_tdb tests tools
Author: metze Date: 2004-10-20 19:28:02 + (Wed, 20 Oct 2004) New Revision: 3093 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldbrev=3093nolog=1 Log: - implment ldb_rename() and ldbrename - add tests for ldbrename - disable all tests which regenerate the index (this is broken for me...the process hangs, tridge we need to discuss that) - link only the needed stuff to the ldb tools - build ldbtest inside samba metze Added: branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.ldb branches/SAMBA_4_0/source/lib/ldb/common/ldb.c branches/SAMBA_4_0/source/lib/ldb/config.m4 branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/lib/ldb/include/ldb.h branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh Changeset: Sorry, the patch is too large (486 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldbrev=3093nolog=1
svn commit: samba r3094 - in branches/SAMBA_4_0/source/libcli/ldap: .
Author: metze
Date: 2004-10-20 20:34:32 + (Wed, 20 Oct 2004)
New Revision: 3094
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/libcli/ldaprev=3094nolog=1
Log:
import all LDAP error codes from the RFC 2251
metze
Modified:
branches/SAMBA_4_0/source/libcli/ldap/ldap.h
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.h
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.h2004-10-20 19:28:02 UTC (rev
3093)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.h2004-10-20 20:34:32 UTC (rev
3094)
@@ -51,11 +51,45 @@
};
enum ldap_result_code {
- LDAP_SUCCESS = 0,
- LDAP_SASL_BIND_IN_PROGRESS = 0x0e,
- LDAP_NO_SUCH_OBJECT = 0x20,
- LDAP_INVALID_CREDENTIALS = 0x31,
- LDAP_OTHER = 0x50
+ LDAP_SUCCESS= 0,
+ LDAP_OPERATIONS_ERROR = 1,
+ LDAP_PROTOCOL_ERROR = 2,
+ LDAP_TIME_LIMIT_EXCEEDED= 3,
+ LDAP_SIZE_LIMIT_EXCEEDED= 4,
+ LDAP_COMPARE_FALSE = 5,
+ LDAP_COMPARE_TRUe = 6,
+ LDAP_AUTH_METHOD_NOT_SUPPORTED = 7,
+ LDAP_STRONG_AUTH_REQUIRED = 8,
+ LDAP_REFERRAL = 10,
+ LDAP_ADMIN_LIMIT_EXCEEDED = 11,
+ LDAP_UNAVAILABLE_CRITICAL_EXTENSION = 12,
+ LDAP_CONFIDENTIALITY_REQUIRED = 13,
+ LDAP_SASL_BIND_IN_PROGRESS = 14,
+ LDAP_NO_SUCH_ATTRIBUTE = 16,
+ LDAP_UNDEFINED_ATTRIBUTE_TYPE = 17,
+ LDAP_INAPPROPRIATE_MATCHING = 18,
+ LDAP_CONSTRAINT_VIOLATION = 19,
+ LDAP_ATTRIBUTE_OR_VALUE_EXISTS = 20,
+ LDAP_INVALID_ATTRIBUTE_SYNTAX = 21,
+ LDAP_NO_SUCH_OBJECT = 32,
+ LDAP_ALIAS_PROBLEM = 33,
+ LDAP_INVALID_DN_SYNTAX = 34,
+ LDAP_ALIAS_DEREFERENCING_PROBLEM= 36,
+ LDAP_INAPPROPRIATE_AUTHENTICATION = 48,
+ LDAP_INVALID_CREDENTIALS= 49,
+ LDAP_INSUFFICIENT_ACCESS_RIGHTs = 50,
+ LDAP_BUSY = 51,
+ LDAP_UNAVAILABLE= 52,
+ LDAP_UNWILLING_TO_PERFORM = 53,
+ LDAP_LOOP_DETECT= 54,
+ LDAP_NAMING_VIOLATION = 64,
+ LDAP_OBJECT_CLASS_VIOLATION = 65,
+ LDAP_NOT_ALLOWED_ON_NON_LEAF= 66,
+ LDAP_NOT_ALLOWED_ON_RDN = 67,
+ LDAP_ENTRY_ALREADY_EXISTS = 68,
+ LDAP_OBJECT_CLASS_MODS_PROHIBITED = 69,
+ LDAP_AFFECTS_MULTIPLE_DSAS = 71,
+ LDAP_OTHER = 80
};
struct ldap_Result {
svn commit: samba r3095 - in branches/SAMBA_4_0/source/lib/ldb: ldb_tdb tests
Author: metze
Date: 2004-10-20 20:48:31 + (Wed, 20 Oct 2004)
New Revision: 3095
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/ldbrev=3095nolog=1
Log:
- fix a free'ing of msg.dn
- reenable index tests
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-10-20 20:34:32
UTC (rev 3094)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-10-20 20:48:31
UTC (rev 3095)
@@ -266,7 +266,6 @@
void ltdb_search_dn1_free(struct ldb_context *ldb, struct ldb_message *msg)
{
unsigned int i;
- ldb_free(ldb, msg-dn);
ldb_free(ldb, msg-private_data);
for (i=0;imsg-num_elements;i++) {
ldb_free(ldb, msg-elements[i].values);
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2004-10-20 20:34:32 UTC (rev
3094)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2004-10-20 20:48:31 UTC (rev
3095)
@@ -608,7 +608,6 @@
goto failed;
}
- ldb_free(ldb, msg.dn);
msg.dn = ldb_strdup(ldb,newdn);
if (!msg.dn) {
ltdb_search_dn1_free(ldb, msg);
@@ -617,9 +616,11 @@
ret = ltdb_add(ldb, msg);
if (ret == -1) {
+ ldb_free(ldb, msg.dn);
ltdb_search_dn1_free(ldb, msg);
goto failed;
}
+ ldb_free(ldb, msg.dn);
ltdb_search_dn1_free(ldb, msg);
ret = ltdb_delete(ldb, olddn);
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
===
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2004-10-20 20:34:32
UTC (rev 3094)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2004-10-20 20:48:31
UTC (rev 3095)
@@ -17,14 +17,14 @@
echo Showing renamed record
$VALGRIND bin/ldbsearch '(uid=uham)' || exit 1
-#echo Starting ldbtest
-#time $VALGRIND bin/ldbtest -r 1000 -s 10 || exit 1
+echo Starting ldbtest
+time $VALGRIND bin/ldbtest -r 1000 -s 10 || exit 1
-#echo Adding index
-#$VALGRIND bin/ldbadd tests/test-index.ldif || exit 1
+echo Adding index
+$VALGRIND bin/ldbadd tests/test-index.ldif || exit 1
-#echo Starting ldbtest indexed
-#time $VALGRIND bin/ldbtest -r 1000 -s 5000 || exit 1
+echo Starting ldbtest indexed
+time $VALGRIND bin/ldbtest -r 1000 -s 5000 || exit 1
echo Testing one level search
count=`$VALGRIND bin/ldbsearch -b 'ou=Groups,o=University of Michigan,c=US' -s one
'objectclass=*' none |grep ^dn | wc -l`
svn commit: samba r3096 - in branches/SAMBA_4_0/source/libcli/ldap: .
Author: metze Date: 2004-10-20 22:44:08 + (Wed, 20 Oct 2004) New Revision: 3096 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/libcli/ldaprev=3096nolog=1 Log: typo metze Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.h Changeset: Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.h === --- branches/SAMBA_4_0/source/libcli/ldap/ldap.h2004-10-20 20:48:31 UTC (rev 3095) +++ branches/SAMBA_4_0/source/libcli/ldap/ldap.h2004-10-20 22:44:08 UTC (rev 3096) @@ -57,7 +57,7 @@ LDAP_TIME_LIMIT_EXCEEDED= 3, LDAP_SIZE_LIMIT_EXCEEDED= 4, LDAP_COMPARE_FALSE = 5, - LDAP_COMPARE_TRUe = 6, + LDAP_COMPARE_TRUE = 6, LDAP_AUTH_METHOD_NOT_SUPPORTED = 7, LDAP_STRONG_AUTH_REQUIRED = 8, LDAP_REFERRAL = 10,
svn commit: samba r3097 - in branches/SAMBA_4_0/source/ldap_server: .
Author: metze Date: 2004-10-20 23:12:30 + (Wed, 20 Oct 2004) New Revision: 3097 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ldap_serverrev=3097nolog=1 Log: - an empty string is a valid DN - detect in valid DN's - some error handling fixes metze Modified: branches/SAMBA_4_0/source/ldap_server/ldap_parse.c branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c Changeset: Sorry, the patch is too large (528 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ldap_serverrev=3097nolog=1
svn commit: samba-web r377 - in trunk: .
Author: sfrench Date: 2004-10-20 23:22:47 + (Wed, 20 Oct 2004) New Revision: 377 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba-webpath=/trunkrev=377nolog=1 Log: Initial checkin of crypt fs filesystem web page Added: trunk/ecryptfs.html Changeset: Added: trunk/ecryptfs.html === --- trunk/ecryptfs.html 2004-10-19 16:54:31 UTC (rev 376) +++ trunk/ecryptfs.html 2004-10-20 23:22:47 UTC (rev 377) @@ -0,0 +1,63 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN +HTMLHEAD +TITLELinux CIFS Client/TITLE +META http-equiv=Content-Type content=text/html; charset=iso-8859-1 +META content=IBM WebSphere Studio Homepage Builder V6.0.2 for Windows name=GENERATOR +META http-equiv=Content-Style-Type content=text/css +/HEAD +BODYBR +BR +nbsp; +PLATEST UPDATES - initial posting/P +TABLE cellSpacing=2 cellPadding=2 width=100% border=0 + CAPTION + /CAPTION + TBODY +TR + TD bgColor=#ee colSpan=2!-- Title Bar -- + CENTER + H1eCryptFS -nbsp;/H1 + /CENTER + CENTER + H1Enterprise Cryptographic Virtual File System for Linuxnbsp;/H1 + /CENTER + /TD +/TR +TR + TD vAlign=top width=20% bgColor=#ee!-- Menu (Left Column) --!-- Menu -- + CENTERIMG alt=http://us1.samba.org/samba/images/penguin.gif; src=samba/images/penguin.gif/CENTER + A href=mailto:[EMAIL PROTECTED]Questions to developers/A + PDocumentationUL +LIA href=http://broken;Installation/Anbsp; +LIA href=http://broken;Todo/Bug +list/Anbsp; +LIA href=http://broken;Authors/Thanks/Anbsp; +LIA href=http://www.finux.org/Reprints/Reprint-Halcrow-OLS2004.pdf;Linux Cryptographic Filesystems Paper/A/LI + /UL + Downloads + UL +LIA href=http://broken;Latest 2.6 Release (gz)/A +LIA href=http://ecrypts.bkbits.net/;Most current 2.6 source at ecryptfs.bkbits.net (requires installation of +BitKeeper)/A/LI + /UL + /TD + TD vAlign=top bgColor=#ff!-- Main Contents -- + PThe eCrypt file system module for Linux allows eCrypt fs has been + tested with Linux version ... The eCrypt fs is designed for Linux version + 2.6 or later and is not supported on Linux 2.4 kernels.BR + nbsp; + PThe current 2.6 version of the eCrypt VFS is ??? which was released in + November , ??? 2004.PeCrypts VFS is licensed under the A + href=http://www.gnu.org/copyleft/gpl.html;GNU General Public License/A + version 2 or later.nbsp;/P + /TD +/TR +TR + TD vAlign=top/TD + TD vAlign=topThanks to the IBM Linux Technology Center (and to Erez Zadok and the FiST + team for helpful infrastructure and ideas)BR + /TD +/TR + /TBODY +/TABLE +/BODY/HTML Property changes on: trunk/ecryptfs.html ___ Name: svn:executable + *
svn commit: samba r3098 - in branches/SAMBA_4_0/source/ldap_server: .
Author: metze
Date: 2004-10-20 23:25:39 + (Wed, 20 Oct 2004)
New Revision: 3098
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ldap_serverrev=3098nolog=1
Log:
- fix segfault in sldb_Compare()
- be more verbose on the INVALID_DN errstr
metze
Modified:
branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2004-10-20 23:12:30
UTC (rev 3097)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2004-10-20 23:25:39
UTC (rev 3098)
@@ -40,7 +40,7 @@
return NT_STATUS_NO_MEMORY;\
} else if ((dn)-comp_num (i)) {\
result = LDAP_INVALID_DN_SYNTAX;\
- errstr = Invalid DN;\
+ errstr = Invalid DN ( #i components needed for ' #dn ');\
goto reply;\
}\
} while(0)
@@ -176,7 +176,7 @@
struct ldap_AddRequest *r)
{
void *local_ctx;
- struct ldap_dn *ldn;
+ struct ldap_dn *dn;
struct ldap_Result *add_result;
struct ldapsrv_reply *add_reply;
int ldb_ret;
@@ -192,15 +192,15 @@
samdb = samdb_connect(local_ctx);
ALLOC_CHECK(samdb);
- ldn = ldap_parse_dn(local_ctx, r-dn);
- VALID_DN_SYNTAX(ldn,1);
+ dn = ldap_parse_dn(local_ctx, r-dn);
+ VALID_DN_SYNTAX(dn,1);
- DEBUG(10, (sldb_add: dn: [%s]\n, ldn-dn));
+ DEBUG(10, (sldb_add: dn: [%s]\n, dn-dn));
msg = talloc_p(local_ctx, struct ldb_message);
ALLOC_CHECK(msg);
- msg-dn = ldn-dn;
+ msg-dn = dn-dn;
msg-private_data = NULL;
msg-num_elements = 0;
msg-elements = NULL;
@@ -276,7 +276,7 @@
struct ldap_DelRequest *r)
{
void *local_ctx;
- struct ldap_dn *ldn;
+ struct ldap_dn *dn;
struct ldap_Result *del_result;
struct ldapsrv_reply *del_reply;
int ldb_ret;
@@ -290,10 +290,10 @@
samdb = samdb_connect(local_ctx);
ALLOC_CHECK(samdb);
- ldn = ldap_parse_dn(local_ctx, r-dn);
- VALID_DN_SYNTAX(ldn,1);
+ dn = ldap_parse_dn(local_ctx, r-dn);
+ VALID_DN_SYNTAX(dn,1);
- DEBUG(10, (sldb_Del: dn: [%s]\n, ldn-dn));
+ DEBUG(10, (sldb_Del: dn: [%s]\n, dn-dn));
reply:
del_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse);
@@ -301,7 +301,7 @@
if (result == LDAP_SUCCESS) {
ldb_set_alloc(samdb-ldb, talloc_realloc_fn, samdb);
- ldb_ret = ldb_delete(samdb-ldb, ldn-dn);
+ ldb_ret = ldb_delete(samdb-ldb, dn-dn);
if (ldb_ret == 0) {
result = LDAP_SUCCESS;
errstr = NULL;
@@ -329,7 +329,7 @@
struct ldap_ModifyRequest *r)
{
void *local_ctx;
- struct ldap_dn *ldn;
+ struct ldap_dn *dn;
struct ldap_Result *modify_result;
struct ldapsrv_reply *modify_reply;
int ldb_ret;
@@ -345,15 +345,15 @@
samdb = samdb_connect(local_ctx);
ALLOC_CHECK(samdb);
- ldn = ldap_parse_dn(local_ctx, r-dn);
- VALID_DN_SYNTAX(ldn,1);
+ dn = ldap_parse_dn(local_ctx, r-dn);
+ VALID_DN_SYNTAX(dn,1);
- DEBUG(10, (sldb_modify: dn: [%s]\n, ldn-dn));
+ DEBUG(10, (sldb_modify: dn: [%s]\n, dn-dn));
msg = talloc_p(local_ctx, struct ldb_message);
ALLOC_CHECK(msg);
- msg-dn = ldn-dn;
+ msg-dn = dn-dn;
msg-private_data = NULL;
msg-num_elements = 0;
msg-elements = NULL;
@@ -445,7 +445,7 @@
struct ldap_CompareRequest *r)
{
void *local_ctx;
- struct ldap_dn *ldn;
+ struct ldap_dn *dn;
struct ldap_Result *compare;
struct ldapsrv_reply *compare_r;
int result = LDAP_SUCCESS;
@@ -453,7 +453,6 @@
struct ldb_message **res;
const char *attrs[1];
const char *errstr = NULL;
- const char *dn;
const char *filter;
int count;
@@ -463,10 +462,10 @@
samdb = samdb_connect(local_ctx);
ALLOC_CHECK(samdb);
- ldn = ldap_parse_dn(local_ctx, r-dn);
- VALID_DN_SYNTAX(ldn,1);
+ dn = ldap_parse_dn(local_ctx, r-dn);
+ VALID_DN_SYNTAX(dn,1);
- DEBUG(10, (sldb_Compare: dn: [%s]\n, ldn-dn));
+ DEBUG(10, (sldb_Compare: dn: [%s]\n, dn-dn));
filter = talloc_asprintf(local_ctx, (%s=%*s), r-attribute, r-value.length,
r-value.data);
ALLOC_CHECK(filter);
@@ -480,7 +479,7 @@
if (result == LDAP_SUCCESS) {
ldb_set_alloc(samdb-ldb, talloc_realloc_fn, samdb);
- count = ldb_search(samdb-ldb, dn, LDB_SCOPE_BASE, filter, attrs,
res);
+
svn commit: samba r3099 - in branches/SAMBA_4_0/source/ldap_server: .
Author: metze
Date: 2004-10-20 23:27:09 + (Wed, 20 Oct 2004)
New Revision: 3099
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/ldap_serverrev=3099nolog=1
Log:
implment sldb_ModifyDN()
metze
Modified:
branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2004-10-20 23:25:39
UTC (rev 3098)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2004-10-20 23:27:09
UTC (rev 3099)
@@ -510,12 +510,111 @@
return ldapsrv_queue_reply(call, compare_r);
}
+NTSTATUS sldb_ModifyDN(struct ldapsrv_partition *partition, struct ldapsrv_call
*call, struct ldap_ModifyDNRequest *r)
+{
+ void *local_ctx;
+ struct ldap_dn *olddn, *newrdn, *newsuperior;
+ struct ldap_Result *modifydn;
+ struct ldapsrv_reply *modifydn_r;
+ int ldb_ret;
+ struct samdb_context *samdb;
+ const char *errstr = NULL;
+ int result = LDAP_SUCCESS;
+ const char *newdn;
+ char *parentdn = NULL;
+
+ local_ctx = talloc_named(call, 0, sldb_ModifyDN local memory context);
+ ALLOC_CHECK(local_ctx);
+
+ samdb = samdb_connect(local_ctx);
+ ALLOC_CHECK(samdb);
+
+ olddn = ldap_parse_dn(local_ctx, r-dn);
+ VALID_DN_SYNTAX(olddn,2);
+
+ newrdn = ldap_parse_dn(local_ctx, r-newrdn);
+ VALID_DN_SYNTAX(newrdn,1);
+
+ DEBUG(10, (sldb_ModifyDN: olddn: [%s]\n, olddn-dn));
+ DEBUG(10, (sldb_ModifyDN: newrdn: [%s]\n, newrdn-dn));
+
+ /* we can't handle the rename if we should not remove the old dn */
+ if (!r-deleteolddn) {
+ result = LDAP_UNWILLING_TO_PERFORM;
+ errstr = Old RDN must be deleted;
+ goto reply;
+ }
+
+ if (newrdn-comp_num 1) {
+ result = LDAP_NAMING_VIOLATION;
+ errstr = Error new RDN invalid;
+ goto reply;
+ }
+
+ if (r-newsuperior) {
+ newsuperior = ldap_parse_dn(local_ctx, r-newsuperior);
+ VALID_DN_SYNTAX(newsuperior,0);
+ DEBUG(10, (sldb_ModifyDN: newsuperior: [%s]\n, newsuperior-dn));
+
+ if (newsuperior-comp_num 1) {
+ result = LDAP_AFFECTS_MULTIPLE_DSAS;
+ errstr = Error new Superior DN invalid;
+ goto reply;
+ }
+ parentdn = newsuperior-dn;
+ }
+
+ if (!parentdn) {
+ int i;
+ parentdn = talloc_strdup(local_ctx, olddn-components[1]-component);
+ ALLOC_CHECK(parentdn);
+ for(i=2; i olddn-comp_num; i++) {
+ char *old = parentdn;
+ parentdn = talloc_asprintf(local_ctx, %s,%s, old,
olddn-components[i]-component);
+ ALLOC_CHECK(parentdn);
+ talloc_free(old);
+ }
+ }
+ newdn = talloc_asprintf(local_ctx, %s,%s, newrdn-dn, parentdn);
+ ALLOC_CHECK(newdn);
+
+reply:
+ modifydn_r = ldapsrv_init_reply(call, LDAP_TAG_ModifyDNResponse);
+ ALLOC_CHECK(modifydn_r);
+
+ if (result == LDAP_SUCCESS) {
+ ldb_set_alloc(samdb-ldb, talloc_realloc_fn, samdb);
+ ldb_ret = ldb_rename(samdb-ldb, olddn-dn, newdn);
+ if (ldb_ret == 0) {
+ result = LDAP_SUCCESS;
+ errstr = NULL;
+ } else {
+ /* currently we have no way to tell if there was an internal
ldb error
+* or if the object was not found, return the most probable
error
+*/
+ result = LDAP_NO_SUCH_OBJECT;
+ errstr = ldb_errstring(samdb-ldb);
+ }
+ }
+
+ modifydn = modifydn_r-msg.r.ModifyDNResponse;
+ modifydn-dn = NULL;
+ modifydn-resultcode = result;
+ modifydn-errormessage = (errstr?talloc_strdup(modifydn_r,errstr):NULL);
+ modifydn-referral = NULL;
+
+ talloc_free(local_ctx);
+
+ return ldapsrv_queue_reply(call, modifydn_r);
+}
+
static const struct ldapsrv_partition_ops sldb_ops = {
.Search = sldb_Search,
.Add= sldb_Add,
.Del= sldb_Del,
.Modify = sldb_Modify,
- .Compare= sldb_Compare
+ .Compare= sldb_Compare,
+ .ModifyDN = sldb_ModifyDN
};
const struct ldapsrv_partition_ops *ldapsrv_get_sldb_partition_ops(void)
svn commit: samba r3100 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: metze
Date: 2004-10-21 00:26:43 + (Thu, 21 Oct 2004)
New Revision: 3100
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/cmdlinerev=3100nolog=1
Log:
support 'bin/smbclient //w2k3-101/c$ -U [EMAIL PROTECTED]'
we need to send an empty string as userdomain in this case.
fix bug #1317 in the client side
metze
Modified:
branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
branches/SAMBA_4_0/source/lib/cmdline/popt_common.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-20 23:27:09 UTC (rev
3099)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-21 00:26:43 UTC (rev
3100)
@@ -304,6 +304,7 @@
if ((p = strchr_m(tmp,'\\'))) {
*p = 0;
pstrcpy(cmdline_auth_info.domain,tmp);
+ cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.username,p+1);
}
@@ -317,6 +318,7 @@
if (getenv(DOMAIN)) {
pstrcpy(cmdline_auth_info.domain,getenv(DOMAIN));
+ cmdline_auth_info.got_domain = True;
}
if (getenv(PASSWD)) {
@@ -344,6 +346,7 @@
if ((p = strchr_m(tmp,'\\'))) {
*p = 0;
pstrcpy(cmdline_auth_info.domain,tmp);
+ cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.username,p+1);
}
@@ -431,12 +434,13 @@
void cmdline_set_userdomain(const char *domain)
{
+ cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.domain, domain);
}
const char *cmdline_get_userdomain(void)
{
- if (cmdline_auth_info.domain[0]) {
+ if (cmdline_auth_info.got_domain) {
return cmdline_auth_info.domain;
}
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.h
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2004-10-20 23:27:09 UTC (rev
3099)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2004-10-21 00:26:43 UTC (rev
3100)
@@ -40,8 +40,9 @@
struct cmdline_auth_info {
pstring username;
+ pstring domain;
+ BOOL got_domain;
pstring password;
- pstring domain;
BOOL got_pass;
BOOL use_kerberos;
};
svn commit: samba r3101 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: metze
Date: 2004-10-21 00:47:05 + (Thu, 21 Oct 2004)
New Revision: 3101
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/cmdlinerev=3101nolog=1
Log:
some minor fixes
metze
Modified:
branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-21 00:26:43 UTC (rev
3100)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-21 00:47:05 UTC (rev
3101)
@@ -257,15 +257,15 @@
while ((*val!='\0') ((*val==' ') || (*val=='\t')))
val++;
- if (strwicmp(password, param) == 0)
- {
+ if (strwicmp(password, param) == 0) {
pstrcpy(info-password, val);
info-got_pass = True;
- }
- else if (strwicmp(username, param) == 0)
+ } else if (strwicmp(username, param) == 0) {
pstrcpy(info-username, val);
- else if (strwicmp(domain, param) == 0)
+ } else if (strwicmp(domain, param) == 0) {
pstrcpy(info-domain,val);
+ info-got_domain = True;
+ }
memset(buf, 0, sizeof(buf));
}
x_fclose(auth);
@@ -398,12 +398,13 @@
%s$, lp_netbios_name());
pstrcpy(cmdline_auth_info.password,opt_password);
SAFE_FREE(opt_password);
+ cmdline_auth_info.got_pass = True;
- pstrcpy(cmdline_auth_info.password, lp_workgroup());
-
+ pstrcpy(cmdline_auth_info.domain, lp_workgroup());
+ cmdline_auth_info.domain = True;
+
/* machine accounts only work with kerberos */
cmdline_auth_info.use_kerberos = True;
- cmdline_auth_info.got_pass = True;
}
break;
}
svn commit: samba r3102 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: metze Date: 2004-10-21 00:49:39 + (Thu, 21 Oct 2004) New Revision: 3102 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/lib/cmdlinerev=3102nolog=1 Log: typo metze Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c Changeset: Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c === --- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-21 00:47:05 UTC (rev 3101) +++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2004-10-21 00:49:39 UTC (rev 3102) @@ -401,7 +401,7 @@ cmdline_auth_info.got_pass = True; pstrcpy(cmdline_auth_info.domain, lp_workgroup()); - cmdline_auth_info.domain = True; + cmdline_auth_info.got_domain = True; /* machine accounts only work with kerberos */ cmdline_auth_info.use_kerberos = True;
svn commit: samba r3103 - in branches/SAMBA_4_0/source/librpc/rpc: .
Author: tridge
Date: 2004-10-21 01:44:46 + (Thu, 21 Oct 2004)
New Revision: 3103
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/librpc/rpcrev=3103nolog=1
Log:
use a destructor to ensure that on abnormnal rpc request termination
it is removed from the pending list.
Modified:
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2004-10-21 00:49:39 UTC (rev
3102)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2004-10-21 01:44:46 UTC (rev
3103)
@@ -820,6 +820,16 @@
/*
+ make sure requests are cleaned up
+ */
+static int dcerpc_req_destructor(void *ptr)
+{
+ struct rpc_request *req = ptr;
+ DLIST_REMOVE(req-p-pending, req);
+ return 0;
+}
+
+/*
perform the send size of a async dcerpc request
*/
struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
@@ -903,6 +913,8 @@
remaining -= chunk;
}
+ talloc_set_destructor(req, dcerpc_req_destructor);
+
return req;
}
svn commit: samba r3104 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: abartlet
Date: 2004-10-21 01:55:46 + (Thu, 21 Oct 2004)
New Revision: 3104
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/torture/rpcrev=3104nolog=1
Log:
My Win2k3 server, with current updates, still sends the LM key for level 6.
I'm not quite sure what's going on here, but adjust expected values
till I can find out how to reproduce this the other way...
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/torture/rpc/netlogon.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/netlogon.c
===
--- branches/SAMBA_4_0/source/torture/rpc/netlogon.c2004-10-21 01:44:46 UTC (rev
3103)
+++ branches/SAMBA_4_0/source/torture/rpc/netlogon.c2004-10-21 01:55:46 UTC (rev
3104)
@@ -442,7 +442,7 @@
ZERO_STRUCT(user_session_key);
lm_good = SMBencrypt(samlogon_state-password, samlogon_state-chall.data,
lm_response.data);
- if (samlogon_state-r.in.logon_level == 6 || !lm_good) {
+ if (!lm_good) {
ZERO_STRUCT(lm_hash);
} else {
E_deshash(samlogon_state-password, lm_hash);
svn commit: samba r3105 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2004-10-21 03:49:17 + (Thu, 21 Oct 2004)
New Revision: 3105
WebSVN:
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/torture/rawrev=3105nolog=1
Log:
using __location__ instead of __LINE__ to give info on error locations is more useful
Modified:
branches/SAMBA_4_0/source/torture/raw/open.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/open.c
===
--- branches/SAMBA_4_0/source/torture/raw/open.c2004-10-21 01:55:46 UTC (rev
3104)
+++ branches/SAMBA_4_0/source/torture/raw/open.c2004-10-21 03:49:17 UTC (rev
3105)
@@ -55,8 +55,8 @@
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
- printf((%d) Incorrect status %s - should be %s\n, \
- __LINE__, nt_errstr(status), nt_errstr(correct)); \
+ printf((%s) Incorrect status %s - should be %s\n, \
+ __location__, nt_errstr(status), nt_errstr(correct)); \
ret = False; \
goto done; \
}} while (0)
@@ -64,7 +64,7 @@
#define CREATE_FILE do { \
fnum = create_complex_file(cli, mem_ctx, fname); \
if (fnum == -1) { \
- printf((%d) Failed to create %s - %s\n, __LINE__, fname,
smbcli_errstr(cli-tree)); \
+ printf((%s) Failed to create %s - %s\n, __location__, fname,
smbcli_errstr(cli-tree)); \
ret = False; \
goto done; \
}} while (0)
@@ -72,8 +72,8 @@
#define CHECK_RDWR(fnum, correct) do { \
enum rdwr_mode m = check_rdwr(cli-tree, fnum); \
if (m != correct) { \
- printf((%d) Incorrect readwrite mode %s - expected %s\n, \
- __LINE__, rdwr_string(m), rdwr_string(correct)); \
+ printf((%s) Incorrect readwrite mode %s - expected %s\n, \
+ __location__, rdwr_string(m), rdwr_string(correct)); \
ret = False; \
}} while (0)
@@ -86,8 +86,8 @@
t1 = t ~1; \
t2 = nt_time_to_unix(finfo.all_info.out.field) ~1; \
if (ABS(t1-t2) 2) { \
- printf((%d) wrong time for field %s %s - %s\n, \
- __LINE__, #field, \
+ printf((%s) wrong time for field %s %s - %s\n, \
+ __location__, #field, \
timestring(mem_ctx, t1), \
timestring(mem_ctx, t2)); \
dump_all_info(mem_ctx, finfo); \
@@ -102,8 +102,8 @@
CHECK_STATUS(status, NT_STATUS_OK); \
t2 = finfo.all_info.out.field; \
if (t != t2) { \
- printf((%d) wrong time for field %s %s - %s\n, \
- __LINE__, #field, \
+ printf((%s) wrong time for field %s %s - %s\n, \
+ __location__, #field, \
nt_time_string(mem_ctx, t), \
nt_time_string(mem_ctx, t2)); \
dump_all_info(mem_ctx, finfo); \
@@ -116,16 +116,16 @@
status = smb_raw_pathinfo(cli-tree, mem_ctx, finfo); \
CHECK_STATUS(status, NT_STATUS_OK); \
if ((v) != finfo.all_info.out.field) { \
- printf((%d) wrong value for field %s 0x%x - 0x%x\n, \
- __LINE__, #field, (int)v, (int)finfo.all_info.out.field); \
+ printf((%s) wrong value for field %s 0x%x - 0x%x\n, \
+ __location__, #field, (int)v, (int)finfo.all_info.out.field); \
dump_all_info(mem_ctx, finfo); \
ret = False; \
}} while (0)
#define CHECK_VAL(v, correct) do { \
if ((v) != (correct)) { \
- printf((%d) wrong value for %s 0x%x - 0x%x\n, \
- __LINE__, #v, (int)v, (int)correct); \
+ printf((%s) wrong value for %s 0x%x - 0x%x\n, \
+ __location__, #v, (int)v, (int)correct); \
ret = False; \
}} while (0)
@@ -137,8 +137,8 @@
sfinfo.basic_info.in.attrib = sattrib; \
status = smb_raw_setpathinfo(cli-tree, sfinfo); \
if (!NT_STATUS_IS_OK(status)) { \
- printf((%d) Failed to set attrib 0x%x on %s\n, \
- __LINE__, sattrib, fname); \
+ printf((%s) Failed to set attrib 0x%x on %s\n, \
+ __location__, sattrib, fname); \
}} while (0)
/*
@@ -213,8 +213,8 @@
CHECK_RDWR(fnum, RDWR_RDWR);
if (io.open.in.flags != io.open.out.rmode) {
- printf((%d) rmode should equal flags - 0x%x 0x%x\n,
- __LINE__, io.open.out.rmode, io.open.in.flags);
+ printf((%s) rmode should equal flags - 0x%x 0x%x\n,
+ __location__, io.open.out.rmode, io.open.in.flags);
}
io.open.in.flags = OPEN_FLAGS_OPEN_RDWR |
