[SCM] CTDB repository - branch master updated - 008533d971aec9c28c6e4750ef4677dd943633ff
The branch, master has been updated
via 008533d971aec9c28c6e4750ef4677dd943633ff (commit)
via d3f5d75665a78ae0081fda57e58384b27a6ae396 (commit)
via 22f737be0e70fc043affaa4f953f60d852b7999a (commit)
from ded1a974cdd86b436c6e5cba27069d1a3796dbe9 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 008533d971aec9c28c6e4750ef4677dd943633ff
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Wed Jul 30 13:21:02 2008 +1000
cleanup on SIGINT
commit d3f5d75665a78ae0081fda57e58384b27a6ae396
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Wed Jul 30 13:20:47 2008 +1000
- cleanup persistent db at start
- catch SIGINT and kill daemons
commit 22f737be0e70fc043affaa4f953f60d852b7999a
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Wed Jul 30 13:20:24 2008 +1000
- show pids during test
- don't use first_time, as it is not safe for multiple
clients on a node
---
Summary of changes:
tests/ctdb_persistent.c | 13 +
tests/fetch.sh |2 ++
tests/persistent.sh |8 +++-
tests/run_tests.sh |2 ++
4 files changed, 16 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tests/ctdb_persistent.c b/tests/ctdb_persistent.c
index 7bd4ab8..c95ab93 100644
--- a/tests/ctdb_persistent.c
+++ b/tests/ctdb_persistent.c
@@ -57,7 +57,7 @@ static void each_second(struct event_context *ev, struct
timed_event *te,
uint32_t *old_counters;
- printf(Counters: );
+ printf([%4u] Counters: , getpid());
old_counters = (uint32_t *)old_data.dptr;
for (i=0;iold_data.dsize/sizeof(uint32_t); i++) {
printf(%6u , old_counters[i]);
@@ -78,7 +78,8 @@ static void check_counters(struct ctdb_context *ctdb,
TDB_DATA data)
/* check that all the counters are monotonic increasing */
for (i=0; iold_data.dsize/sizeof(uint32_t); i++) {
if (counters[i]old_counters[i]) {
- printf(ERROR: counters has decreased for node %u From
%u to %u\n, i, old_counters[i], counters[i]);
+ printf([%4u] ERROR: counters has decreased for node %u
From %u to %u\n,
+ getpid(), i, old_counters[i], counters[i]);
success = false;
}
}
@@ -101,7 +102,6 @@ static void test_store_records(struct ctdb_context *ctdb,
struct event_context *
int ret;
struct ctdb_record_handle *h;
uint32_t *counters;
- int first_time = true;
ctdb_db = ctdb_db_handle(ctdb, persistent.tdb);
key.dptr = discard_const(testkey);
@@ -135,11 +135,6 @@ static void test_store_records(struct ctdb_context *ctdb,
struct event_context *
counters = (uint32_t *)data.dptr;
- if (first_time) {
- counters[pnn] = 0;
- first_time = false;
- }
-
/* bump our counter */
counters[pnn]++;
@@ -181,6 +176,8 @@ int main(int argc, const char *argv[])
poptContext pc;
struct event_context *ev;
+ setlinebuf(stdout);
+
pc = poptGetContext(argv[0], argc, argv, popt_options,
POPT_CONTEXT_KEEP_FIRST);
while ((opt = poptGetNextOpt(pc)) != -1) {
diff --git a/tests/fetch.sh b/tests/fetch.sh
index f4c820a..a075321 100755
--- a/tests/fetch.sh
+++ b/tests/fetch.sh
@@ -5,6 +5,8 @@ if [ $# -gt 0 ]; then
NUMNODES=$1
fi
+trap 'echo Killing test; killall -9 -q ctdbd ctdb_fetch; exit 1' INT TERM
+
tests/start_daemons.sh $NUMNODES || exit 1
diff --git a/tests/persistent.sh b/tests/persistent.sh
index 327f8bc..112e9fd 100755
--- a/tests/persistent.sh
+++ b/tests/persistent.sh
@@ -5,14 +5,19 @@ if [ $# -gt 0 ]; then
NUMNODES=$1
fi
+killall -9 -q ctdb_persistent ctdbd
+
+rm -rf test.db/persistent
echo Starting $NUMNODES daemons for SAFE persistent writes
tests/start_daemons.sh $NUMNODES || exit 1
-killall -9 -q ctdb_persistent
+trap 'echo Killing test; killall -9 -q ctdbd ctdb_persistent; exit 1' INT
TERM
+
for i in `seq 1 $NUMNODES`; do
$VALGRIND bin/ctdb_persistent --timelimit 30 --socket sock.$i $*
+ $VALGRIND bin/ctdb_persistent --timelimit 30 --socket sock.$i $*
done
wait
@@ -29,6 +34,7 @@ killall -9 -q ctdb_persistent
for i in `seq 1 $NUMNODES`; do
$VALGRIND bin/ctdb_persistent --unsafe-writes --timelimit 30 --socket
sock.$i $*
+ $VALGRIND bin/ctdb_persistent --unsafe-writes --timelimit 30 --socket
sock.$i $*
done
wait
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 356a9b2..3e1caf4 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+trap 'echo Killing test; killall -9 -q ctdbd; exit 1' INT TERM
+
tests/fetch.sh 4 || exit 1
[SCM] CTDB repository - tag ctdb-1.0.50 created - b08a988fbdad0da850c9b79791c1a8970555147f
The tag, ctdb-1.0.50 has been created at b08a988fbdad0da850c9b79791c1a8970555147f (commit) - Log - commit b08a988fbdad0da850c9b79791c1a8970555147f Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Fri Jul 18 13:49:05 2008 +1000 new version 1.0.50 --- -- CTDB repository
[SCM] CTDB repository - tag ctdb-1.0.51 created - ded1a974cdd86b436c6e5cba27069d1a3796dbe9
The tag, ctdb-1.0.51 has been created at ded1a974cdd86b436c6e5cba27069d1a3796dbe9 (commit) - Log - commit ded1a974cdd86b436c6e5cba27069d1a3796dbe9 Author: Ronnie Sahlberg [EMAIL PROTECTED] Date: Mon Jul 28 17:11:15 2008 +1000 new version 1.0.51 --- -- CTDB repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2779-gb562b97
The branch, v3-2-test has been updated via b562b97872f51abe1bd2fb4d61d91c464d1d0840 (commit) from 5fb17b866642a9f971cce6d9f228b4d52618e42b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit b562b97872f51abe1bd2fb4d61d91c464d1d0840 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu Jul 31 09:39:58 2008 +0200 WHATSNEW: Update changes since 3.2.0. Karolin --- Summary of changes: WHATSNEW.txt |5 + 1 files changed, 5 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index c5f8b3c..befa12f 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -44,6 +44,7 @@ o Jeremy Allison [EMAIL PROTECTED] '\\' characters. * Fix option processing in smbcacls - add POPT_COMMON_CONNECTION. * Fix bug creating files using DOS clients with mixed case files. +* Fix uninitialized variable. o Jim Brown [EMAIL PROTECTED] @@ -51,7 +52,9 @@ o Jim Brown [EMAIL PROTECTED] o Günther Deschner [EMAIL PROTECTED] +* BUG 5616: Fix session keys also in rpccli_netr_LogonSamLogonEx wrapper. * BUG 5570: Fix bogus error message during AD domain join. +* Fix trusted domain handling in Winbindd. * Fix build warning. @@ -68,6 +71,8 @@ o Volodymyr Khomenko [EMAIL PROTECTED] o Volker Lendecke [EMAIL PROTECTED] * BUG 5512: Fix alignment problems on sparc. +* BUG 5616: Fix share connections in setups with + server signing = mandatory or SMB signing set on the client side. * Fix a race condition in Winbind leading to a crash. * Fix a segfault in base64_encode_data_blob. * Fix some uninitialized variable references via ndr_print. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0-107-g90ac4f2
The branch, v3-2-stable has been updated via 90ac4f202c5413dbe1353306f3b6a2e555c1b407 (commit) via add7905a66dfee5aebe61aec2999ce8a6064946a (commit) via a05edf7ce75435988420dcb4804607626d255eec (commit) via 8905da5c2c0a690ef7055b2f20b79f54ab477be6 (commit) via cfc5e54d5a4a20dc824dd9d7b409fdafd30ec8a4 (commit) via aefd6cc1fc829c8592c79ab61d4ddf47c5ee02c9 (commit) via b9f755c798c8a9835425a0c22816af4440eabef3 (commit) from da771f13af99388005df60e2bec5c5ee5a2f5d95 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 90ac4f202c5413dbe1353306f3b6a2e555c1b407 Author: Karolin Seeger [EMAIL PROTECTED] Date: Thu Jul 31 09:39:58 2008 +0200 WHATSNEW: Update changes since 3.2.0. Karolin (cherry picked from commit b562b97872f51abe1bd2fb4d61d91c464d1d0840) commit add7905a66dfee5aebe61aec2999ce8a6064946a Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Jul 30 16:22:16 2008 -0700 Fix uninitialized variable. Jeremy. (cherry picked from commit 5fb17b866642a9f971cce6d9f228b4d52618e42b) commit a05edf7ce75435988420dcb4804607626d255eec Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Jul 30 19:03:13 2008 +0200 rpc_client: Bug 5616 - fix session keys also in rpccli_netr_LogonSamLogonEx wrapper. Guenther (cherry picked from commit fef58091408cce0d7870c86f28f78cf9400cf2b6) (cherry picked from commit 4f62fa50c7d542db4a2b8976d85da590194203f0) commit 8905da5c2c0a690ef7055b2f20b79f54ab477be6 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Jul 29 12:08:47 2008 +0200 winbindd: handle trusted domains without sid. Guenther (cherry picked from commit 0c1efc6c89b1a51a94d10971bf0fc515416709b3) (cherry picked from commit 4f5255d1e5025c4c9ebb0b1f22d800e26bcdfb7f) commit cfc5e54d5a4a20dc824dd9d7b409fdafd30ec8a4 Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Jul 30 16:59:11 2008 +0200 libwbclient: let wbcStringToSid handle the global NULL sid. Guenther (cherry picked from commit 09fed085bea9dae5bb8aacd986deed3d458e3574) (cherry picked from commit fba8506112938bf714c06da08e0e0725a7eecf3a) commit aefd6cc1fc829c8592c79ab61d4ddf47c5ee02c9 Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue Jul 29 12:03:08 2008 +0200 man pages: Fix typos in man smbclient. Karolin (cherry picked from commit db843d2faafb3487e3c7df4a3a52d6c71f369e1d) (cherry picked from commit 3a3640a85daa1a85415c949f9c2b804b4f067dd7) commit b9f755c798c8a9835425a0c22816af4440eabef3 Author: Volker Lendecke [EMAIL PROTECTED] Date: Mon Jul 28 17:52:35 2008 +0200 Attempt to fix bug 5616 We were calculating the session key but did not return it to the caller... (cherry picked from commit 8ab79b1d009d53e414b90e4a0ab8fc7a4889b6df) --- Summary of changes: WHATSNEW.txt |5 + docs-xml/manpages-3/smbclient.1.xml |3 +-- source/libads/kerberos_keytab.c |1 + source/nsswitch/libwbclient/wbc_sid.c |2 +- source/rpc_client/cli_netlogon.c | 30 -- source/winbindd/winbindd_ads.c| 12 ++-- source/winbindd/winbindd_cache.c |9 +++-- 7 files changed, 37 insertions(+), 25 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index c5f8b3c..befa12f 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -44,6 +44,7 @@ o Jeremy Allison [EMAIL PROTECTED] '\\' characters. * Fix option processing in smbcacls - add POPT_COMMON_CONNECTION. * Fix bug creating files using DOS clients with mixed case files. +* Fix uninitialized variable. o Jim Brown [EMAIL PROTECTED] @@ -51,7 +52,9 @@ o Jim Brown [EMAIL PROTECTED] o Günther Deschner [EMAIL PROTECTED] +* BUG 5616: Fix session keys also in rpccli_netr_LogonSamLogonEx wrapper. * BUG 5570: Fix bogus error message during AD domain join. +* Fix trusted domain handling in Winbindd. * Fix build warning. @@ -68,6 +71,8 @@ o Volodymyr Khomenko [EMAIL PROTECTED] o Volker Lendecke [EMAIL PROTECTED] * BUG 5512: Fix alignment problems on sparc. +* BUG 5616: Fix share connections in setups with + server signing = mandatory or SMB signing set on the client side. * Fix a race condition in Winbind leading to a crash. * Fix a segfault in base64_encode_data_blob. * Fix some uninitialized variable references via ndr_print. diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml index e8e1b21..5096e7d 100644 --- a/docs-xml/manpages-3/smbclient.1.xml +++ b/docs-xml/manpages-3/smbclient.1.xml @@ -665,9 +665,8 @@ /varlistentry varlistentry - termhardlink lt;srcgt;
svn commit: samba-web r1208 - in trunk/history: .
Author: kseeger Date: 2008-07-31 08:34:59 + (Thu, 31 Jul 2008) New Revision: 1208 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1208 Log: Fix typo. Karolin Modified: trunk/history/samba-3.0.31.html Changeset: Modified: trunk/history/samba-3.0.31.html === --- trunk/history/samba-3.0.31.html 2008-07-10 21:06:43 UTC (rev 1207) +++ trunk/history/samba-3.0.31.html 2008-07-31 08:34:59 UTC (rev 1208) @@ -135,7 +135,7 @@ /pre pPlease refer to the original a href=/samba/history/samba-3.0.30.htmlSamba -3.0.30 Release Notes/a for more details regarding changes i +3.0.30 Release Notes/a for more details regarding changes in previous releases./p /body /html
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3467-g97f7f9f
The branch, v3-3-test has been updated
via 97f7f9f21f17e8414de15953cf4eaa9959dc6f75 (commit)
from 1db7e00a5400863fd5dbb81c1a4c6ea6092d0495 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 97f7f9f21f17e8414de15953cf4eaa9959dc6f75
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Jul 30 19:52:56 2008 +0200
rpc_client: use init_samr_CryptPassword(Ex) in client tools.
Guenther
---
Summary of changes:
source/libnet/libnet_join.c | 37 +
source/utils/net_rpc.c | 24 +++-
source/utils/net_rpc_join.c | 11 +--
3 files changed, 29 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 59dec1a..2f2c71d 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -731,15 +731,14 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
struct lsa_String lsa_acct_name;
uint32_t user_rid;
uint32_t acct_flags = ACB_WSTRUST;
- uchar pwbuf[532];
- struct MD5Context md5ctx;
- uchar md5buffer[16];
- DATA_BLOB digested_session_key;
uchar md4_trust_password[16];
struct samr_Ids user_rids;
struct samr_Ids name_types;
union samr_UserInfo user_info;
+ struct samr_CryptPassword crypt_pwd;
+ struct samr_CryptPasswordEx crypt_pwd_ex;
+
ZERO_STRUCT(sam_pol);
ZERO_STRUCT(domain_pol);
ZERO_STRUCT(user_pol);
@@ -871,19 +870,10 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
/* Create a random machine account password and generate the hash */
E_md4hash(r-in.machine_password, md4_trust_password);
- encode_pw_buffer(pwbuf, r-in.machine_password, STR_UNICODE);
-
- generate_random_buffer((uint8_t*)md5buffer, sizeof(md5buffer));
- digested_session_key = data_blob_talloc(mem_ctx, 0, 16);
-
- MD5Init(md5ctx);
- MD5Update(md5ctx, md5buffer, sizeof(md5buffer));
- MD5Update(md5ctx, cli-user_session_key.data,
- cli-user_session_key.length);
- MD5Final(digested_session_key.data, md5ctx);
- SamOEMhashBlob(pwbuf, sizeof(pwbuf), digested_session_key);
- memcpy(pwbuf[516], md5buffer, sizeof(md5buffer));
+ init_samr_CryptPasswordEx(r-in.machine_password,
+ cli-user_session_key,
+ crypt_pwd_ex);
/* Fill in the additional account flags now */
@@ -904,7 +894,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
SAMR_FIELD_ACCT_FLAGS;
user_info.info25.info.acct_flags = acct_flags;
- memcpy(user_info.info25.password.data, pwbuf, sizeof(pwbuf));
+ memcpy(user_info.info25.password.data, crypt_pwd_ex.data,
+ sizeof(crypt_pwd_ex.data));
status = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx,
user_pol,
@@ -913,15 +904,13 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
if (NT_STATUS_EQUAL(status, NT_STATUS(DCERPC_FAULT_INVALID_TAG))) {
- uchar pwbuf2[516];
-
- encode_pw_buffer(pwbuf2, r-in.machine_password, STR_UNICODE);
-
/* retry with level 24 */
- init_samr_user_info24(user_info.info24, pwbuf2, 24);
- SamOEMhashBlob(user_info.info24.password.data, 516,
- cli-user_session_key);
+ init_samr_CryptPassword(r-in.machine_password,
+ cli-user_session_key,
+ crypt_pwd);
+
+ init_samr_user_info24(user_info.info24, crypt_pwd.data, 24);
status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
user_pol,
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index f6b6d3a..a3fdb69 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -849,11 +849,11 @@ static NTSTATUS rpc_user_password_internals(struct
net_context *c,
{
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
POLICY_HND connect_pol, domain_pol, user_pol;
- uchar pwbuf[516];
const char *user;
const char *new_password;
char *prompt = NULL;
union samr_UserInfo info;
+ struct samr_CryptPassword crypt_pwd;
if (argc 1 || c-display_usage) {
rpc_user_usage(c, argc, argv);
@@ -922,12 +922,11 @@ static NTSTATUS rpc_user_password_internals(struct
net_context *c,
/* Set password on account */
- encode_pw_buffer(pwbuf, new_password, STR_UNICODE);
+
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3468-g956c949
The branch, v3-3-test has been updated
via 956c949dc739a8b3e9de3bb6f1af8e0e8b18dc98 (commit)
from 97f7f9f21f17e8414de15953cf4eaa9959dc6f75 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 956c949dc739a8b3e9de3bb6f1af8e0e8b18dc98
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Jul 30 21:36:28 2008 +0200
libnetjoin: add use_kerberos flag.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/libnet_join.h |1 +
source/librpc/gen_ndr/ndr_libnet_join.c |1 +
source/librpc/idl/libnet_join.idl |1 +
3 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/libnet_join.h
b/source/librpc/gen_ndr/libnet_join.h
index f4c44e4..41fdd1e 100644
--- a/source/librpc/gen_ndr/libnet_join.h
+++ b/source/librpc/gen_ndr/libnet_join.h
@@ -27,6 +27,7 @@ struct libnet_JoinCtx {
uint8_t modify_config;
struct ads_struct *ads;/* [ref] */
uint8_t debug;
+ uint8_t use_kerberos;
enum netr_SchannelType secure_channel_type;
struct messaging_context *msg_ctx;/* [noprint,ref] */
} in;
diff --git a/source/librpc/gen_ndr/ndr_libnet_join.c
b/source/librpc/gen_ndr/ndr_libnet_join.c
index a9241f6..6f22586 100644
--- a/source/librpc/gen_ndr/ndr_libnet_join.c
+++ b/source/librpc/gen_ndr/ndr_libnet_join.c
@@ -41,6 +41,7 @@ _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr,
const char *name,
ndr_print_ads_struct(ndr, ads, r-in.ads);
ndr-depth--;
ndr_print_uint8(ndr, debug, r-in.debug);
+ ndr_print_uint8(ndr, use_kerberos, r-in.use_kerberos);
ndr_print_netr_SchannelType(ndr, secure_channel_type,
r-in.secure_channel_type);
ndr-depth--;
}
diff --git a/source/librpc/idl/libnet_join.idl
b/source/librpc/idl/libnet_join.idl
index 5af6b05..0f14554 100644
--- a/source/librpc/idl/libnet_join.idl
+++ b/source/librpc/idl/libnet_join.idl
@@ -30,6 +30,7 @@ interface libnetjoin
[in] boolean8 modify_config,
[in] ads_struct *ads,
[in] boolean8 debug,
+ [in] boolean8 use_kerberos,
[in] netr_SchannelType secure_channel_type,
[in,noprint] messaging_context *msg_ctx,
[out] string account_name,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3469-g4cce94d
The branch, v3-3-test has been updated
via 4cce94d464b16d29b638da3a581d98a237959b63 (commit)
from 956c949dc739a8b3e9de3bb6f1af8e0e8b18dc98 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 4cce94d464b16d29b638da3a581d98a237959b63
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Jul 30 21:37:09 2008 +0200
net: add -k switch for kerberos authentication (in preparation for #5416).
Guenther
---
Summary of changes:
source/utils/net.c |1 +
source/utils/net.h |1 +
source/utils/net_help_common.c |3 ++-
source/utils/net_util.c| 16 +---
4 files changed, 17 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net.c b/source/utils/net.c
index d086f94..e90e8f0 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -636,6 +636,7 @@ static struct functable net_func[] = {
{stdin, 'i', POPT_ARG_NONE, c-opt_stdin},
{timeout, 't', POPT_ARG_INT,c-opt_timeout},
{machine-pass,'P', POPT_ARG_NONE, c-opt_machine_pass},
+ {kerberos,'k', POPT_ARG_NONE, c-opt_kerberos},
{myworkgroup, 'W', POPT_ARG_STRING, c-opt_workgroup},
{verbose, 'v', POPT_ARG_NONE, c-opt_verbose},
{test,'T', POPT_ARG_NONE, c-opt_testmode},
diff --git a/source/utils/net.h b/source/utils/net.h
index 01a76a0..4f59ff9 100644
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -56,6 +56,7 @@ struct net_context {
const char *opt_exclude;
const char *opt_destination;
int opt_testmode;
+ bool opt_kerberos;
int opt_have_ip;
struct sockaddr_storage opt_dest_ip;
diff --git a/source/utils/net_help_common.c b/source/utils/net_help_common.c
index be06caa..edf0839 100644
--- a/source/utils/net_help_common.c
+++ b/source/utils/net_help_common.c
@@ -48,7 +48,8 @@ int net_common_flags_usage(struct net_context *c, int argc,
const char **argv)
d_printf(\t-l or --long\t\t\tDisplay full information\n);
d_printf(\t-V or --version\t\t\tPrint samba version information\n);
d_printf(\t-P or --machine-pass\t\tAuthenticate as machine account\n);
- d_printf(\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended
servers only)\n);
+ d_printf(\t-e or --encrypt\t\t\tEncrypt SMB transport (UNIX extended
servers only)\n);
+ d_printf(\t-k or --kerberos\t\tUse kerberos (active directory)
authentication\n);
return -1;
}
diff --git a/source/utils/net_util.c b/source/utils/net_util.c
index be00dde..eb39c73 100644
--- a/source/utils/net_util.c
+++ b/source/utils/net_util.c
@@ -94,17 +94,23 @@ NTSTATUS connect_to_service(struct net_context *c,
const char *service_type)
{
NTSTATUS nt_status;
+ int flags = 0;
c-opt_password = net_prompt_pass(c, c-opt_user_name);
- if (!c-opt_password) {
- return NT_STATUS_NO_MEMORY;
+
+ if (c-opt_kerberos) {
+ flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
+ }
+
+ if (c-opt_kerberos c-opt_password) {
+ flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
}
nt_status = cli_full_connection(cli_ctx, NULL, server_name,
server_ss, c-opt_port,
service_name, service_type,
c-opt_user_name, c-opt_workgroup,
- c-opt_password, 0, Undefined, NULL);
+ c-opt_password, flags, Undefined,
NULL);
if (!NT_STATUS_IS_OK(nt_status)) {
d_fprintf(stderr, Could not connect to server %s\n,
server_name);
@@ -538,6 +544,10 @@ const char *net_prompt_pass(struct net_context *c, const
char *user)
return NULL;
}
+ if (c-opt_kerberos !c-opt_user_specified) {
+ return NULL;
+ }
+
asprintf(prompt, Enter %s's password:, user);
if (!prompt) {
return NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3470-g2b262ca
The branch, v3-3-test has been updated
via 2b262ca20de2a41833f68a88646a8df4d9507782 (commit)
from 4cce94d464b16d29b638da3a581d98a237959b63 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 2b262ca20de2a41833f68a88646a8df4d9507782
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Jul 31 14:23:23 2008 +0200
libnetunjoin: add use_kerberos flag.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/libnet_join.h |1 +
source/librpc/gen_ndr/ndr_libnet_join.c |1 +
source/librpc/idl/libnet_join.idl |1 +
3 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/libnet_join.h
b/source/librpc/gen_ndr/libnet_join.h
index 41fdd1e..ed49062 100644
--- a/source/librpc/gen_ndr/libnet_join.h
+++ b/source/librpc/gen_ndr/libnet_join.h
@@ -62,6 +62,7 @@ struct libnet_UnjoinCtx {
struct dom_sid *domain_sid;/* [ref] */
struct ads_struct *ads;/* [ref] */
uint8_t debug;
+ uint8_t use_kerberos;
struct messaging_context *msg_ctx;/* [noprint,ref] */
} in;
diff --git a/source/librpc/gen_ndr/ndr_libnet_join.c
b/source/librpc/gen_ndr/ndr_libnet_join.c
index 6f22586..79fcd16 100644
--- a/source/librpc/gen_ndr/ndr_libnet_join.c
+++ b/source/librpc/gen_ndr/ndr_libnet_join.c
@@ -99,6 +99,7 @@ _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print
*ndr, const char *name
ndr_print_ads_struct(ndr, ads, r-in.ads);
ndr-depth--;
ndr_print_uint8(ndr, debug, r-in.debug);
+ ndr_print_uint8(ndr, use_kerberos, r-in.use_kerberos);
ndr-depth--;
}
if (flags NDR_OUT) {
diff --git a/source/librpc/idl/libnet_join.idl
b/source/librpc/idl/libnet_join.idl
index 0f14554..c600ea0 100644
--- a/source/librpc/idl/libnet_join.idl
+++ b/source/librpc/idl/libnet_join.idl
@@ -57,6 +57,7 @@ interface libnetjoin
[in] dom_sid *domain_sid,
[in] ads_struct *ads,
[in] boolean8 debug,
+ [in] boolean8 use_kerberos,
[in,noprint] messaging_context *msg_ctx,
[out] string netbios_domain_name,
[out] string dns_domain_name,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3472-g2ed4ce0
The branch, v3-3-test has been updated
via 2ed4ce0bf1723e35a6c5dfa7f8fa58fb9c7ab469 (commit)
via 7e9fa2c5396d3663e83ffbf90475473fdb509871 (commit)
from 2b262ca20de2a41833f68a88646a8df4d9507782 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 2ed4ce0bf1723e35a6c5dfa7f8fa58fb9c7ab469
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Jul 31 15:12:09 2008 +0200
net: Use NetLocalGroupAdd() for adding aliases.
Guenther
commit 7e9fa2c5396d3663e83ffbf90475473fdb509871
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Jul 31 15:11:20 2008 +0200
netapi: in NetLocalGroupAdd_r() only set description if necessary.
Guenther
---
Summary of changes:
source/lib/netapi/localgroup.c |2 +-
source/utils/net_rpc.c | 83 ++--
2 files changed, 22 insertions(+), 63 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/localgroup.c b/source/lib/netapi/localgroup.c
index a0a122d..c15a17e 100644
--- a/source/lib/netapi/localgroup.c
+++ b/source/lib/netapi/localgroup.c
@@ -223,7 +223,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
goto done;
}
- if (r-in.level == 1) {
+ if (r-in.level == 1 info1-lgrpi1_comment) {
union samr_AliasInfo alias_info;
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index a3fdb69..730681c 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1913,83 +1913,42 @@ static int rpc_group_add_internals(struct net_context
*c, int argc, const char *
return 0;
}
-static NTSTATUS rpc_alias_add_internals(struct net_context *c,
- const DOM_SID *domain_sid,
- const char *domain_name,
- struct cli_state *cli,
- struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,
- int argc,
- const char **argv)
+static int rpc_alias_add_internals(struct net_context *c, int argc, const char
**argv)
{
- POLICY_HND connect_pol, domain_pol, alias_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- union samr_AliasInfo alias_info;
- struct lsa_String alias_name;
- uint32_t rid = 0;
+ NET_API_STATUS status;
+ struct LOCALGROUP_INFO_1 info1;
+ uint32_t parm_error = 0;
if (argc != 1 || c-display_usage) {
rpc_group_usage(c, argc, argv);
- return NT_STATUS_OK;
+ return 0;
}
- init_lsa_String(alias_name, argv[0]);
-
- /* Get sam policy handle */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd-desthost,
- MAXIMUM_ALLOWED_ACCESS,
- connect_pol);
- if (!NT_STATUS_IS_OK(result)) goto done;
-
- /* Get domain policy handle */
-
- result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
- connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- CONST_DISCARD(struct dom_sid2 *,
domain_sid),
- domain_pol);
- if (!NT_STATUS_IS_OK(result)) goto done;
-
- /* Create the group */
-
- result = rpccli_samr_CreateDomAlias(pipe_hnd, mem_ctx,
- domain_pol,
- alias_name,
- MAXIMUM_ALLOWED_ACCESS,
- alias_pol,
- rid);
- if (!NT_STATUS_IS_OK(result)) goto done;
-
- if (strlen(c-opt_comment) == 0) goto done;
-
- /* We've got a comment to set */
-
- init_lsa_String(alias_info.description, c-opt_comment);
+ ZERO_STRUCT(info1);
- result = rpccli_samr_SetAliasInfo(pipe_hnd, mem_ctx,
- alias_pol,
- 3,
- alias_info);
+ info1.lgrpi1_name = argv[0];
+ if (c-opt_comment strlen(c-opt_comment) 0) {
+ info1.lgrpi1_comment = c-opt_comment;
+ }
- if (!NT_STATUS_IS_OK(result)) goto done;
+ status = NetLocalGroupAdd(c-opt_host, 1, (uint8_t *)info1,
parm_error);
- done:
- if (NT_STATUS_IS_OK(result))
- DEBUG(5, (add alias succeeded\n));
- else
- d_fprintf(stderr, add alias failed: %s\n, nt_errstr(result));
+ if (status != 0) {
+
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-194-g816bb64
The branch, v4-0-test has been updated
via 816bb64a56a75d1eb5e879b4abf211af27243686 (commit)
via 6673a6e62399c4956a44a06685aa91ce8145b92a (commit)
via 514d88580bee3bb17f1032262f5518e3ab2a349a (commit)
via c2df7ffa6d67dd9381d10397c679746547cd5e17 (commit)
via 15d0951b74b46763024560f9cd012338473c5bc3 (commit)
via 736ce50afd9da9b5fbc3db777fd5341dfa4b721a (commit)
via 26c2a34dec26890230dfa86827804d8160061ce5 (commit)
from 9678085f75b6cb0ed068e22f3d9f94247b200ce2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 816bb64a56a75d1eb5e879b4abf211af27243686
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 23:17:20 2008 +1000
Update to a working trustAuthIncoming and trustAuthOutgoing parser.
This is based on the docs, as well as testing against a domain trust
in windows.
Clearly it needs to be more general - perhaps a non IDL parser?
Andrew Bartlett
commit 6673a6e62399c4956a44a06685aa91ce8145b92a
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 21:23:48 2008 +1000
Print trustAuthOutgoing and trustAuthIncoming in RPC-DSSYNC
commit 514d88580bee3bb17f1032262f5518e3ab2a349a
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 10:51:59 2008 +1000
Use the cldap reply to avoid segfaulting in RPC-DSSYNC
Also don't fail the test if the server does not implement the NT4
changelog.
Andrew Bartlett
commit c2df7ffa6d67dd9381d10397c679746547cd5e17
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 09:07:57 2008 +1000
Don't fail if the domain has a trust already.
Andrew Bartlett
commit 15d0951b74b46763024560f9cd012338473c5bc3
Merge: 736ce50afd9da9b5fbc3db777fd5341dfa4b721a
9678085f75b6cb0ed068e22f3d9f94247b200ce2
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 07:48:16 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-local
commit 736ce50afd9da9b5fbc3db777fd5341dfa4b721a
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 07:47:01 2008 +1000
Start implementind domain trusts in our KDC.
Andrew Bartlett
commit 26c2a34dec26890230dfa86827804d8160061ce5
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Thu Jul 31 07:45:30 2008 +1000
Update trustAuthInOutBlob in line with MS-ADTS 7.1.6.8.1
---
Summary of changes:
source/kdc/hdb-ldb.c | 40 ++---
source/librpc/idl/drsblobs.idl | 97 +++-
source/torture/rpc/dssync.c| 42 ++---
source/torture/rpc/lsa.c |7 +++-
4 files changed, 139 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
index 8f8ce30..a997eb0 100644
--- a/source/kdc/hdb-ldb.c
+++ b/source/kdc/hdb-ldb.c
@@ -853,7 +853,8 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context
context, HDB *db,
{
krb5_error_code ret;
struct ldb_message **msg = NULL;
- struct ldb_message **realm_ref_msg = NULL;
+ struct ldb_message **realm_ref_msg_1 = NULL;
+ struct ldb_message **realm_ref_msg_2 = NULL;
struct ldb_dn *realm_dn;
krb5_principal alloc_principal = NULL;
@@ -864,14 +865,18 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context
context, HDB *db,
}
/* krbtgt case. Either us or a trusted realm */
+
if ((LDB_lookup_realm(context, (struct ldb_context *)db-hdb_db,
- mem_ctx, principal-name.name_string.val[1],
realm_ref_msg) == 0)) {
+ mem_ctx, principal-realm, realm_ref_msg_1) == 0)
+(LDB_lookup_realm(context, (struct ldb_context *)db-hdb_db,
+mem_ctx, principal-name.name_string.val[1],
realm_ref_msg_2) == 0)
+(ldb_dn_cmp(realm_ref_msg_1[0]-dn, realm_ref_msg_1[0]-dn) ==
0)) {
/* us */
/* Cludge, cludge cludge. If the realm part of krbtgt/realm,
* is in our db, then direct the caller at our primary
-* krgtgt */
+* krbtgt */
- const char *dnsdomain =
ldb_msg_find_attr_as_string(realm_ref_msg[0], dnsRoot, NULL);
+ const char *dnsdomain =
ldb_msg_find_attr_as_string(realm_ref_msg_1[0], dnsRoot, NULL);
char *realm_fixed = strupper_talloc(mem_ctx, dnsdomain);
if (!realm_fixed) {
krb5_set_error_string(context, strupper_talloc: out of
memory);
@@ -891,8 +896,26 @@ static krb5_error_code LDB_fetch_krbtgt(krb5_context
context, HDB *db,
return ENOMEM;
}
principal = alloc_principal;
- realm_dn
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3473-gd46f648
The branch, v3-3-test has been updated
via d46f648d2e25ad712138f02e5060288278f4c1b1 (commit)
from 2ed4ce0bf1723e35a6c5dfa7f8fa58fb9c7ab469 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit d46f648d2e25ad712138f02e5060288278f4c1b1
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Jul 31 15:14:14 2008 +0200
netapi: when using NetApi functions forward net's kerberos setting.
Guenther
---
Summary of changes:
source/utils/net_dom.c |3 +++
source/utils/net_rpc.c |6 ++
2 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_dom.c b/source/utils/net_dom.c
index 6b8185a..f13b9c2 100644
--- a/source/utils/net_dom.c
+++ b/source/utils/net_dom.c
@@ -257,6 +257,9 @@ int net_dom(struct net_context *c, int argc, const char
**argv)
libnetapi_set_username(c-netapi_ctx, c-opt_user_name);
libnetapi_set_password(c-netapi_ctx, c-opt_password);
+ if (c-opt_kerberos) {
+ libnetapi_set_use_kerberos(c-netapi_ctx);
+ }
return net_run_function(c, argc, argv, net dom, func);
}
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 730681c..347ddd0 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1243,6 +1243,9 @@ int net_rpc_user(struct net_context *c, int argc, const
char **argv)
}
libnetapi_set_username(c-netapi_ctx, c-opt_user_name);
libnetapi_set_password(c-netapi_ctx, c-opt_password);
+ if (c-opt_kerberos) {
+ libnetapi_set_use_kerberos(c-netapi_ctx);
+ }
if (argc == 0) {
if (c-display_usage) {
@@ -3062,6 +3065,9 @@ int net_rpc_group(struct net_context *c, int argc, const
char **argv)
}
libnetapi_set_username(c-netapi_ctx, c-opt_user_name);
libnetapi_set_password(c-netapi_ctx, c-opt_password);
+ if (c-opt_kerberos) {
+ libnetapi_set_use_kerberos(c-netapi_ctx);
+ }
if (argc == 0) {
if (c-display_usage) {
--
Samba Shared Repository
Re: svn commit: samba r22638 - in tags: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jelmer Vernooij schrieb: Stefan (metze) Metzmacher wrote: [EMAIL PROTECTED] schrieb: Author: jelmer Date: 2007-05-02 16:10:03 + (Wed, 02 May 2007) New Revision: 22638 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22638 Log: Tag current TDB as 1.1.0 Added: tags/TDB_1_1_0/ why not TDB_1_0_1 ? The sourceforge project with TDB and the package in Debian both use 1.0.1 as version number. I figured the support for transactions and the other improvements qualified for a new minor release. ok, fine:-) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGOMOOm70gjA5TCD8RAsFGAJsH0IPCY30RixyJrk8NDEz9nsvR5gCgqeGD OPV1XALAswG3QotgTRwRJu0= =GV+z -END PGP SIGNATURE-
Re: svn commit: samba r22640 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4: .
Hi Metze,
[EMAIL PROTECTED] wrote:
Author: metze
Date: 2007-05-02 18:00:02 + (Wed, 02 May 2007)
New Revision: 22640
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22640
Log:
- generate nicer output
- fix compiler warning about unused ';'
metze
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-05-02 16:10:23 UTC (rev 22639)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-05-02 18:00:02 UTC (rev 22640)
@@ -43,7 +43,7 @@
}
if ($ret) {
- pidl /* [ . substr($ret, 0, -1) . ] */;
+ pidl /* [ . substr($ret, 0, -1) . ] */;
}
}
@@ -108,10 +108,12 @@
pidl tabs().char _empty_;\n;
}
$tab_depth--;
-pidl tabs().};
+
+pidl };;
I'm pretty sure this breaks support for nested structures / unions.
Cheers,
Jelmer
Re: svn commit: samba r22638 - in tags: .
Jelmer, The sourceforge project with TDB and the package in Debian both use 1.0.1 as version number. I figured the support for transactions and the other improvements qualified for a new minor release. I'd vote for 2.0 - tdb has really improved a lot since the sourceforge project split off. Cheers, Tridge
Build status as of Fri Aug 1 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-07-31 00:00:41.0 + +++ /home/build/master/cache/broken_results.txt 2008-08-01 00:00:25.0 + @@ -1,4 +1,4 @@ -Build status as of Thu Jul 31 00:00:02 2008 +Build status as of Fri Aug 1 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -8,14 +8,14 @@ distcc 1 0 0 ldb 35 34 0 libreplace 33 12 0 -lorikeet-heimdal 27 21 0 -pidl 18 18 0 -ppp 11 0 0 -rsync35 12 0 +lorikeet-heimdal 26 21 0 +pidl 19 19 0 +ppp 12 0 0 +rsync35 11 0 samba-docs 0 0 0 samba-gtk6 6 0 -samba_3_2_test 34 20 0 -samba_4_0_test 33 29 0 +samba_3_2_test 35 22 0 +samba_4_0_test 32 33 0 smb-build32 5 0 talloc 35 7 0 tdb 35 14 0
