Re: svn commit: samba r13615 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/common lib/ldb/include lib/ldb/ldb_ildap lib/ldb/ldb_ldap lib/ldb/ldb_sqlite3 lib/ldb/ldb_tdb lib/ldb/module
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: idra Date: 2006-02-22 05:21:43 + (Wed, 22 Feb 2006) New Revision: 13615 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13615 Log: Make ldb_set_errstring get ldb instead of module as parameter. The module was just used to get to the ldb so it was meningless. Hi Simo, as we allows use talloc_asprintf() or talloc_strdup() together with ldb_set_errstring(), shouldn't we convert it to take vaargs as ldb_debug() and ldb_debug_set() - -- metze Stefan Metzmacher metze at samba.org www.samba.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3-nr1 (Windows XP) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFD/Bprm70gjA5TCD8RAvu3AKCxUu/dgSXmAusMOPlQ5v5ia7JvNwCgxxu5 wFDnkC7zETxAUMzWx9UiiEs= =I80A -END PGP SIGNATURE-
Re: svn commit: samba r13609 - in branches/SAMBA_4_0/source: ldap_server lib/ldb/common lib/ldb/include lib/ldb/ldb_ildap lib/ldb/ldb_sqlite3 lib/ldb/ldb_tdb lib/ldb/tools libcli/ldap
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: idra Date: 2006-02-22 01:31:35 + (Wed, 22 Feb 2006) New Revision: 13609 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13609 Log: Get in the initial work on making ldb async Currently only ldb_ildap is async, the plan is to first make all backend support the async calls, and then remove the sync functions from backends and keep the only in the API. Modules will need to be transformed along the way. Hi Simo, thanks for this work! This looks like a good start! Have you thought about the fact that each ResultEntry and ResultReferral can have controls too! I think it's needed for supporting LDAP syncrepl like openldap, I would really like to support this as a master server so, it would be possible for OpenLDAP server's to provide a readonly copy of a samba4 LDAP server. But also other Client products( address books or something like this) could maintain a cache using this method... - -- metze Stefan Metzmacher metze at samba.org www.samba.org -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3-nr1 (Windows XP) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFD/Bwdm70gjA5TCD8RAgRBAKCQLVai0oPunsNmVnqgF6Lh46NmVgCgwFKo /UdurvOZAl9YEtEmoOffmhw= =kqzZ -END PGP SIGNATURE-
svn commit: samba r13616 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/common lib/ldb/include lib/ldb/modules
Author: abartlet
Date: 2006-02-22 09:28:58 + (Wed, 22 Feb 2006)
New Revision: 13616
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13616
Log:
Add new ldb functions: ldb_msg_add_steal_string() and
ldb_msg_add_steal_value().
These try to maintain the talloc heirachy, which must be correct
otherwise talloc_steal operations of entire attribute lists fails.
This fixes the currentTime value, found by using Microsoft's dcdiag
tool (before this commit, it pointed to invalid memory, due to the
changes in -r 13606)
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/modules/operational.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c 2006-02-22
05:21:43 UTC (rev 13615)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c 2006-02-22
09:28:58 UTC (rev 13616)
@@ -64,8 +64,8 @@
msg-dn = ldb_dn_explode(msg, );
if (do_attribute(s-attrs, currentTime)) {
- if (ldb_msg_add_string(msg, currentTime,
- ldb_timestring(msg, time(NULL))) != 0) {
+ if (ldb_msg_add_steal_string(msg, currentTime,
+ldb_timestring(msg, time(NULL)))
!= 0) {
goto failed;
}
}
@@ -77,8 +77,8 @@
if (!control) {
goto failed;
}
- if (ldb_msg_add_string(msg, supportedControl,
- control) != 0) {
+ if (ldb_msg_add_steal_string(msg, supportedControl,
+control) != 0) {
goto failed;
}
}
@@ -95,12 +95,12 @@
int i;
for (i = 0; ops ops[i]; i++) {
if (ops[i]-sasl_name) {
- const char *sasl_name = talloc_strdup(msg,
ops[i]-sasl_name);
+ char *sasl_name = talloc_strdup(msg,
ops[i]-sasl_name);
if (!sasl_name) {
goto failed;
}
- if (ldb_msg_add_string(msg,
supportedSASLMechanisms,
- sasl_name) != 0) {
+ if (ldb_msg_add_steal_string(msg,
supportedSASLMechanisms,
+sasl_name) != 0) {
goto failed;
}
}
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2006-02-22 05:21:43 UTC
(rev 13615)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2006-02-22 09:28:58 UTC
(rev 13616)
@@ -199,6 +199,24 @@
/*
+ add a value to a message, stealing it into the 'right' place
+*/
+int ldb_msg_add_steal_value(struct ldb_message *msg,
+ const char *attr_name,
+ struct ldb_val *val)
+{
+ int ret;
+ ret = ldb_msg_add_value(msg, attr_name, val);
+ if (ret == LDB_SUCCESS) {
+ struct ldb_message_element *el;
+ el = ldb_msg_find_element(msg, attr_name);
+ talloc_steal(el-values, val-data);
+ }
+ return ret;
+}
+
+
+/*
add a string element to a message
*/
int ldb_msg_add_string(struct ldb_message *msg,
@@ -213,6 +231,20 @@
}
/*
+ add a string element to a message, stealing it into the 'right' place
+*/
+int ldb_msg_add_steal_string(struct ldb_message *msg,
+const char *attr_name, char *str)
+{
+ struct ldb_val val;
+
+ val.data = (uint8_t *)str;
+ val.length = strlen(str);
+
+ return ldb_msg_add_steal_value(msg, attr_name, val);
+}
+
+/*
add a printf formatted element to a message
*/
int ldb_msg_add_fmt(struct ldb_message *msg,
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-02-22 05:21:43 UTC
(rev 13615)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-02-22 09:28:58 UTC
(rev 13616)
@@ -1098,6 +1098,11 @@
int ldb_msg_add_value(struct ldb_message *msg,
const char *attr_name,
const struct ldb_val *val);
+int
svn commit: samba r13617 - in branches/SAMBA_4_0/source/lib: .
Author: metze
Date: 2006-02-22 09:48:13 + (Wed, 22 Feb 2006)
New Revision: 13617
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13617
Log:
fix compiler warning
metze
Modified:
branches/SAMBA_4_0/source/lib/util_file.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/util_file.c
===
--- branches/SAMBA_4_0/source/lib/util_file.c 2006-02-22 09:28:58 UTC (rev
13616)
+++ branches/SAMBA_4_0/source/lib/util_file.c 2006-02-22 09:48:13 UTC (rev
13617)
@@ -195,7 +195,7 @@
/***
mmap (if possible) or read a file
/
-void *map_file(char *fname, size_t size)
+void *map_file(const char *fname, size_t size)
{
size_t s2 = 0;
void *p = NULL;
svn commit: samba r13618 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: metze Date: 2006-02-22 09:48:35 + (Wed, 22 Feb 2006) New Revision: 13618 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13618 Log: fix compiler warning metze Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c Changeset: Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c === --- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c2006-02-22 09:48:13 UTC (rev 13617) +++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c2006-02-22 09:48:35 UTC (rev 13618) @@ -86,7 +86,7 @@ case OPT_PASSWORD: cli_credentials_set_password(cmdline_credentials, arg, CRED_SPECIFIED); /* Try to prevent this showing up in ps */ - memset(arg,0,strlen(arg)); + memset(discard_const(arg),0,strlen(arg)); break; case 'A':
svn commit: samba r13619 - in branches/SAMBA_4_0/source/auth/gensec: .
Author: metze Date: 2006-02-22 09:49:07 + (Wed, 22 Feb 2006) New Revision: 13619 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13619 Log: fix compiler warning metze Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c Changeset: Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c === --- branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-02-22 09:48:35 UTC (rev 13618) +++ branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-02-22 09:49:07 UTC (rev 13619) @@ -1088,7 +1088,7 @@ smb_panic(out of memory (or failed to realloc referenced memory) in gensec_register); } - generic_security_ops[gensec_num_backends] = ops; + generic_security_ops[gensec_num_backends] = discard_const(ops); gensec_num_backends++; generic_security_ops[gensec_num_backends] = NULL;
svn commit: samba r13620 - in branches/SAMBA_4_0/source/smb_server/smb: .
Author: metze
Date: 2006-02-22 09:50:07 + (Wed, 22 Feb 2006)
New Revision: 13620
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13620
Log:
initialize the CMD with 0 too
metze
Modified:
branches/SAMBA_4_0/source/smb_server/smb/request.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/request.c
===
--- branches/SAMBA_4_0/source/smb_server/smb/request.c 2006-02-22 09:49:07 UTC
(rev 13619)
+++ branches/SAMBA_4_0/source/smb_server/smb/request.c 2006-02-22 09:50:07 UTC
(rev 13620)
@@ -160,6 +160,7 @@
SSVAL(req-out.hdr,HDR_UID,SVAL(req-in.hdr,HDR_UID));
SSVAL(req-out.hdr,HDR_MID,SVAL(req-in.hdr,HDR_MID));
} else {
+ SCVAL(req-out.hdr,HDR_COM,0);
SSVAL(req-out.hdr,HDR_TID,0);
SSVAL(req-out.hdr,HDR_PID,0);
SSVAL(req-out.hdr,HDR_UID,0);
svn commit: samba r13621 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2006-02-22 10:23:14 + (Wed, 22 Feb 2006)
New Revision: 13621
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13621
Log:
add an idl structure to parse saslauthd requests
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 2006-02-22 09:50:07 UTC
(rev 13620)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2006-02-22 10:23:14 UTC
(rev 13621)
@@ -163,4 +163,18 @@
[in] DsCompressedBlob blob
);
+ typedef [public,flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX)] struct {
+ [value(strlen_m(authid))] uint16 authid_length;
+ [charset(UTF8)] uint8 authid[authid_length];
+ uint16 passwd_length;
+ uint8 passwd[passwd_length];
+ [value(strlen_m(service))] uint16 service_length;
+ [charset(UTF8)] uint8 service[service_length];
+ [value(strlen_m(realm))] uint16 realm_length;
+ [charset(UTF8)] uint8 realm[realm_length];
+ } saslauthdRequest;
+
+ void decode_saslauthd(
+ [in] saslauthdRequest req
+ );
}
svn commit: samba r13622 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/passdb branches/SAMBA_3_0/source/printing branches/SAMBA_3_0/source/rpc_server trunk/source/lib trunk/source/passdb t
Author: gd Date: 2006-02-22 10:28:02 + (Wed, 22 Feb 2006) New Revision: 13622 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13622 Log: Allow to rename machine accounts in a Samba Domain. This still uses the rename user script to do the rename of the posix machine account (this might be changed later). Fixes #2331. Guenther Modified: branches/SAMBA_3_0/source/lib/util_str.c branches/SAMBA_3_0/source/passdb/pdb_ldap.c branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c branches/SAMBA_3_0/source/passdb/pdb_tdb.c branches/SAMBA_3_0/source/printing/printing.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c trunk/source/lib/util_str.c trunk/source/passdb/pdb_ldap.c trunk/source/passdb/pdb_smbpasswd.c trunk/source/passdb/pdb_tdb.c trunk/source/printing/printing.c trunk/source/rpc_server/srv_samr_nt.c Changeset: Sorry, the patch is too large (349 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13622
svn commit: samba r13623 - in branches/SAMBA_4_0/source/ntvfs: .
Author: metze
Date: 2006-02-22 11:11:16 + (Wed, 22 Feb 2006)
New Revision: 13623
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13623
Log:
- make sure ntvfs_map_qfileinfo isn't used for async replies
- add some comments
metze
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 2006-02-22 10:28:02 UTC
(rev 13622)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2006-02-22 11:11:16 UTC
(rev 13623)
@@ -495,8 +495,7 @@
return NT_STATUS_INVALID_LEVEL;
}
- /* this map function is only used by the simple backend, which
- doesn't do async */
+ /* only used by the simple backend, which doesn't do async */
req-async_states-state = ~NTVFS_ASYNC_STATE_MAY_ASYNC;
/* ask the backend for the generic info */
@@ -854,6 +853,9 @@
info2-generic.level = RAW_FILEINFO_GENERIC;
info2-generic.in.fnum = info-generic.in.fnum;
+ /* only used by the simple backend, which doesn't do async */
+ req-async_states-state = ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
status = ntvfs-ops-qfileinfo(ntvfs, req, info2);
if (!NT_STATUS_IS_OK(status)) {
return status;
@@ -937,6 +939,11 @@
locks-offset = lck-lock.in.offset;
locks-count = lck-lock.in.count;
+ /*
+* we don't need to call ntvfs_map_async_setup() here,
+* as lock() doesn't have any output fields
+*/
+
return ntvfs-ops-lock(ntvfs, req, lck2);
}
@@ -1222,5 +1229,10 @@
break;
}
+ /*
+* we don't need to call ntvfs_map_async_setup() here,
+* as close() doesn't have any output fields
+*/
+
return ntvfs-ops-close(ntvfs, req, cl2);
}
svn commit: samba r13624 - in branches/SAMBA_4_0/source/librpc: . idl
Author: metze
Date: 2006-02-22 11:19:46 + (Wed, 22 Feb 2006)
New Revision: 13624
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13624
Log:
as abartlet requested, move the saslauthd parsing stuff to a seperate file
metze
Added:
branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl
Modified:
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===
--- branches/SAMBA_4_0/source/librpc/config.mk 2006-02-22 11:11:16 UTC (rev
13623)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2006-02-22 11:19:46 UTC (rev
13624)
@@ -112,6 +112,11 @@
NOPROTO = YES
REQUIRED_SUBSYSTEMS = LIBNDR
+[SUBSYSTEM::NDR_SASL_HELPERS]
+OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
+NOPROTO = YES
+REQUIRED_SUBSYSTEMS = LIBNDR
+
[SUBSYSTEM::NDR_POLICYAGENT]
OBJ_FILES = gen_ndr/ndr_policyagent.o
NOPROTO = YES
@@ -314,7 +319,8 @@
NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_NTSVCS \
NDR_NETLOGON NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL NDR_SECURITY \
- NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM
+ NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM \
+ NDR_SASL_HELPERS
[SUBSYSTEM::RPC_NDR_ROT]
OBJ_FILES = gen_ndr/ndr_rot_c.o
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2006-02-22 11:11:16 UTC
(rev 13623)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2006-02-22 11:19:46 UTC
(rev 13624)
@@ -1,7 +1,7 @@
#include idl_types.h
[
- uuid(38578646-4566-4564-2244-275796345667),
+ uuid(1-2-3-4-5),
version(0.0),
pointer_default(unique),
helpstring(Active Directory Replication LDAP Blobs),
@@ -162,19 +162,4 @@
void decode_DsCompressed(
[in] DsCompressedBlob blob
);
-
- typedef [public,flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX)] struct {
- [value(strlen_m(authid))] uint16 authid_length;
- [charset(UTF8)] uint8 authid[authid_length];
- uint16 passwd_length;
- uint8 passwd[passwd_length];
- [value(strlen_m(service))] uint16 service_length;
- [charset(UTF8)] uint8 service[service_length];
- [value(strlen_m(realm))] uint16 realm_length;
- [charset(UTF8)] uint8 realm[realm_length];
- } saslauthdRequest;
-
- void decode_saslauthd(
- [in] saslauthdRequest req
- );
}
Added: branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl 2006-02-22
11:11:16 UTC (rev 13623)
+++ branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl 2006-02-22
11:19:46 UTC (rev 13624)
@@ -0,0 +1,24 @@
+#include idl_types.h
+
+[
+ uuid(1-2-3-4-5),
+ version(0.0),
+ pointer_default(unique),
+ helpstring(SASL helpers)
+]
+interface sasl_helpers {
+ typedef [public,flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX)] struct {
+ [value(strlen_m(authid))] uint16 authid_length;
+ [charset(UTF8)] uint8 authid[authid_length];
+ uint16 passwd_length;
+ uint8 passwd[passwd_length];
+ [value(strlen_m(service))] uint16 service_length;
+ [charset(UTF8)] uint8 service[service_length];
+ [value(strlen_m(realm))] uint16 realm_length;
+ [charset(UTF8)] uint8 realm[realm_length];
+ } saslauthdRequest;
+
+ void decode_saslauthd(
+ [in] saslauthdRequest req
+ );
+}
svn commit: samba r13625 - branches/SAMBA_3_0/source/include trunk/source/include
Author: gd Date: 2006-02-22 11:47:41 + (Wed, 22 Feb 2006) New Revision: 13625 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13625 Log: Now that Heimdal 0.7.2 is released, we reenable our strict checking for c++ reserved names. Guenther Modified: branches/SAMBA_3_0/source/include/includes.h trunk/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2006-02-22 11:19:46 UTC (rev 13624) +++ branches/SAMBA_3_0/source/include/includes.h2006-02-22 11:47:41 UTC (rev 13625) @@ -27,8 +27,7 @@ #ifndef __cplusplus #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -/* allow to build with newer heimdal releases */ -/* #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ +#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES Modified: trunk/source/include/includes.h === --- trunk/source/include/includes.h 2006-02-22 11:19:46 UTC (rev 13624) +++ trunk/source/include/includes.h 2006-02-22 11:47:41 UTC (rev 13625) @@ -27,8 +27,7 @@ #ifndef __cplusplus #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES -/* allow to build with newer heimdal releases */ -/* #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES */ +#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
svn commit: samba r13626 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze Date: 2006-02-22 11:53:04 + (Wed, 22 Feb 2006) New Revision: 13626 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13626 Log: fix make test metze Modified: branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl === --- branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl 2006-02-22 11:47:41 UTC (rev 13625) +++ branches/SAMBA_4_0/source/librpc/idl/sasl_helpers.idl 2006-02-22 11:53:04 UTC (rev 13626) @@ -1,8 +1,6 @@ #include idl_types.h [ - uuid(1-2-3-4-5), - version(0.0), pointer_default(unique), helpstring(SASL helpers) ]
svn commit: samba r13627 - in branches/SAMBA_4_0/source: script/tests torture torture/nbt
Author: metze
Date: 2006-02-22 12:10:29 + (Wed, 22 Feb 2006)
New Revision: 13627
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13627
Log:
split the NBT-WINSREPLICATION tests into multiple tests
metze
Modified:
branches/SAMBA_4_0/source/script/tests/test_nbt.sh
branches/SAMBA_4_0/source/script/tests/tests_quick.sh
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2006-02-22 11:53:04 UTC
(rev 13626)
+++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2006-02-22 12:10:29 UTC
(rev 13627)
@@ -21,7 +21,15 @@
testit nmblookup -U $SERVER $SERVER bin/nmblookup $TORTURE_OPTIONS -U
$SERVER $SERVER || failed=`expr $failed + 1`
testit nmblookup $SERVER bin/nmblookup $TORTURE_OPTIONS $SERVER ||
failed=`expr $failed + 1`
-for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION NET-API-LOOKUP
NET-API-LOOKUPHOST NET-API-LOOKUPPDC; do
+NBT_TESTS=NBT-REGISTER NBT-WINS
+NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-SIMPLE
+NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-REPLICA
+if [ $TORTURE_QUICKx = yesx ]; then
+ NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-OWNED
+fi
+NBT_TESTS=$NBT_TESTS NET-API-LOOKUP NET-API-LOOKUPHOST NET-API-LOOKUPPDC
+
+for f in $NBT_TESTS; do
testit $f bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f ||
failed=`expr $failed + 1`
done
Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh
===
--- branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2006-02-22
11:53:04 UTC (rev 13626)
+++ branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2006-02-22
12:10:29 UTC (rev 13627)
@@ -1,4 +1,5 @@
TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:quick=yes
+TORTURE_QUICK=yes
$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || failed=`expr
$failed + $?`
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr
$failed + $?`
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2006-02-22
11:53:04 UTC (rev 13626)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2006-02-22
12:10:29 UTC (rev 13627)
@@ -9619,16 +9619,15 @@
}
/*
- test WINS replication operations
+ test simple WINS replication operations
*/
-BOOL torture_nbt_winsreplication(void)
+BOOL torture_nbt_winsreplication_simple(void)
{
const char *address;
struct nbt_name name;
TALLOC_CTX *mem_ctx = talloc_new(NULL);
NTSTATUS status;
BOOL ret = True;
- struct test_wrepl_conflict_conn *ctx;
make_nbt_name_server(name, lp_parm_string(-1, torture, host));
@@ -9646,13 +9645,73 @@
ret = test_wins_replication(mem_ctx, address);
- if (lp_parm_bool(-1, torture, quick, False)) goto done;
+done:
+ talloc_free(mem_ctx);
+ return ret;
+}
+
+/*
+ test WINS replication replica conflicts operations
+*/
+BOOL torture_nbt_winsreplication_replica(void)
+{
+ const char *address;
+ struct nbt_name name;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
+ NTSTATUS status;
+ BOOL ret = True;
+ struct test_wrepl_conflict_conn *ctx;
+
+ make_nbt_name_server(name, lp_parm_string(-1, torture, host));
+
+ /* do an initial name resolution to find its IP */
+ status = resolve_name(name, mem_ctx, address, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(Failed to resolve %s - %s\n,
+ name.name, nt_errstr(status));
+ talloc_free(mem_ctx);
+ return False;
+ }
+
ctx = test_create_conflict_ctx(mem_ctx, address);
if (!ctx) return False;
ret = test_conflict_same_owner(ctx);
ret = test_conflict_different_owner(ctx);
+
+done:
+ talloc_free(mem_ctx);
+
+ return ret;
+}
+
+/*
+ test WINS replication owned conflicts operations
+*/
+BOOL torture_nbt_winsreplication_owned(void)
+{
+ const char *address;
+ struct nbt_name name;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
+ NTSTATUS status;
+ BOOL ret = True;
+ struct test_wrepl_conflict_conn *ctx;
+
+ make_nbt_name_server(name, lp_parm_string(-1, torture, host));
+
+ /* do an initial name resolution to find its IP */
+ status = resolve_name(name, mem_ctx, address, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(Failed to resolve %s - %s\n,
+ name.name, nt_errstr(status));
+ talloc_free(mem_ctx);
+ return False;
+ }
+
+ ctx = test_create_conflict_ctx(mem_ctx,
svn commit: samba r13628 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-02-22 13:37:21 + (Wed, 22 Feb 2006) New Revision: 13628 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13628 Log: fix the logic:-) metze Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh === --- branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2006-02-22 12:10:29 UTC (rev 13627) +++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2006-02-22 13:37:21 UTC (rev 13628) @@ -24,7 +24,7 @@ NBT_TESTS=NBT-REGISTER NBT-WINS NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-SIMPLE NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-REPLICA -if [ $TORTURE_QUICKx = yesx ]; then +if [ $TORTURE_QUICKx != yesx ]; then NBT_TESTS=$NBT_TESTS NBT-WINSREPLICATION-OWNED fi NBT_TESTS=$NBT_TESTS NET-API-LOOKUP NET-API-LOOKUPHOST NET-API-LOOKUPPDC
svn commit: samba r13629 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-02-22 13:42:54 + (Wed, 22 Feb 2006) New Revision: 13629 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13629 Log: export env-vars metze Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh === --- branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2006-02-22 13:37:21 UTC (rev 13628) +++ branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2006-02-22 13:42:54 UTC (rev 13629) @@ -1,5 +1,7 @@ TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:quick=yes +export TORTURE_OPTIONS TORTURE_QUICK=yes +export TORTURE_QUICK $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || failed=`expr $failed + $?` $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
svn commit: samba r13630 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd
Date: 2006-02-22 13:52:00 + (Wed, 22 Feb 2006)
New Revision: 13630
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13630
Log:
Add new ACB-bits as seen in acct_flags in the PAC info3
(merge from Samba 3).
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/samr.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:42:54 UTC
(rev 13629)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:52:00 UTC
(rev 13630)
@@ -20,17 +20,23 @@
/* account control (acct_flags) bits */
typedef [public,bitmap32bit] bitmap {
- ACB_DISABLED = 0x0001, /* 1 = User account disabled */
- ACB_HOMDIRREQ = 0x0002, /* 1 = Home directory required */
- ACB_PWNOTREQ = 0x0004, /* 1 = User password not required
*/
- ACB_TEMPDUP = 0x0008, /* 1 = Temporary duplicate account
*/
- ACB_NORMAL= 0x0010, /* 1 = Normal user account */
- ACB_MNS = 0x0020, /* 1 = MNS logon user account */
- ACB_DOMTRUST = 0x0040, /* 1 = Interdomain trust account */
- ACB_WSTRUST = 0x0080, /* 1 = Workstation trust account */
- ACB_SVRTRUST = 0x0100, /* 1 = Server trust account */
- ACB_PWNOEXP = 0x0200, /* 1 = User password does not
expire */
- ACB_AUTOLOCK = 0x0400 /* 1 = Account auto locked */
+ ACB_DISABLED= 0x0001, /* 1 = User
account disabled */
+ ACB_HOMDIRREQ = 0x0002, /* 1 = Home
directory required */
+ ACB_PWNOTREQ= 0x0004, /* 1 = User
password not required */
+ ACB_TEMPDUP = 0x0008, /* 1 = Temporary
duplicate account */
+ ACB_NORMAL = 0x0010, /* 1 = Normal
user account */
+ ACB_MNS = 0x0020, /* 1 = MNS logon
user account */
+ ACB_DOMTRUST= 0x0040, /* 1 =
Interdomain trust account */
+ ACB_WSTRUST = 0x0080, /* 1 =
Workstation trust account */
+ ACB_SVRTRUST= 0x0100, /* 1 = Server
trust account */
+ ACB_PWNOEXP = 0x0200, /* 1 = User
password does not expire */
+ ACB_AUTOLOCK= 0x0400, /* 1 = Account
auto locked */
+ ACB_ENC_TXT_PWD_ALLOWED = 0x0800, /* 1 = Encryped
text password is allowed */
+ ACB_SMARTCARD_REQUIRED = 0x1000, /* 1 = Smart
Card required */
+ ACB_TRUSTED_FOR_DELEGATION = 0x2000, /* 1 = Trusted
for Delegation */
+ ACB_NOT_DELEGATED = 0x4000, /* 1 = Not
delegated */
+ ACB_USE_DES_KEY_ONLY= 0x8000, /* 1 = Use DES
key only */
+ ACB_DONT_REQUIRE_PREAUTH= 0x0001 /* 1 = Preauth
not required */
} samr_AcctFlags;
/**/
svn commit: samba r13631 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd Date: 2006-02-22 13:53:33 + (Wed, 22 Feb 2006) New Revision: 13631 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13631 Log: Add DOMAIN_PASSWORD_LOCKOUT_ADMINS (this bit only allows to lockout Administrator, not Domain Admins in general). Guenther Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl === --- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:52:00 UTC (rev 13630) +++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:53:33 UTC (rev 13631) @@ -939,6 +939,7 @@ const uint32 DOMAIN_PASSWORD_COMPLEX = 0x0001; const uint32 DOMAIN_PASSWORD_NO_ANON_CHANGE = 0x0002; const uint32 DOMAIN_PASSWORD_NO_CLEAR_CHANGE = 0x0004; + const uint32 DOMAIN_PASSWORD_LOCKOUT_ADMINS = 0x0008; const uint32 DOMAIN_PASSWORD_STORE_CLEARTEXT = 0x0010; const uint32 DOMAIN_REFUSE_PASSWORD_CHANGE = 0x0020;
svn commit: samba r13632 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd
Date: 2006-02-22 13:56:46 + (Wed, 22 Feb 2006)
New Revision: 13632
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13632
Log:
The password_properties is a bitmask as well.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/samr.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:53:33 UTC
(rev 13631)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:56:46 UTC
(rev 13632)
@@ -133,10 +133,20 @@
ROLE_DOMAIN_PDC= 3
} samr_Role;
+ /* password properties flags */
+ typedef [public,bitmap32bit] bitmap {
+ DOMAIN_PASSWORD_COMPLEX = 0x0001,
+ DOMAIN_PASSWORD_NO_ANON_CHANGE = 0x0002,
+ DOMAIN_PASSWORD_NO_CLEAR_CHANGE = 0x0004,
+ DOMAIN_PASSWORD_LOCKOUT_ADMINS = 0x0008,
+ DOMAIN_PASSWORD_STORE_CLEARTEXT = 0x0010,
+ DOMAIN_REFUSE_PASSWORD_CHANGE = 0x0020
+ } samr_PasswordProperties;
+
typedef struct {
uint16 min_password_length;
uint16 password_history_length;
- uint32 password_properties;
+ samr_PasswordProperties password_properties;
/* yes, these are signed. They are in negative 100ns */
dlong max_password_age;
dlong min_password_age;
@@ -935,17 +945,9 @@
//
/* Function0x2c */
- /* password properties flags */
- const uint32 DOMAIN_PASSWORD_COMPLEX = 0x0001;
- const uint32 DOMAIN_PASSWORD_NO_ANON_CHANGE = 0x0002;
- const uint32 DOMAIN_PASSWORD_NO_CLEAR_CHANGE = 0x0004;
- const uint32 DOMAIN_PASSWORD_LOCKOUT_ADMINS = 0x0008;
- const uint32 DOMAIN_PASSWORD_STORE_CLEARTEXT = 0x0010;
- const uint32 DOMAIN_REFUSE_PASSWORD_CHANGE = 0x0020;
-
typedef struct {
uint16 min_password_length;
- uint32 password_properties;
+ samr_PasswordProperties password_properties;
} samr_PwInfo;
NTSTATUS samr_GetUserPwInfo(
svn commit: samba r13633 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd
Date: 2006-02-22 14:05:49 + (Wed, 22 Feb 2006)
New Revision: 13633
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13633
Log:
Adding more SE_GROUP bits and make it a bitmask as well.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/samr.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 13:56:46 UTC
(rev 13632)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 14:05:49 UTC
(rev 13633)
@@ -364,16 +364,22 @@
);
/* Group attributes */
- const int SE_GROUP_MANDATORY = 0x0001;
- const int SE_GROUP_ENABLED_BY_DEFAULT = 0x0002;
- const int SE_GROUP_ENABLED = 0x0004;
+ typedef [public,bitmap32bit] bitmap {
+ SE_GROUP_MANDATORY = 0x0001,
+ SE_GROUP_ENABLED_BY_DEFAULT = 0x0002,
+ SE_GROUP_ENABLED= 0x0004,
+ SE_GROUP_OWNER = 0x0008,
+ SE_GROUP_USE_FOR_DENY_ONLY = 0x0010,
+ SE_GROUP_RESOURCE = 0x2000,
+ SE_GROUP_LOGON_ID = 0xC000
+ } samr_GroupAttrs;
//
/* Function0x14 */
typedef struct {
lsa_String name;
- uint32 attributes;
+ samr_GroupAttrs attributes;
uint32 num_members;
lsa_String description;
} samr_GroupInfoAll;
@@ -826,7 +832,7 @@
typedef [public] struct {
uint32 rid;
- uint32 attributes;
+ samr_GroupAttrs attributes;
} samr_RidWithAttribute;
typedef [public] struct {
svn commit: samba r13634 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd
Date: 2006-02-22 14:07:04 + (Wed, 22 Feb 2006)
New Revision: 13634
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13634
Log:
Fix typo.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/samr.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 14:05:49 UTC
(rev 13633)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2006-02-22 14:07:04 UTC
(rev 13634)
@@ -390,7 +390,7 @@
typedef struct {
lsa_String description;
- } samr_GroupInfoDesciption;
+ } samr_GroupInfoDescription;
typedef enum {
GROUPINFOALL = 1,
svn commit: samba r13635 - in branches/SAMBA_3_0_RELEASE/source: client libsmb smbd utils
Author: jerry
Date: 2006-02-22 15:08:05 + (Wed, 22 Feb 2006)
New Revision: 13635
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13635
Log:
Some more fixes for 3.0.21c
svn merge -r13601:13604 $SVNURL/branches/SAMBA_3_0
svn merge -r13604:13607 $SVNURL/branches/SAMBA_3_0
svn merge -r13610:13612 $SVNURL/branches/SAMBA_3_0
svn merge -r13612:13614 $SVNURL/branches/SAMBA_3_0
Modified:
branches/SAMBA_3_0_RELEASE/source/client/smbctool.c
branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c
branches/SAMBA_3_0_RELEASE/source/smbd/sesssetup.c
branches/SAMBA_3_0_RELEASE/source/utils/net_rpc_join.c
branches/SAMBA_3_0_RELEASE/source/utils/pdbedit.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/client/smbctool.c
===
--- branches/SAMBA_3_0_RELEASE/source/client/smbctool.c 2006-02-22 14:07:04 UTC
(rev 13634)
+++ branches/SAMBA_3_0_RELEASE/source/client/smbctool.c 2006-02-22 15:08:05 UTC
(rev 13635)
@@ -22,8 +22,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define NO_SYSLOG
-
#include includes.h
#include libsmbclient.h
#include client/client_proto.h
Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c
===
--- branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c2006-02-22
14:07:04 UTC (rev 13634)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c2006-02-22
15:08:05 UTC (rev 13635)
@@ -357,7 +357,15 @@
void cli_rpc_pipe_close(struct rpc_pipe_client *cli)
{
- if (!cli_close(cli-cli, cli-fnum)) {
+ BOOL ret;
+
+ if (!cli) {
+ return False;
+ }
+
+ ret = cli_close(cli-cli, cli-fnum);
+
+ if (!ret) {
DEBUG(0,(cli_rpc_pipe_close: cli_close failed on pipe %s,
fnum 0x%x
to machine %s. Error was %s\n,
Modified: branches/SAMBA_3_0_RELEASE/source/smbd/sesssetup.c
===
--- branches/SAMBA_3_0_RELEASE/source/smbd/sesssetup.c 2006-02-22 14:07:04 UTC
(rev 13634)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/sesssetup.c 2006-02-22 15:08:05 UTC
(rev 13635)
@@ -70,6 +70,23 @@
}
/
+ Start the signing engine if needed. Don't fail signing here.
+/
+
+static void sessionsetup_start_signing_engine(const auth_serversupplied_info
*server_info, char *inbuf)
+{
+ if (!server_info-guest !srv_signing_started()) {
+ /* We need to start the signing engine
+* here but a W2K client sends the old
+* BSRSPYL signature instead of the
+* correct one. Subsequent packets will
+* be correct.
+*/
+ srv_check_sign_mac(inbuf, False);
+ }
+}
+
+/
Send a security blob via a session setup reply.
/
@@ -357,15 +374,7 @@
SSVAL(outbuf, smb_uid, sess_vuid);
- if (!server_info-guest !srv_signing_started()) {
- /* We need to start the signing engine
-* here but a W2K client sends the old
-* BSRSPYL signature instead of the
-* correct one. Subsequent packets will
-* be correct.
-*/
- srv_check_sign_mac(inbuf, False);
- }
+ sessionsetup_start_signing_engine(server_info, inbuf);
}
/* wrap that up in a nice GSS-API wrapping */
@@ -438,16 +447,7 @@
SSVAL(outbuf,smb_uid,sess_vuid);
- if (!server_info-guest !srv_signing_started()) {
- /* We need to start the signing engine
-* here but a W2K client sends the old
-* BSRSPYL signature instead of the
-* correct one. Subsequent packets will
-* be correct.
-*/
-
- srv_check_sign_mac(inbuf, False);
- }
+ sessionsetup_start_signing_engine(server_info, inbuf);
}
}
@@ -1099,9 +1099,7 @@
/* current_user_info is changed on new vuid */
reload_services( True );
- if (!server_info-guest !srv_signing_started()
!srv_check_sign_mac(inbuf, True)) {
- exit_server(reply_sesssetup_and_X: bad smb signature);
- }
+
svn commit: samba r13636 - in branches/SAMBA_3_0_RELEASE/source: include libads
Author: jerry
Date: 2006-02-22 15:59:14 + (Wed, 22 Feb 2006)
New Revision: 13636
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13636
Log:
Merge the usernamd parsing fix for the Krb5 PAC
svn merge -r13579:13588 $SVNURL/branches/SAMBA_3_0
Modified:
branches/SAMBA_3_0_RELEASE/source/include/authdata.h
branches/SAMBA_3_0_RELEASE/source/libads/authdata.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/include/authdata.h
===
--- branches/SAMBA_3_0_RELEASE/source/include/authdata.h2006-02-22
15:08:05 UTC (rev 13635)
+++ branches/SAMBA_3_0_RELEASE/source/include/authdata.h2006-02-22
15:59:14 UTC (rev 13636)
@@ -42,7 +42,7 @@
typedef struct pac_logon_name {
NTTIME logon_time;
uint16 len;
- uint16 *username; /* might not be null terminated, so not UNISTR */
+ uint8 *username; /* Actually always little-endian. might not be null
terminated, so not UNISTR */
} PAC_LOGON_NAME;
typedef struct pac_signature_data {
Modified: branches/SAMBA_3_0_RELEASE/source/libads/authdata.c
===
--- branches/SAMBA_3_0_RELEASE/source/libads/authdata.c 2006-02-22 15:08:05 UTC
(rev 13635)
+++ branches/SAMBA_3_0_RELEASE/source/libads/authdata.c 2006-02-22 15:59:14 UTC
(rev 13636)
@@ -42,24 +42,24 @@
if (!prs_uint16(len, ps, depth, logon_name-len))
return False;
+ /* The following string is always in little endian 16 bit values,
+ copy as 8 bits to avoid endian reversal on big-endian machines.
+ len is the length in bytes. */
+
if (UNMARSHALLING(ps) logon_name-len) {
- logon_name-username = PRS_ALLOC_MEM(ps, uint16,
logon_name-len);
+ logon_name-username = PRS_ALLOC_MEM(ps, uint8,
logon_name-len);
if (!logon_name-username) {
DEBUG(3, (No memory available\n));
return False;
}
}
- if (!prs_uint16s(True, name, ps, depth, logon_name-username,
-(logon_name-len / sizeof(uint16
+ if (!prs_uint8s(True, name, ps, depth, logon_name-username,
logon_name-len))
return False;
return True;
-
}
-
-
#if 0 /* Unused (handled now in net_io_user_info3()) - Guenther */
static BOOL pac_io_krb_sids(const char *desc, KRB_SID_AND_ATTRS *sid_and_attr,
prs_struct *ps, int depth)
@@ -891,7 +891,7 @@
nt_status = NT_STATUS_INVALID_PARAMETER;
goto out;
}
- rpcstr_pull(username, logon_name-username, sizeof(username), -1,
STR_TERMINATE);
+ rpcstr_pull(username, logon_name-username, sizeof(username),
logon_name-len, 0);
ret = smb_krb5_parse_name_norealm(context, username,
client_principal_pac);
if (ret) {
svn commit: samba r13637 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: gd
Date: 2006-02-22 16:25:31 + (Wed, 22 Feb 2006)
New Revision: 13637
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13637
Log:
Adding more netr_UserFlags.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-02-22 15:59:14 UTC
(rev 13636)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-02-22 16:25:31 UTC
(rev 13637)
@@ -139,8 +139,18 @@
} netr_LMSessionKey;
/* Flags for user_flags below */
- const int NETLOGON_EXTRA_SIDS = 0x0020;
- const int NETLOGON_RESOURCE_GROUPS = 0x0200;
+ typedef [public,bitmap32bit] bitmap {
+ NETLOGON_GUEST = 0x0001,
+ NETLOGON_NOENCRYPTION = 0x0002,
+ NETLOGON_CACHED_ACCOUNT = 0x0004,
+ NETLOGON_USED_LM_PASSWORD = 0x0008,
+ NETLOGON_EXTRA_SIDS = 0x0020,
+ NETLOGON_SUBAUTH_SESSION_KEY= 0x0040,
+ NETLOGON_SERVER_TRUST_ACCOUNT = 0x0080,
+ NETLOGON_NTLMV2_ENABLED = 0x0100,
+ NETLOGON_RESOURCE_GROUPS= 0x0200,
+ NETLOGON_PROFILE_PATH_RETURNED = 0x0400
+ } netr_UserFlags;
typedef struct {
NTTIME last_logon;
@@ -160,7 +170,7 @@
uint32 rid;
uint32 primary_gid;
samr_RidWithAttributeArray groups;
- uint32 user_flags;
+ netr_UserFlags user_flags;
netr_UserSessionKey key;
lsa_StringLarge logon_server;
lsa_StringLarge domain;
svn commit: samba r13639 - branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0/source/rpc_client trunk/source/nsswitch trunk/source/rpc_client
Author: gd
Date: 2006-02-22 20:40:24 + (Wed, 22 Feb 2006)
New Revision: 13639
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13639
Log:
Never overwrite the acct_flags in rpccli_netlogon_sam_network_logon().
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
trunk/source/nsswitch/winbindd_pam.c
trunk/source/rpc_client/cli_netlogon.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-02-22 19:58:13 UTC
(rev 13638)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-02-22 20:40:24 UTC
(rev 13639)
@@ -743,17 +743,13 @@
if (my_info3-acct_flags ACB_DOMTRUST) {
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
-#if 0
- /* The info3 acct_flags in NT4's samlogon reply don't have
-* ACB_NORMAL set. Disable this paranoia check until we
-* can research this more - Guenther */
-
+
if (!(my_info3-acct_flags ACB_NORMAL)) {
DEBUG(10,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
my_info3-acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-#endif
+
kickoff_time = nt_time_to_unix(my_info3-kickoff_time);
if (kickoff_time != 0 time(NULL) kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
Modified: branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
===
--- branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2006-02-22 19:58:13 UTC
(rev 13638)
+++ branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2006-02-22 20:40:24 UTC
(rev 13639)
@@ -884,7 +884,6 @@
memset(info3-lm_sess_key, '\0', 8);
}
- memset(info3-acct_flags, '\0', 4);
for (i=0; i 7; i++) {
memset(info3-unknown[i], '\0', 4);
}
Modified: trunk/source/nsswitch/winbindd_pam.c
===
--- trunk/source/nsswitch/winbindd_pam.c2006-02-22 19:58:13 UTC (rev
13638)
+++ trunk/source/nsswitch/winbindd_pam.c2006-02-22 20:40:24 UTC (rev
13639)
@@ -743,17 +743,13 @@
if (my_info3-acct_flags ACB_DOMTRUST) {
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
-#if 0
- /* The info3 acct_flags in NT4's samlogon reply don't have
-* ACB_NORMAL set. Disable this paranoia check until we
-* can research this more - Guenther */
-
+
if (!(my_info3-acct_flags ACB_NORMAL)) {
DEBUG(10,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
my_info3-acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-#endif
+
kickoff_time = nt_time_to_unix(my_info3-kickoff_time);
if (kickoff_time != 0 time(NULL) kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
Modified: trunk/source/rpc_client/cli_netlogon.c
===
--- trunk/source/rpc_client/cli_netlogon.c 2006-02-22 19:58:13 UTC (rev
13638)
+++ trunk/source/rpc_client/cli_netlogon.c 2006-02-22 20:40:24 UTC (rev
13639)
@@ -884,7 +884,6 @@
memset(info3-lm_sess_key, '\0', 8);
}
- memset(info3-acct_flags, '\0', 4);
for (i=0; i 7; i++) {
memset(info3-unknown[i], '\0', 4);
}
svn commit: samba r13640 - in trunk/source: rpc_client utils
Author: jra
Date: 2006-02-22 21:18:18 + (Wed, 22 Feb 2006)
New Revision: 13640
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13640
Log:
Finish fix for #3510. Don't use client schannel when told
not to, cope with a server that doesn't offer schannel also.
Jeremy
Modified:
trunk/source/rpc_client/cli_pipe.c
trunk/source/utils/net_rpc_join.c
Changeset:
Modified: trunk/source/rpc_client/cli_pipe.c
===
--- trunk/source/rpc_client/cli_pipe.c 2006-02-22 20:40:24 UTC (rev 13639)
+++ trunk/source/rpc_client/cli_pipe.c 2006-02-22 21:18:18 UTC (rev 13640)
@@ -2393,13 +2393,14 @@
/
Open a netlogon pipe and get the schannel session key.
+ Now exposed to external callers.
/
-static struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
+struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
const char *domain,
+ uint32 *pneg_flags,
NTSTATUS *perr)
{
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
@@ -2438,7 +2439,7 @@
machine_account, /* machine account
name */
machine_pwd,
sec_chan_type,
- neg_flags);
+ pneg_flags);
if (!NT_STATUS_IS_OK(*perr)) {
DEBUG(3,(get_schannel_session_key: rpccli_netlogon_setup_creds
@@ -2448,7 +2449,7 @@
return NULL;
}
- if ((neg_flags NETLOGON_NEG_SCHANNEL) == 0) {
+ if (((*pneg_flags) NETLOGON_NEG_SCHANNEL) == 0) {
DEBUG(3, (get_schannel_session_key: Server %s did not offer
schannel\n,
cli-desthost));
cli_rpc_pipe_close(netlogon_pipe);
@@ -2520,9 +2521,9 @@
const char *domain,
const char *username,
const char *password,
+ uint32 *pneg_flags,
NTSTATUS *perr)
{
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
@@ -2564,7 +2565,7 @@
machine_account, /* machine account
name */
machine_pwd,
sec_chan_type,
- neg_flags);
+ pneg_flags);
if (!NT_STATUS_IS_OK(*perr)) {
DEBUG(3,(get_schannel_session_key_auth_ntlmssp:
rpccli_netlogon_setup_creds
@@ -2574,7 +2575,7 @@
return NULL;
}
- if ((neg_flags NETLOGON_NEG_SCHANNEL) == 0) {
+ if (((*pneg_flags) NETLOGON_NEG_SCHANNEL) == 0) {
DEBUG(3, (get_schannel_session_key_auth_ntlmssp: Server %s did
not offer schannel\n,
cli-desthost));
cli_rpc_pipe_close(netlogon_pipe);
@@ -2599,10 +2600,12 @@
const char *password,
NTSTATUS *perr)
{
+ uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
struct rpc_pipe_client *result = NULL;
- netlogon_pipe = get_schannel_session_key_auth_ntlmssp(cli, domain,
username, password, perr);
+ netlogon_pipe = get_schannel_session_key_auth_ntlmssp(cli, domain,
username,
+ password, neg_flags,
perr);
if (!netlogon_pipe) {
DEBUG(0,(cli_rpc_pipe_open_ntlmssp_auth_schannel: failed to
get schannel session
key from server %s for domain %s.\n,
@@ -2631,10 +2634,11 @@
const char *domain,
NTSTATUS *perr)
{
+ uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
struct rpc_pipe_client *result = NULL;
- netlogon_pipe = get_schannel_session_key(cli, domain, perr);
+ netlogon_pipe =
svn commit: samba r13641 - in branches/SAMBA_3_0/source: rpc_client utils
Author: jra
Date: 2006-02-22 21:18:23 + (Wed, 22 Feb 2006)
New Revision: 13641
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13641
Log:
Finish fix for #3510. Don't use client schannel when told
not to, cope with a server that doesn't offer schannel also.
Jeremy
Modified:
branches/SAMBA_3_0/source/rpc_client/cli_pipe.c
branches/SAMBA_3_0/source/utils/net_rpc_join.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_pipe.c
===
--- branches/SAMBA_3_0/source/rpc_client/cli_pipe.c 2006-02-22 21:18:18 UTC
(rev 13640)
+++ branches/SAMBA_3_0/source/rpc_client/cli_pipe.c 2006-02-22 21:18:23 UTC
(rev 13641)
@@ -2393,13 +2393,14 @@
/
Open a netlogon pipe and get the schannel session key.
+ Now exposed to external callers.
/
-static struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
+struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
const char *domain,
+ uint32 *pneg_flags,
NTSTATUS *perr)
{
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
@@ -2438,7 +2439,7 @@
machine_account, /* machine account
name */
machine_pwd,
sec_chan_type,
- neg_flags);
+ pneg_flags);
if (!NT_STATUS_IS_OK(*perr)) {
DEBUG(3,(get_schannel_session_key: rpccli_netlogon_setup_creds
@@ -2448,7 +2449,7 @@
return NULL;
}
- if ((neg_flags NETLOGON_NEG_SCHANNEL) == 0) {
+ if (((*pneg_flags) NETLOGON_NEG_SCHANNEL) == 0) {
DEBUG(3, (get_schannel_session_key: Server %s did not offer
schannel\n,
cli-desthost));
cli_rpc_pipe_close(netlogon_pipe);
@@ -2520,9 +2521,9 @@
const char *domain,
const char *username,
const char *password,
+ uint32 *pneg_flags,
NTSTATUS *perr)
{
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
@@ -2564,7 +2565,7 @@
machine_account, /* machine account
name */
machine_pwd,
sec_chan_type,
- neg_flags);
+ pneg_flags);
if (!NT_STATUS_IS_OK(*perr)) {
DEBUG(3,(get_schannel_session_key_auth_ntlmssp:
rpccli_netlogon_setup_creds
@@ -2574,7 +2575,7 @@
return NULL;
}
- if ((neg_flags NETLOGON_NEG_SCHANNEL) == 0) {
+ if (((*pneg_flags) NETLOGON_NEG_SCHANNEL) == 0) {
DEBUG(3, (get_schannel_session_key_auth_ntlmssp: Server %s did
not offer schannel\n,
cli-desthost));
cli_rpc_pipe_close(netlogon_pipe);
@@ -2599,10 +2600,12 @@
const char *password,
NTSTATUS *perr)
{
+ uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
struct rpc_pipe_client *result = NULL;
- netlogon_pipe = get_schannel_session_key_auth_ntlmssp(cli, domain,
username, password, perr);
+ netlogon_pipe = get_schannel_session_key_auth_ntlmssp(cli, domain,
username,
+ password, neg_flags,
perr);
if (!netlogon_pipe) {
DEBUG(0,(cli_rpc_pipe_open_ntlmssp_auth_schannel: failed to
get schannel session
key from server %s for domain %s.\n,
@@ -2631,10 +2634,11 @@
const char *domain,
NTSTATUS *perr)
{
+ uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
struct rpc_pipe_client *netlogon_pipe = NULL;
struct rpc_pipe_client *result = NULL;
- netlogon_pipe =
svn commit: samba r13642 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: lmuelle Date: 2006-02-22 21:41:14 + (Wed, 22 Feb 2006) New Revision: 13642 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13642 Log: Fix install* scripts to use DESTDIR. Always pass the INSTALLPERMS and DESTDIR as first and second arg to the scripts. No longer prepend DESTDIR to the remaining args. To fix bug #3282 it is important _not_ to prepend DESTDIR to the source of the sym link pointing to smbmount. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/installbin.sh branches/SAMBA_3_0/source/script/installdirs.sh branches/SAMBA_3_0/source/script/installmodules.sh trunk/source/Makefile.in trunk/source/script/installbin.sh trunk/source/script/installdirs.sh trunk/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-02-22 21:18:23 UTC (rev 13641) +++ branches/SAMBA_3_0/source/Makefile.in 2006-02-22 21:41:14 UTC (rev 13642) @@ -1382,25 +1382,25 @@ # is not used installdirs: - @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(MANDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR) installservers: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SBIN_PROGS) installbin: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(BIN_PROGS) # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. installmodules: modules installdirs - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(VFSLIBDIR) $(VFS_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(PDBLIBDIR) $(PDB_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(RPCLIBDIR) $(RPC_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(IDMAPLIBDIR) $(IDMAP_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(CHARSETLIBDIR) $(CHARSET_MODULES) - @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(AUTHLIBDIR) $(AUTH_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(VFSLIBDIR) $(VFS_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(PDBLIBDIR) $(PDB_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(RPCLIBDIR) $(RPC_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(IDMAPLIBDIR) $(IDMAP_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(CHARSETLIBDIR) $(CHARSET_MODULES) + @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(BASEDIR) $(AUTHLIBDIR) $(AUTH_MODULES) @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ Modified: branches/SAMBA_3_0/source/script/installbin.sh === --- branches/SAMBA_3_0/source/script/installbin.sh 2006-02-22 21:18:23 UTC (rev 13641) +++ branches/SAMBA_3_0/source/script/installbin.sh 2006-02-22 21:41:14 UTC (rev 13642) @@ -15,13 +15,13 @@ for p in $*; do p2=`basename $p` - echo Installing $p as $BINDIR/$p2 - if [ -f $BINDIR/$p2 ]; then - rm
Build status as of Thu Feb 23 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-02-22 00:00:03.0 + +++ /home/build/master/cache/broken_results.txt 2006-02-23 00:00:04.0 + @@ -1,16 +1,16 @@ -Build status as of Wed Feb 22 00:00:02 2006 +Build status as of Thu Feb 23 00:00:02 2006 Build counts: Tree Total Broken Panic ccache 7 2 0 -distcc 8 2 0 -lorikeet-heimdal 17 17 0 +distcc 7 2 0 +lorikeet-heimdal 14 14 0 ppp 15 0 0 rsync29 2 0 samba2 0 0 samba-docs 0 0 0 -samba4 31 20 2 -samba_3_030 4 0 +samba4 31 17 2 +samba_3_030 7 0 smb-build21 3 0 talloc 6 3 0 tdb 5 1 0
svn commit: samba r13643 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle Date: 2006-02-23 01:05:51 + (Thu, 23 Feb 2006) New Revision: 13643 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13643 Log: Enable script debug output to get some more details why some hosts return with !=0 after calling installmodules.sh AUTH_MODULES. Modified: branches/SAMBA_3_0/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installmodules.sh === --- branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-22 21:41:14 UTC (rev 13642) +++ branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:05:51 UTC (rev 13643) @@ -19,6 +19,8 @@ fi done +set -x + for p in $*; do p2=`basename $p` echo Installing $p as $DESTDIR/$LIBDIR/$p2 @@ -26,4 +28,6 @@ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 done +set +x + exit 0
svn commit: samba r13644 - branches/SAMBA_3_0/source/script trunk/source/script
Author: lmuelle Date: 2006-02-23 01:38:00 + (Thu, 23 Feb 2006) New Revision: 13644 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13644 Log: Do not shift anything inside the for loop away. We ineterate over [EMAIL PROTECTED] Modified: branches/SAMBA_3_0/source/script/installdirs.sh trunk/source/script/installdirs.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installdirs.sh === --- branches/SAMBA_3_0/source/script/installdirs.sh 2006-02-23 01:05:51 UTC (rev 13643) +++ branches/SAMBA_3_0/source/script/installdirs.sh 2006-02-23 01:38:00 UTC (rev 13644) @@ -15,9 +15,4 @@ echo Failed to make directory $DESTDIR/$DIRNAME exit 1 fi - - shift; done - - - Modified: trunk/source/script/installdirs.sh === --- trunk/source/script/installdirs.sh 2006-02-23 01:05:51 UTC (rev 13643) +++ trunk/source/script/installdirs.sh 2006-02-23 01:38:00 UTC (rev 13644) @@ -15,9 +15,4 @@ echo Failed to make directory $DESTDIR/$DIRNAME exit 1 fi - - shift; done - - -
svn commit: samba r13645 - in branches/SAMBA_3_0/source/script: .
Author: lmuelle Date: 2006-02-23 01:43:39 + (Thu, 23 Feb 2006) New Revision: 13645 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13645 Log: Revert debug output. Modified: branches/SAMBA_3_0/source/script/installmodules.sh Changeset: Modified: branches/SAMBA_3_0/source/script/installmodules.sh === --- branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:38:00 UTC (rev 13644) +++ branches/SAMBA_3_0/source/script/installmodules.sh 2006-02-23 01:43:39 UTC (rev 13645) @@ -19,8 +19,6 @@ fi done -set -x - for p in $*; do p2=`basename $p` echo Installing $p as $DESTDIR/$LIBDIR/$p2 @@ -28,6 +26,4 @@ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2 done -set +x - exit 0
svn commit: samba r13647 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2006-02-23 01:53:26 + (Thu, 23 Feb 2006)
New Revision: 13647
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13647
Log:
Fix for standalone Samba servers and XP clients. Reverts
part of the PocketPC bugfix. I'm trying to get someone who
has a pocketpc to test this.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/negprot.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/negprot.c
===
--- branches/SAMBA_3_0/source/smbd/negprot.c2006-02-23 01:53:24 UTC (rev
13646)
+++ branches/SAMBA_3_0/source/smbd/negprot.c2006-02-23 01:53:26 UTC (rev
13647)
@@ -178,6 +178,7 @@
OID_KERBEROS5_OLD,
OID_NTLMSSP,
NULL};
+ const char *OIDs_plain[] = {OID_NTLMSSP, NULL};
int len;
global_spnego_negotiated = True;
@@ -212,9 +213,13 @@
*/
if (lp_security() != SEC_ADS !lp_use_kerberos_keytab()) {
- memcpy(p, guid, 16);
- *pkeylen = 0;
- return 16;
+#if 0
+ /* Code for PocketPC client */
+ blob = data_blob(guid, 16);
+#else
+ /* Code for standalone WXP client */
+ blob = spnego_gen_negTokenInit(guid, OIDs_plain, NONE);
+#endif
} else {
fstring myname;
char *host_princ_s = NULL;
@@ -224,14 +229,20 @@
blob = spnego_gen_negTokenInit(guid, OIDs_krb5, host_princ_s);
SAFE_FREE(host_princ_s);
}
+
memcpy(p, blob.data, blob.length);
len = blob.length;
if (len 256) {
DEBUG(0,(negprot_spnego: blob length too long (%d)\n, len));
len = 255;
}
- *pkeylen = len;
data_blob_free(blob);
+
+ if (lp_security() != SEC_ADS !lp_use_kerberos_keytab()) {
+ *pkeylen = 0;
+ } else {
+ *pkeylen = len;
+ }
return len;
}
svn commit: samba r13646 - in trunk/source/smbd: .
Author: jra
Date: 2006-02-23 01:53:24 + (Thu, 23 Feb 2006)
New Revision: 13646
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13646
Log:
Fix for standalone Samba servers and XP clients. Reverts
part of the PocketPC bugfix. I'm trying to get someone who
has a pocketpc to test this.
Jeremy.
Modified:
trunk/source/smbd/negprot.c
Changeset:
Modified: trunk/source/smbd/negprot.c
===
--- trunk/source/smbd/negprot.c 2006-02-23 01:43:39 UTC (rev 13645)
+++ trunk/source/smbd/negprot.c 2006-02-23 01:53:24 UTC (rev 13646)
@@ -178,6 +178,7 @@
OID_KERBEROS5_OLD,
OID_NTLMSSP,
NULL};
+ const char *OIDs_plain[] = {OID_NTLMSSP, NULL};
int len;
global_spnego_negotiated = True;
@@ -212,9 +213,13 @@
*/
if (lp_security() != SEC_ADS !lp_use_kerberos_keytab()) {
- memcpy(p, guid, 16);
- *pkeylen = 0;
- return 16;
+#if 0
+ /* Code for PocketPC client */
+ blob = data_blob(guid, 16);
+#else
+ /* Code for standalone WXP client */
+ blob = spnego_gen_negTokenInit(guid, OIDs_plain, NONE);
+#endif
} else {
fstring myname;
char *host_princ_s = NULL;
@@ -224,14 +229,20 @@
blob = spnego_gen_negTokenInit(guid, OIDs_krb5, host_princ_s);
SAFE_FREE(host_princ_s);
}
+
memcpy(p, blob.data, blob.length);
len = blob.length;
if (len 256) {
DEBUG(0,(negprot_spnego: blob length too long (%d)\n, len));
len = 255;
}
- *pkeylen = len;
data_blob_free(blob);
+
+ if (lp_security() != SEC_ADS !lp_use_kerberos_keytab()) {
+ *pkeylen = 0;
+ } else {
+ *pkeylen = len;
+ }
return len;
}
svn commit: samba r13648 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: tpot
Date: 2006-02-23 01:58:27 + (Thu, 23 Feb 2006)
New Revision: 13648
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=13648
Log:
Duh.
Modified:
branches/SAMBA_3_0/source/utils/net_groupmap.c
trunk/source/utils/net_groupmap.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_groupmap.c
===
--- branches/SAMBA_3_0/source/utils/net_groupmap.c 2006-02-23 01:53:26 UTC
(rev 13647)
+++ branches/SAMBA_3_0/source/utils/net_groupmap.c 2006-02-23 01:58:27 UTC
(rev 13648)
@@ -818,7 +818,7 @@
/* we shouldn't have silly checks like this */
if (getuid() != 0) {
- d_fprintf(stderr, You must be root to edit group
mappings.\nExiting...\n);
+ d_fprintf(stderr, You must be root to edit group mappings.\n);
return -1;
}
Modified: trunk/source/utils/net_groupmap.c
===
--- trunk/source/utils/net_groupmap.c 2006-02-23 01:53:26 UTC (rev 13647)
+++ trunk/source/utils/net_groupmap.c 2006-02-23 01:58:27 UTC (rev 13648)
@@ -818,7 +818,7 @@
/* we shouldn't have silly checks like this */
if (getuid() != 0) {
- d_fprintf(stderr, You must be root to edit group
mappings.\nExiting...\n);
+ d_fprintf(stderr, You must be root to edit group mappings.\n);
return -1;
}
