[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-244-g02c9176
The branch, v3-2-stable has been updated
via 02c9176ec91184900846be011f92ff6b8524b948 (commit)
from fd1c56610e5a1672ab87980b4acee50698aaa1c7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 02c9176ec91184900846be011f92ff6b8524b948
Author: Michael Adam [EMAIL PROTECTED]
Date: Sat Mar 29 01:05:17 2008 +0100
winbindd_cache: add missing validation function for pwinfo cache entry
Michael
(cherry picked from commit 6d3fc63bfab06346fa57719e8747397873a3c46d)
---
Summary of changes:
source/winbindd/winbindd_cache.c | 24
1 files changed, 24 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_cache.c b/source/winbindd/winbindd_cache.c
index a8a98e5..0f8bd49 100644
--- a/source/winbindd/winbindd_cache.c
+++ b/source/winbindd/winbindd_cache.c
@@ -3209,6 +3209,29 @@ static int validate_de(TALLOC_CTX *mem_ctx, const char
*keystr, TDB_DATA dbuf,
return 0;
}
+static int validate_pwinfo(TALLOC_CTX *mem_ctx, const char *keystr,
+ TDB_DATA dbuf, struct tdb_validation_status *state)
+{
+ struct cache_entry *centry = create_centry_validate(keystr, dbuf,
state);
+
+ if (!centry) {
+ return 1;
+ }
+
+ (void)centry_string(centry, mem_ctx);
+ (void)centry_string(centry, mem_ctx);
+ (void)centry_string(centry, mem_ctx);
+ (void)centry_uint32(centry);
+
+ centry_free(centry);
+
+ if (!(state-success)) {
+ return 1;
+ }
+ DEBUG(10,(validate_pwinfo: %s ok\n, keystr));
+ return 0;
+}
+
static int validate_trustdoms(TALLOC_CTX *mem_ctx, const char *keystr,
TDB_DATA dbuf,
struct tdb_validation_status *state)
{
@@ -3307,6 +3330,7 @@ struct key_val_struct {
{GM/, validate_gm},
{DR/, validate_dr},
{DE/, validate_de},
+ {NSS/PWINFO/, validate_pwinfo},
{TRUSTDOMS/, validate_trustdoms},
{TRUSTDOMCACHE/, validate_trustdomcache},
{WINBINDD_OFFLINE, validate_offline},
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-544-g4d0a5d5
The branch, v3-2-test has been updated via 4d0a5d5c93ddab444a0097e1c56e4363574cb2b6 (commit) from 5c28c74aa06a82559f498373b3d6e9892d5c2cbe (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 4d0a5d5c93ddab444a0097e1c56e4363574cb2b6 Author: Michael Adam [EMAIL PROTECTED] Date: Mon Mar 31 11:58:35 2008 +0200 build: fix configure option --with-static-libs=libXYZ This should not prevent building but linking of shared lib for subsystem XYZ (example --with-static-libs=libtdb). m4 quotation is tricky... Michael --- Summary of changes: source/m4/aclocal.m4 |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index ef0abad..48cdacc 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -100,7 +100,7 @@ build_lib=yes if eval test x$build_lib = xyes -a $BLDSHARED = true; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) - if test x$USESHARED != xtrue -o x$LINK_LIBUC = xSTATIC ; then + if test x$USESHARED != xtrue -o x$[LINK_]LIBUC = xSTATIC ; then LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] else LIBUC[_LIBS]=LIBLIBS -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-245-gb6c8524
The branch, v3-2-stable has been updated via b6c8524b2cc615ae86636305d98e621ab36d8723 (commit) from 02c9176ec91184900846be011f92ff6b8524b948 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit b6c8524b2cc615ae86636305d98e621ab36d8723 Author: Michael Adam [EMAIL PROTECTED] Date: Mon Mar 31 11:58:35 2008 +0200 build: fix configure option --with-static-libs=libXYZ This should not prevent building but linking of shared lib for subsystem XYZ (example --with-static-libs=libtdb). m4 quotation is tricky... Michael (cherry picked from commit 4d0a5d5c93ddab444a0097e1c56e4363574cb2b6) --- Summary of changes: source/m4/aclocal.m4 |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index ef0abad..48cdacc 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -100,7 +100,7 @@ build_lib=yes if eval test x$build_lib = xyes -a $BLDSHARED = true; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) - if test x$USESHARED != xtrue -o x$LINK_LIBUC = xSTATIC ; then + if test x$USESHARED != xtrue -o x$[LINK_]LIBUC = xSTATIC ; then LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] else LIBUC[_LIBS]=LIBLIBS -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-551-g960c069
The branch, v3-2-test has been updated
via 960c069a2354e0803e2cbf22c26e1a9d0b657b79 (commit)
via a7d735df292cee7dd6e23c7d2328481d57162904 (commit)
via 43df48bdca1a71fa44b24bb3917869f886555d9c (commit)
via a25b39cac1716323154dd30acb30180d3273587b (commit)
via 9936d861a1c1163ce6fd079211b50fd9b52bc05d (commit)
via 4766ebf7ac8d33f9cd0f983ecdc54ef44959648b (commit)
via 9a2f0b21925e630fa9b268cedbc19cf814686b42 (commit)
from 4d0a5d5c93ddab444a0097e1c56e4363574cb2b6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 960c069a2354e0803e2cbf22c26e1a9d0b657b79
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:39:43 2008 +0100
wbinfo: use wbcAllocateGid()
metze
commit a7d735df292cee7dd6e23c7d2328481d57162904
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:39:16 2008 +0100
wbinfo: use wbcAllocateUid()
metze
commit 43df48bdca1a71fa44b24bb3917869f886555d9c
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:38:24 2008 +0100
wbinfo: use wbcSidToGid()
metze
commit a25b39cac1716323154dd30acb30180d3273587b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:37:50 2008 +0100
wbinfo: use wbcSidToUid()
metze
commit 9936d861a1c1163ce6fd079211b50fd9b52bc05d
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:37:02 2008 +0100
wbinfo: use wbcGitToSid()
metze
commit 4766ebf7ac8d33f9cd0f983ecdc54ef44959648b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:34:10 2008 +0100
wbinfo: use wbcUidToSid()
metze
commit 9a2f0b21925e630fa9b268cedbc19cf814686b42
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Mar 28 19:01:54 2008 +0100
wbinfo: use wbcPing()
metze
---
Summary of changes:
source/nsswitch/wbinfo.c | 118 +++--
1 files changed, 71 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 15d6ae2..82d1061 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -27,8 +27,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-extern int winbindd_fd;
-
static char winbind_separator_int(bool strict)
{
struct winbindd_response response;
@@ -564,23 +562,27 @@ static bool wbinfo_check_secret(void)
static bool wbinfo_uid_to_sid(uid_t uid)
{
- struct winbindd_request request;
- struct winbindd_response response;
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ struct wbcDomainSid sid;
+ char *sid_str = NULL;
/* Send request */
- request.data.uid = uid;
+ wbc_status = wbcUidToSid(uid, sid);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ return false;
+ }
- if (winbindd_request_response(WINBINDD_UID_TO_SID, request, response)
!=
- NSS_STATUS_SUCCESS)
+ wbc_status = wbcSidToString(sid, sid_str);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
return false;
+ }
/* Display response */
- d_printf(%s\n, response.data.sid.sid);
+ d_printf(%s\n, sid_str);
+
+ wbcFreeMemory(sid_str);
return true;
}
@@ -589,81 +591,96 @@ static bool wbinfo_uid_to_sid(uid_t uid)
static bool wbinfo_gid_to_sid(gid_t gid)
{
- struct winbindd_request request;
- struct winbindd_response response;
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ struct wbcDomainSid sid;
+ char *sid_str = NULL;
/* Send request */
- request.data.gid = gid;
+ wbc_status = wbcGidToSid(gid, sid);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ return false;
+ }
- if (winbindd_request_response(WINBINDD_GID_TO_SID, request, response)
!=
- NSS_STATUS_SUCCESS)
+ wbc_status = wbcSidToString(sid, sid_str);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
return false;
+ }
/* Display response */
- d_printf(%s\n, response.data.sid.sid);
+ d_printf(%s\n, sid_str);
+
+ wbcFreeMemory(sid_str);
return true;
}
/* Convert sid to uid */
-static bool wbinfo_sid_to_uid(char *sid)
+static bool wbinfo_sid_to_uid(const char *sid_str)
{
- struct winbindd_request request;
- struct winbindd_response response;
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ struct wbcDomainSid sid;
+ uid_t uid;
/* Send request */
- fstrcpy(request.data.sid, sid);
+ wbc_status =
svn commit: samba-web r1180 - in trunk: .
Author: kseeger Date: 2008-03-31 15:21:34 + (Mon, 31 Mar 2008) New Revision: 1180 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1180 Log: -Remove Chinese link (commercial content) -Remove Italian link (pointed to english site). Simo, please check and feel free to re-add. Karolin Modified: trunk/header_columns.html Changeset: Modified: trunk/header_columns.html === --- trunk/header_columns.html 2008-03-29 10:30:27 UTC (rev 1179) +++ trunk/header_columns.html 2008-03-31 15:21:34 UTC (rev 1180) @@ -182,9 +182,7 @@ h4International Sites/h4 ul li Deutsch: a href=http://samba.sernet.de/;samba.sernet.de/a/li -li Italiano: a href=http://samba.xsec.it/;samba.xsec.it/a/li li Hebrew: a href=http://linux.israel.net/samba/samba.html;linux.israel.net/a/li -li Chinese: a href=http://hk.samba.org/;hk.samba.org/a/li /ul /div
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-552-g04b4898
The branch, v3-2-test has been updated
via 04b48984bbf84c55bb41a74a11cbcc7358377fed (commit)
from 960c069a2354e0803e2cbf22c26e1a9d0b657b79 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 04b48984bbf84c55bb41a74a11cbcc7358377fed
Author: Michael Adam [EMAIL PROTECTED]
Date: Mon Mar 31 17:20:07 2008 +0200
registry: reg_deletevalue should return error, when the value does not
exist.
Michael
---
Summary of changes:
source/registry/reg_api.c | 18 ++
1 files changed, 18 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/registry/reg_api.c b/source/registry/reg_api.c
index e52aaac..1a0bf2b 100644
--- a/source/registry/reg_api.c
+++ b/source/registry/reg_api.c
@@ -653,6 +653,19 @@ WERROR reg_setvalue(struct registry_key *key, const char
*name,
return WERR_OK;
}
+static WERROR reg_value_exists(struct registry_key *key, const char *name)
+{
+ int i;
+
+ for (i=0; ikey-values-num_values; i++) {
+ if (strequal(key-values-values[i]-valuename, name)) {
+ return WERR_OK;
+ }
+ }
+
+ return WERR_BADFILE;
+}
+
WERROR reg_deletevalue(struct registry_key *key, const char *name)
{
WERROR err;
@@ -665,6 +678,11 @@ WERROR reg_deletevalue(struct registry_key *key, const
char *name)
return err;
}
+ err = reg_value_exists(key, name);
+ if (!W_ERROR_IS_OK(err)) {
+ return err;
+ }
+
regval_ctr_delvalue(key-values, name);
if (!store_reg_values(key-key, key-values)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-555-gd775194
The branch, v3-2-test has been updated
via d775194e9c7b75182c485fba427b20ec2bfcf16c (commit)
via bf4af79f050cceb6611a8aa3d893b59b816a41ce (commit)
via ad1fbadf81c915425301ec495744c11f3103169f (commit)
from 04b48984bbf84c55bb41a74a11cbcc7358377fed (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit d775194e9c7b75182c485fba427b20ec2bfcf16c
Author: Michael Adam [EMAIL PROTECTED]
Date: Mon Mar 31 13:51:49 2008 +0200
test: add (and unify) sectioning output of subtests in tests_all.sh
Michael
commit bf4af79f050cceb6611a8aa3d893b59b816a41ce
Author: Michael Adam [EMAIL PROTECTED]
Date: Mon Mar 31 13:33:12 2008 +0200
test: add possibility to select tests to run via tests_all.sh (make test)
This allows to select the tests to run with tests_all.sh by setting
the environment variable RUNTESTS. Example:
RUNTESTS=smbclient_s3_encrypted wbinfo_s3 make test
Michael
commit ad1fbadf81c915425301ec495744c11f3103169f
Author: Michael Adam [EMAIL PROTECTED]
Date: Mon Mar 31 13:20:08 2008 +0200
test: in tests_all.sh, wrap calls to test scripts into shell functions.
This is in preparation for enabling running only selected test scripts
through make test.
Michael
---
Summary of changes:
source/script/tests/tests_all.sh | 91 ++---
1 files changed, 73 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index 369cf3e..e2cfad6 100755
--- a/source/script/tests/tests_all.sh
+++ b/source/script/tests/tests_all.sh
@@ -1,20 +1,75 @@
-$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD ||
failed=`expr $failed + $?`
-echo Testing encrypted
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD -e
|| failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed +
$?`
-echo Testing encrypted
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP -e || failed=`expr
$failed + $?`
-$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD ||
failed=`expr $failed + $?`
-$SCRIPTDIR/test_ntlm_auth_s3.sh || failed=`expr $failed + $?`
-
-eval $LIB_PATH_VAR=\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR; export $LIB_PATH_VAR
-eval echo $LIB_PATH_VAR=\$$LIB_PATH_VAR
-SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-if [ -n $SMBTORTURE4 -a -n $SMBTORTURE4VERSION ];then
- echo Running Tests with Samba4's smbtorture
- echo $SMBTORTURE4VERSION
- $SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD ||
failed=`expr $failed + $?`
+local_s3() {
+ echo RUNNING SUBTESTS local_s3
+ $SCRIPTDIR/test_local_s3.sh \
+ || failed=`expr $failed + $?`
+}
+
+smbtorture_s3() {
+ echo RUNNING SUBTESTS smbtorture_s3
+ $SCRIPTDIR/test_smbtorture_s3.sh \
+ //$SERVER_IP/tmp $USERNAME $PASSWORD \
+ || failed=`expr $failed + $?`
+}
+
+smbtorture_s3_encrypted() {
+ echo RUNNING SUBTESTS smbtorture_s3_encrypted
+ $SCRIPTDIR/test_smbtorture_s3.sh \
+ //$SERVER_IP/tmp $USERNAME $PASSWORD -e \
+ || failed=`expr $failed + $?`
+}
+
+smbclient_s3() {
+ echo RUNNING SUBTESTS smbclient_s3
+ $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
+ || failed=`expr $failed + $?`
+}
+
+smbclient_s3_encrypted() {
+ echo RUNNING SUBTESTS smbclient_s3_encrypted
+ $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP -e \
+ || failed=`expr $failed + $?`
+}
+
+wbinfo_s3() {
+ echo RUNNING SUBTESTS wbinfo_s3
+ $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
+ || failed=`expr $failed + $?`
+}
+
+ntlm_auth_s3() {
+ echo RUNNING SUBTESTS ntlm_auth_s3
+ $SCRIPTDIR/test_ntlm_auth_s3.sh \
+ || failed=`expr $failed + $?`
+}
+
+posix_s3() {
+ echo RUNNING SUBTESTS posix_s3
+ eval $LIB_PATH_VAR=\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR; export
$LIB_PATH_VAR
+ eval echo $LIB_PATH_VAR=\$$LIB_PATH_VAR
+ SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ if [ -n $SMBTORTURE4 -a -n $SMBTORTURE4VERSION ];then
+ echo Running Tests with Samba4's smbtorture
+ echo $SMBTORTURE4VERSION
+ $SCRIPTDIR/test_posix_s3.sh \
+ //$SERVER_IP/tmp $USERNAME $PASSWORD \
+ || failed=`expr $failed + $?`
+ else
+ echo Skip Tests with Samba4's smbtorture
+ fi
+}
+
+if test x$RUNTESTS = x ; then
+ local_s3
+ smbtorture_s3
+ smbtorture_s3_encrypted
+ smbclient_s3
+ smbclient_s3_encrypted
+ wbinfo_s3
+ ntlm_auth_s3
+ posix_s3
else
-
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-559-g3414eac
The branch, v3-2-test has been updated
via 3414eac439b731ad7204b821ddc4fec54fe4435d (commit)
via b68caaa81bd75bb882c9363612d11d49dd73cb6f (commit)
via e7827bb6afa264c12ecdc0858f49707ca3d6104f (commit)
via 6aac972d790ad5ca65096cb2e85e6819b60a5413 (commit)
from d775194e9c7b75182c485fba427b20ec2bfcf16c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 3414eac439b731ad7204b821ddc4fec54fe4435d
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Mon Mar 31 13:39:54 2008 -0500
Fix enumeration of forest trusts from our root domain.
Do not overwrite the domain-domain_flags when setting infomation
in set_dc_type_and_flags_connect().
commit b68caaa81bd75bb882c9363612d11d49dd73cb6f
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Thu Mar 27 15:23:36 2008 -0500
DIsplay the short domain name in wbinfo -m by default.
This fixes wbinfo -m to make preexisting behavior.
Also adds the dns domain to the --verbose output.
commit e7827bb6afa264c12ecdc0858f49707ca3d6104f
Author: Steven Danneman [EMAIL PROTECTED]
Date: Tue Mar 25 16:58:40 2008 -0700
Augmented wbinfo -m to list additional information about the type,
direction, and transitivty of trusts.
* added several helper functions to convert the trust_flags field in the
winbindd_tdc_domain to more useful administrator ideas of trust type, trust
direction, and trust transitivity.
* converted winbindd_list_trusted_domains() to enumerate the trusted domain
cache, instead of the domain list, and return additional trust information
to
the calling process
* modified wbinfo to pretty print this additional trust information when a
new
--verbose switch is given with -m. Thus wbinfo -m and wbinfo
-all-domains
output as before, but wbinfo --verbose -m prints extra trust info.
* updated some comments and fixed typos
commit 6aac972d790ad5ca65096cb2e85e6819b60a5413
Author: Steven Danneman [EMAIL PROTECTED]
Date: Tue Mar 25 16:50:58 2008 -0700
Forest root trust flags won't overwrite child trust flags
* changed the behavior of winbind_ads.c:trusted_domains() to not overwrite
existing trust information if we're joined to a child domain, and querying
the
forest root domain. Previously if we were joined to a child domain, we'd
request all known trust information from this child domain (our primary
domain)
and store it in the tdc. We'd then request all trust information from our
tree
root (to get the forests we transitively trust) and overwrite the existing
trust
information we already had from the perspective of the tree root.
* updated several comments and fixed typos
---
Summary of changes:
source/nsswitch/wbinfo.c| 99 +++--
source/winbindd/winbindd_ads.c | 81 +++---
source/winbindd/winbindd_cm.c |2 +-
source/winbindd/winbindd_misc.c | 104 ++-
source/winbindd/winbindd_util.c |6 +-
5 files changed, 230 insertions(+), 62 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 82d1061..d62e82a 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -83,7 +83,7 @@ static const char *get_winbind_domain(void)
if (!WBC_ERROR_IS_OK(wbc_status)) {
d_fprintf(stderr, could not obtain winbind domain name!\n);
- /* HACK: (this module should not call lp_ funtions) */
+ /* HACK: (this module should not call lp_ functions) */
return lp_workgroup();
}
@@ -345,13 +345,15 @@ static bool wbinfo_wins_byip(char *ip)
return true;
}
-/* List trusted domains */
+/* List all/trusted domains */
-static bool wbinfo_list_domains(bool list_all_domains)
+static bool wbinfo_list_domains(bool list_all_domains, bool verbose)
{
struct winbindd_request request;
struct winbindd_response response;
+ bool print_all = !list_all_domains verbose;
+
ZERO_STRUCT(request);
ZERO_STRUCT(response);
@@ -368,21 +370,78 @@ static bool wbinfo_list_domains(bool list_all_domains)
if (response.extra_data.data) {
const char *extra_data = (char *)response.extra_data.data;
char *name;
- char *p;
+ char *beg, *end;
TALLOC_CTX *frame = talloc_stackframe();
+ if (print_all) {
+ d_printf(%-16s%-24s%-12s%-12s%-5s%-5s\n,
+Domain Name, DNS Domain, Trust Type,
+Transitive, In, Out);
+ }
+
while(next_token_talloc(frame,extra_data,name,\n))
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-563-gc4f248d
The branch, v3-2-test has been updated
via c4f248df8e34c6a028bf8d789fe9763b0ea063fe (commit)
via 35a70c65beed1c4a1fab4113af7a5b232f23063b (commit)
via 98606c667a425113d87b2756ee7df34f67445539 (commit)
via 8f6f0d1601cb93af51f8d493382cd707c3eb0cdf (commit)
from 3414eac439b731ad7204b821ddc4fec54fe4435d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c4f248df8e34c6a028bf8d789fe9763b0ea063fe
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 20:43:18 2008 +0200
Re-add support for the samr parameters string.
(dialin settings, terminal server settings, etc.)
Guenther
commit 35a70c65beed1c4a1fab4113af7a5b232f23063b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 20:42:26 2008 +0200
Re-run make idl.
Guenther
commit 98606c667a425113d87b2756ee7df34f67445539
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 20:40:56 2008 +0200
The parameters string (aka munged dial string) in samr is not a normal
lsa_String.
Guenther
commit 8f6f0d1601cb93af51f8d493382cd707c3eb0cdf
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 20:40:16 2008 +0200
Add init_samr_parameters_string().
Guenther
---
Summary of changes:
source/librpc/gen_ndr/ndr_samr.c | 20
source/librpc/gen_ndr/samr.h |4 +-
source/librpc/idl/samr.idl|4 +-
source/rpc_client/init_samr.c | 10 ++--
source/rpc_server/srv_samr_nt.c | 86
source/rpc_server/srv_samr_util.c | 17 +++
source/rpcclient/cmd_samr.c | 16 ++-
7 files changed, 99 insertions(+), 58 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index 3af589f..46b3a07 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -2613,10 +2613,10 @@ static enum ndr_err_code
ndr_push_samr_UserInfo20(struct ndr_push *ndr, int ndr_
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS,
r-parameters));
+ NDR_CHECK(ndr_push_lsa_BinaryString(ndr, NDR_SCALARS,
r-parameters));
}
if (ndr_flags NDR_BUFFERS) {
- NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS,
r-parameters));
+ NDR_CHECK(ndr_push_lsa_BinaryString(ndr, NDR_BUFFERS,
r-parameters));
}
return NDR_ERR_SUCCESS;
}
@@ -2625,10 +2625,10 @@ static enum ndr_err_code
ndr_pull_samr_UserInfo20(struct ndr_pull *ndr, int ndr_
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS,
r-parameters));
+ NDR_CHECK(ndr_pull_lsa_BinaryString(ndr, NDR_SCALARS,
r-parameters));
}
if (ndr_flags NDR_BUFFERS) {
- NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS,
r-parameters));
+ NDR_CHECK(ndr_pull_lsa_BinaryString(ndr, NDR_BUFFERS,
r-parameters));
}
return NDR_ERR_SUCCESS;
}
@@ -2637,7 +2637,7 @@ _PUBLIC_ void ndr_print_samr_UserInfo20(struct ndr_print
*ndr, const char *name,
{
ndr_print_struct(ndr, name, samr_UserInfo20);
ndr-depth++;
- ndr_print_lsa_String(ndr, parameters, r-parameters);
+ ndr_print_lsa_BinaryString(ndr, parameters, r-parameters);
ndr-depth--;
}
@@ -2711,7 +2711,7 @@ static enum ndr_err_code ndr_push_samr_UserInfo21(struct
ndr_push *ndr, int ndr_
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS,
r-description));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS,
r-workstations));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, r-comment));
- NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS,
r-parameters));
+ NDR_CHECK(ndr_push_lsa_BinaryString(ndr, NDR_SCALARS,
r-parameters));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, r-unknown1));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, r-unknown2));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, r-unknown3));
@@ -2741,7 +2741,7 @@ static enum ndr_err_code ndr_push_samr_UserInfo21(struct
ndr_push *ndr, int ndr_
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS,
r-description));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS,
r-workstations));
NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, r-comment));
- NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS,
r-parameters));
+ NDR_CHECK(ndr_push_lsa_BinaryString(ndr, NDR_BUFFERS,
r-parameters));
NDR_CHECK(ndr_push_lsa_String(ndr,
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-564-g0c94918
The branch, v3-2-test has been updated
via 0c94918fb52c5345ce30490046b79f81712c30bf (commit)
from c4f248df8e34c6a028bf8d789fe9763b0ea063fe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 0c94918fb52c5345ce30490046b79f81712c30bf
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Mon Mar 31 14:33:53 2008 -0500
Patch from Nicholas Brealey [EMAIL PROTECTED] to distinguish between
WinXP and WinXP64.
Defines a new value for the %a variable when detecting a Windows XP 64-bit
client.
---
Summary of changes:
source/include/smb.h |2 +-
source/lib/util.c|5 -
2 files changed, 5 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index bf9ca6b..4d18dc5 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1571,7 +1571,7 @@ enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON,
LDAP_PASSWD_SYNC_OFF, LDAP_PAS
/* Remote architectures we know about. */
enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT,
RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA,
- RA_SAMBA, RA_CIFSFS};
+ RA_SAMBA, RA_CIFSFS, RA_WINXP64};
/* case handling */
enum case_handling {CASE_LOWER,CASE_UPPER};
diff --git a/source/lib/util.c b/source/lib/util.c
index dba7142..00062b8 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -2057,7 +2057,7 @@ void ra_lanman_string( const char *native_lanman )
if ( strcmp( native_lanman, Windows 2002 5.1 ) == 0 )
set_remote_arch( RA_WINXP );
else if ( strcmp( native_lanman, Windows XP 5.2 ) == 0 )
- set_remote_arch( RA_WINXP );
+ set_remote_arch( RA_WINXP64 );
else if ( strcmp( native_lanman, Windows Server 2003 5.2 ) == 0 )
set_remote_arch( RA_WIN2K3 );
}
@@ -2098,6 +2098,9 @@ void set_remote_arch(enum remote_arch_types type)
case RA_WINXP:
remote_arch_str = WinXP;
break;
+ case RA_WINXP64:
+ remote_arch_str = WinXP64;
+ break;
case RA_WIN2K3:
remote_arch_str = Win2K3;
break;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-565-ge03d1df
The branch, v3-2-test has been updated
via e03d1dfdb80333c071b600245eb749ef5664aa22 (commit)
from 0c94918fb52c5345ce30490046b79f81712c30bf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e03d1dfdb80333c071b600245eb749ef5664aa22
Author: Jeff Layton [EMAIL PROTECTED]
Date: Mon Mar 10 15:54:36 2008 -0400
mount.cifs: fix several problems when mounting subdirectories of shares
(try 2)
This patch is the second patch to attempt to fix up some of the problems
with mounting subdirectories of shares. The earlier patch didn't handle
this correctly when POSIX extensions were enabled. This one does.
This is a bit of a confusing area since the different components of
a service string have different rules:
1) hostname: no '/' (slash) or '\' (backslash) is allowed to be
embedded within the string
2) sharename: same rules as hostname
3) prefixpath: '\' *is* allowed to be embedded in a path component,
iff POSIX extensions are enabled. Otherwise, neither
character is allowed.
The idea here is to allow either character to act as a delimiter when we
know that the character can't be anything but a delimiter (namely
everywhere up to the start of the prefixpath). The patch will convert
any '\' unconditionally to '/' in the UNC portion of the string.
However, inside the prefixpath, we can't make assumptions about what
constitutes a delimiter because POSIX allows for embedded '\'
characters. So there we don't attempt to do any conversion, and pass the
prefixpath to the kernel as is. Once the kernel determines whether POSIX
extensions are enabled, it can then convert the path if needed and it's
able to do so. A patch to handle this has already been committed to the
cifs-2.6 git tree.
This patch also fixes an annoyance. When you mount a subdir of a share,
mount.cifs munges the device string so that you can't tell what the
prefixpath is. So if I mount:
//server/share/p1/p2/p3
..then /proc/mounts and mtab will show only:
//server/share
Finally, it also tries to apply some consistent rules to the uppercasing
of strings.
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
---
Summary of changes:
source/client/mount.cifs.c | 90
1 files changed, 66 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index e73d908..fdee87a 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -63,6 +63,8 @@
#define MS_BIND 4096
#endif
+#define MAX_UNC_LEN 1024
+
#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
const char *thisprogram;
@@ -74,7 +76,6 @@ static int got_ip = 0;
static int got_unc = 0;
static int got_uid = 0;
static int got_gid = 0;
-static int free_share_name = 0;
static char * user_name = NULL;
static char * mountpassword = NULL;
char * domain_name = NULL;
@@ -837,17 +838,31 @@ static char * check_for_domain(char **ppuser)
return domainnm;
}
+/* replace all occurances of from in a string with to */
+static void replace_char(char *string, char from, char to, int maxlen)
+{
+ char *lastchar = string + maxlen;
+ while (string) {
+ string = strchr(string, from);
+ if (string) {
+ *string = to;
+ if (string = lastchar)
+ return;
+ }
+ }
+}
+
/* Note that caller frees the returned buffer if necessary */
static char * parse_server(char ** punc_name)
{
char * unc_name = *punc_name;
- int length = strnlen(unc_name,1024);
+ int length = strnlen(unc_name, MAX_UNC_LEN);
char * share;
char * ipaddress_string = NULL;
struct hostent * host_entry = NULL;
struct in_addr server_ipaddr;
- if(length 1023) {
+ if(length (MAX_UNC_LEN - 1)) {
printf(mount error: UNC name too long);
return NULL;
}
@@ -866,7 +881,6 @@ static char * parse_server(char ** punc_name)
/* check for nfs syntax ie server:share */
share = strchr(unc_name,':');
if(share) {
- free_share_name = 1;
*punc_name = (char *)malloc(length+3);
if(*punc_name == NULL) {
/* put the original string back if
@@ -874,9 +888,9 @@ static char * parse_server(char ** punc_name)
*punc_name = unc_name;
svn commit: samba-docs r1253 - in trunk/manpages-3: .
Author: idra Date: 2008-03-31 20:13:01 + (Mon, 31 Mar 2008) New Revision: 1253 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1253 Log: Better doc mount.cifs. Original commit msg from Jeff: This patch adds a section to the mount.cifs manpage to clarify how mount.cifs treats delimiters and when it autoconverts them from one type to another. It also has it state that the use of forward slash as a delimiter is preferred and why. Signed-off-by: Jeff Layton [EMAIL PROTECTED] Modified: trunk/manpages-3/mount.cifs.8.xml Changeset: Modified: trunk/manpages-3/mount.cifs.8.xml === --- trunk/manpages-3/mount.cifs.8.xml 2008-03-27 17:54:31 UTC (rev 1252) +++ trunk/manpages-3/mount.cifs.8.xml 2008-03-31 20:13:01 UTC (rev 1253) @@ -499,6 +499,17 @@ /refsect1 refsect1 + titleSERVICE FORMATTING AND DELIMITERS/title + + para + It's generally preferred to use forward slashes (/) as a delimiter in service names. They are considered to be the universal delimiter since they are generally not allowed to be embedded within path components on Windows machines and the client can convert them to blackslashes (\) unconditionally. Conversely, backslash characters are allowed by POSIX to be part of a path component, and can't be automatically converted in the same way. + /para + para + mount.cifs will attempt to convert backslashes to forward slashes where it's able to do so, but it cannot do so in any path component following the sharename. + /para +/refsect1 + +refsect1 titleENVIRONMENT VARIABLES/title para
svn commit: samba-docs r1254 - in trunk/manpages-3: .
Author: jerry Date: 2008-03-31 20:38:37 + (Mon, 31 Mar 2008) New Revision: 1254 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1254 Log: Adding WinXP64 and Vista as documented values for %a in smb.conf(5) Modified: trunk/manpages-3/smb.conf.5.xml Changeset: Modified: trunk/manpages-3/smb.conf.5.xml === --- trunk/manpages-3/smb.conf.5.xml 2008-03-31 20:13:01 UTC (rev 1253) +++ trunk/manpages-3/smb.conf.5.xml 2008-03-31 20:38:37 UTC (rev 1254) @@ -481,14 +481,19 @@ varlistentry term%a/term - listitemparathe architecture of the remote - machine. It currently recognizes Samba (constantSamba/constant), - the Linux CIFS file system (constantCIFSFS/constant), OS/2, (constantOS2/constant), - Windows for Workgroups (constantWfWg/constant), Windows 9x/ME - (constantWin95/constant), Windows NT (constantWinNT/constant), - Windows 2000 (constantWin2K/constant), Windows XP (constantWinXP/constant), - and Windows 2003 (constantWin2K3/constant). Anything else will be known as - constantUNKNOWN/constant./para + listitempara + The architecture of the remote + machine. It currently recognizes Samba (constantSamba/constant), + the Linux CIFS file system (constantCIFSFS/constant), OS/2, (constantOS2/constant), + Windows for Workgroups (constantWfWg/constant), Windows 9x/ME + (constantWin95/constant), Windows NT (constantWinNT/constant), + Windows 2000 (constantWin2K/constant), + Windows XP (constantWinXP/constant), + Windows XP 64-bit(constantWinXP64/constant), + Windows 2003 including + 2003R2 (constantWin2K3/constant), and Windows + Vista (constantVista/constant). Anything else will be known as + constantUNKNOWN/constant./para /listitem /varlistentry
svn commit: samba-docs r1255 - in trunk/manpages-3: .
Author: jerry Date: 2008-03-31 20:40:24 + (Mon, 31 Mar 2008) New Revision: 1255 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1255 Log: Document --verbose option to wbinfo Modified: trunk/manpages-3/wbinfo.1.xml Changeset: Modified: trunk/manpages-3/wbinfo.1.xml === --- trunk/manpages-3/wbinfo.1.xml 2008-03-31 20:38:37 UTC (rev 1254) +++ trunk/manpages-3/wbinfo.1.xml 2008-03-31 20:40:24 UTC (rev 1255) @@ -49,6 +49,7 @@ arg choice=opt-U uid/arg arg choice=opt-V/arg arg choice=opt-Y sid/arg + arg choice=opt--verbose/arg /cmdsynopsis /refsynopsisdiv @@ -309,6 +310,14 @@ /varlistentry varlistentry + term--verbose/term + listitempara + Print additional information about the query + results. + /para/listitem + /varlistentry + + varlistentry term-Y|--sid-to-gid sid/term listitemparaConvert a SID to a UNIX group id. If the SID does not correspond to a UNIX group mapped by citerefentry
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-566-gfa5968a
The branch, v3-2-test has been updated
via fa5968a26b552d7f13574a826e506ed2d6630feb (commit)
from e03d1dfdb80333c071b600245eb749ef5664aa22 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit fa5968a26b552d7f13574a826e506ed2d6630feb
Author: Michael Adam [EMAIL PROTECTED]
Date: Mon Mar 31 13:54:39 2008 +0200
test: add test script for testing net registry.
Michael
---
Summary of changes:
source/script/tests/test_net_registry.sh | 378 ++
source/script/tests/tests_all.sh |7 +
2 files changed, 385 insertions(+), 0 deletions(-)
create mode 100755 source/script/tests/test_net_registry.sh
Changeset truncated at 500 lines:
diff --git a/source/script/tests/test_net_registry.sh
b/source/script/tests/test_net_registry.sh
new file mode 100755
index 000..927882b
--- /dev/null
+++ b/source/script/tests/test_net_registry.sh
@@ -0,0 +1,378 @@
+#!/bin/sh
+
+# tests for the net registry command - local access to the registry db
+
+
+NET=$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION
+
+NETREG=${NET} registry
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_enumerate()
+{
+ KEY=$1
+
+ ${NETREG} enumerate ${KEY}
+}
+
+test_getsd()
+{
+ KEY=$1
+
+ ${NETREG} getsd ${KEY}
+}
+
+test_enumerate_nonexisting()
+{
+ KEY=$1
+ ${NETREG} enumerate ${KEY}
+ if test x$? = x0 ; then
+ echo ERROR: enumerate succeeded with key '${KEY}'
+ false
+ else
+ true
+ fi
+}
+
+test_enumerate_no_key()
+{
+ ${NETREG} enumerate
+ if test x$? = x0 ; then
+ echo ERROR: enumerate succeeded without any key spcified
+ false
+ else
+ true
+ fi
+}
+
+test_create_existing()
+{
+ KEY=HKLM
+ EXPECTED=createkey opened existing ${KEY}
+ OUTPUT=`${NETREG} createkey ${KEY}`
+ if test x$? = x0 ; then
+ if test $OUTPUT = $EXPECTED ; then
+ true
+ else
+ echo got '$OUTPUT', expected '$EXPECTED'
+ false;
+ fi
+ else
+ echo -e $OUTPUT
+ false
+ fi
+}
+
+test_createkey()
+{
+ KEY=$1
+ BASEKEY=`dirname $KEY`
+ SUBKEY=`basename $KEY`
+
+ ${NETREG} createkey ${KEY}
+ if test x$? != x0 ; then
+ false
+ return
+ fi
+
+ # check enumerate of basekey lists new key:
+ OUTPUT=`${NETREG} enumerate ${BASEKEY}`
+ if test x$? != x0 ; then
+ echo ERROR: failed to enumerate key '${BASEKEY}'
+ echo output:
+ echo -e $OUTPUT
+ false
+ return
+ fi
+
+ EXPECTED=Keyname = ${SUBKEY}
+ echo -e $OUTPUT | grep ^Keyname | grep ${SUBKEY}
+ if test x$? != x0 ; then
+ echo ERROR: did not find expexted '$EXPECTED' in output
+ echo output:
+ echo -e $OUTPUT
+ false
+ fi
+
+ # check enumerate of new key works:
+ ${NETREG} enumerate ${KEY}
+}
+
+test_deletekey()
+{
+ KEY=$1
+ BASEKEY=`dirname ${KEY}`
+ SUBKEY=`basename ${KEY}`
+
+ test_createkey ${KEY}
+
+ if test x$? != x0 ; then
+ false
+ return
+ fi
+
+ ${NETREG} deletekey ${KEY}
+
+ # check enumerate of basekey does not show key anymore:
+ OUTPUT=`${NETREG} enumerate ${BASEKEY}`
+ if test x$? != x0 ; then
+ echo -e $OUTPUT
+ false
+ return
+ fi
+
+ UNEXPECTED=Keyname = ${SUBKEY}
+ echo -e $OUTPUT | grep ^Keyname | grep ${SUBKEY}
+ if test x$? = x0 ; then
+ echo ERROR: found '$UNEXPECTED' after delete in output
+ echo output:
+ echo -e $OUTPUT
+ false
+ fi
+
+ # check enumerate of key itself does not work anymore:
+ ${NETREG} enumerate ${KEY}
+ if test x$? = x0 ; then
+ echo ERROR: 'enumerate ${KEY}' works after 'deletekey ${KEY}'
+ false
+ else
+ true
+ fi
+}
+
+test_deletekey_nonexisting()
+{
+ KEY=$1
+
+ test_deletekey ${KEY}
+
+ if test x$? != x0 ; then
+ false
+ return
+ fi
+
+ ${NETREG} deletekey ${KEY}
+ if test x$? = x0 ; then
+ echo ERROR: delete after delete succeeded for key '${KEY}'
+ false
+ fi
+}
+
+test_createkey_with_subkey()
+{
+ KEY=$1
+ KEY2=`dirname ${KEY}`
+ SUBKEYNAME2=`basename ${KEY}`
+ BASENAME=`dirname ${KEY2}`
+ SUBKEYNAME1=`basename ${KEY2}`
+
+ ${NETREG} createkey
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-575-gc40522c
The branch, v3-2-test has been updated
via c40522cfe97c4e5eedccc9c56f47f9d4a8bcdaaf (commit)
via 8b4eac0ab186c0293d3f007f0c98d60e0eda (commit)
via 776facabf6f09f643d6dc526aa83f8db517465f9 (commit)
via 3adf82554a6f54878aed99c3e894aef1b7ecfd84 (commit)
via da7f006539219f8ccd525ef1fcd131d5f9558bf1 (commit)
via b4d944e724f7ae2a97ba788b185aba7b7308b475 (commit)
via 1b6083449fbc2a252c046a0757c411be64e6b6c0 (commit)
via 29c42792567870f3dc23363f4357fecbec862937 (commit)
via 2fd90b62d7e61fa0c23f8f41e9f12fc16f29a8b1 (commit)
from fa5968a26b552d7f13574a826e506ed2d6630feb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c40522cfe97c4e5eedccc9c56f47f9d4a8bcdaaf
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Apr 1 00:14:00 2008 +0200
Fix build warning.
Guenther
commit 8b4eac0ab186c0293d3f007f0c98d60e0eda
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Apr 1 00:11:55 2008 +0200
Fix SRVSVC NetShareInfo level 502 client-side.
Guenther
commit 776facabf6f09f643d6dc526aa83f8db517465f9
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Apr 1 00:02:48 2008 +0200
Fix SRVSVC ShareInfo level 502 server side handling.
Guenther
commit 3adf82554a6f54878aed99c3e894aef1b7ecfd84
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 23:55:16 2008 +0200
Re-run make idl.
Guenther
commit da7f006539219f8ccd525ef1fcd131d5f9558bf1
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 23:52:36 2008 +0200
Fix IDL for srvsvc_NetShareInfo502. It does indeed contain a sec_desc_buf.
Guenther
commit b4d944e724f7ae2a97ba788b185aba7b7308b475
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 23:51:34 2008 +0200
Fix SRVSVC ShareInfo max_users handling server side.
Guenther
commit 1b6083449fbc2a252c046a0757c411be64e6b6c0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 23:47:26 2008 +0200
Re-run make idl.
Guenther
commit 29c42792567870f3dc23363f4357fecbec862937
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 23:45:26 2008 +0200
Use uint32 in max_users field in SRVSVC ShareInfo levels consistently.
Guenther
commit 2fd90b62d7e61fa0c23f8f41e9f12fc16f29a8b1
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Mar 31 22:49:03 2008 +0200
Fix _srvsvc_NetShareSetInfo.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/ndr_srvsvc.c | 54 +++
source/librpc/gen_ndr/srvsvc.h |7 ++--
source/librpc/idl/srvsvc.idl |8 ++---
source/rpc_client/init_srvsvc.c| 10 ++
source/rpc_server/srv_samr_nt.c|2 +-
source/rpc_server/srv_srvsvc_nt.c | 30 +++
source/utils/net_rpc.c |4 +-
7 files changed, 41 insertions(+), 74 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.c
b/source/librpc/gen_ndr/ndr_srvsvc.c
index fbf84ab..4e9e81a 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source/librpc/gen_ndr/ndr_srvsvc.c
@@ -4438,12 +4438,11 @@ static enum ndr_err_code
ndr_push_srvsvc_NetShareInfo502(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_srvsvc_ShareType(ndr, NDR_SCALARS, r-type));
NDR_CHECK(ndr_push_unique_ptr(ndr, r-comment));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-permissions));
- NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r-max_users));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-max_users));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-current_users));
NDR_CHECK(ndr_push_unique_ptr(ndr, r-path));
NDR_CHECK(ndr_push_unique_ptr(ndr, r-password));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-unknown));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r-sd));
+ NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS, r-sd_buf));
}
if (ndr_flags NDR_BUFFERS) {
if (r-name) {
@@ -4470,14 +4469,7 @@ static enum ndr_err_code
ndr_push_srvsvc_NetShareInfo502(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-password, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r-password, ndr_charset_length(r-password, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
}
- if (r-sd) {
- {
- struct ndr_push *_ndr_sd;
- NDR_CHECK(ndr_push_subcontext_start(ndr,
_ndr_sd, 4, -1));
- NDR_CHECK(ndr_push_security_descriptor(_ndr_sd,
NDR_SCALARS|NDR_BUFFERS,
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-576-g3cb1cde
The branch, v3-2-test has been updated via 3cb1cdee9307cafa80ab95233a536f5dd7882ff1 (commit) from c40522cfe97c4e5eedccc9c56f47f9d4a8bcdaaf (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 3cb1cdee9307cafa80ab95233a536f5dd7882ff1 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Apr 1 00:32:23 2008 +0200 Fix build of rpcclient. Guenther --- Summary of changes: source/rpcclient/cmd_srvsvc.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c index 51c9819..070fb36 100644 --- a/source/rpcclient/cmd_srvsvc.c +++ b/source/rpcclient/cmd_srvsvc.c @@ -243,8 +243,8 @@ static void display_share_info_502(struct srvsvc_NetShareInfo502 *r) printf(\tmax_uses:\t%d\n, r-max_users); printf(\tnum_uses:\t%d\n, r-current_users); - if (r-sd) - display_sec_desc(r-sd); + if (r-sd_buf.sd) + display_sec_desc(r-sd_buf.sd); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-577-ga7499e9
The branch, v3-2-test has been updated via a7499e994aef743ea9c443f9a1618b262f6eda93 (commit) from 3cb1cdee9307cafa80ab95233a536f5dd7882ff1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a7499e994aef743ea9c443f9a1618b262f6eda93 Author: Jeremy Allison [EMAIL PROTECTED] Date: Mon Mar 31 16:46:20 2008 -0700 Reduce the race condition in Samba4 in RAW-RENAME test. We rename a file using trans2 setfileinfo on one connection, and then check the file name has changed on the other. In Samba we achieve this by sending a local message to the other process. This change causes us to re-scan for incoming messages after we've woken up from the select (which is cheap if there are no pending messages). This reduces the race significantly. Volker please review. Jeremy. --- Summary of changes: source/smbd/process.c |9 + 1 files changed, 9 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/process.c b/source/smbd/process.c index 9c01bba..03216a0 100644 --- a/source/smbd/process.c +++ b/source/smbd/process.c @@ -853,6 +853,15 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer, goto again; } + /* +* We've just woken up from a protentially long select sleep. +* Ensure we process local messages as we need to synchronously +* process any messages from other smbd's to avoid file rename race +* conditions. This call is cheap if there are no messages waiting. +* JRA. +*/ + message_dispatch(smbd_messaging_context()); + /* if we get EINTR then maybe we have received an oplock signal - treat this as select returning 1. This is ugly, but is the best we can do until the oplock code knows more about -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-578-g26a74d0
The branch, v3-2-test has been updated
via 26a74d01bb2b53ffa5d296ff1c7d8b2b0d17831a (commit)
from a7499e994aef743ea9c443f9a1618b262f6eda93 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 26a74d01bb2b53ffa5d296ff1c7d8b2b0d17831a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Mon Mar 31 16:56:21 2008 -0700
Move the message_dispatch() call after the check for errno on
the select return. We don't want the call to message_dispatch
to mess up the errno value.
Jeremy.
---
Summary of changes:
source/smbd/process.c | 22 +++---
1 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 03216a0..9aa775d 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -853,15 +853,6 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX
*mem_ctx, char **buffer,
goto again;
}
- /*
-* We've just woken up from a protentially long select sleep.
-* Ensure we process local messages as we need to synchronously
-* process any messages from other smbd's to avoid file rename race
-* conditions. This call is cheap if there are no messages waiting.
-* JRA.
-*/
- message_dispatch(smbd_messaging_context());
-
/* if we get EINTR then maybe we have received an oplock
signal - treat this as select returning 1. This is ugly, but
is the best we can do until the oplock code knows more about
@@ -880,8 +871,17 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX
*mem_ctx, char **buffer,
if (selrtn == -1) {
/* something is wrong. Maybe the socket is dead? */
return map_nt_error_from_unix(errno);
- }
-
+ }
+
+ /*
+* We've just woken up from a protentially long select sleep.
+* Ensure we process local messages as we need to synchronously
+* process any messages from other smbd's to avoid file rename race
+* conditions. This call is cheap if there are no messages waiting.
+* JRA.
+*/
+ message_dispatch(smbd_messaging_context());
+
/* Did we timeout ? */
if (selrtn == 0) {
return NT_STATUS_IO_TIMEOUT;
--
Samba Shared Repository
Build status as of Tue Apr 1 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-03-31 00:00:24.0 + +++ /home/build/master/cache/broken_results.txt 2008-04-01 00:00:24.0 + @@ -1,4 +1,4 @@ -Build status as of Mon Mar 31 00:00:01 2008 +Build status as of Tue Apr 1 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -14,7 +14,7 @@ rsync29 12 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 29 24 0 +samba_3_2_test 29 25 0 samba_4_0_test 27 19 0 smb-build27 3 0 talloc 29 6 0
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-579-gda2c19c
The branch, v3-2-test has been updated
via da2c19c481d0041872b4ce2f5105052077f3d3b8 (commit)
from 26a74d01bb2b53ffa5d296ff1c7d8b2b0d17831a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit da2c19c481d0041872b4ce2f5105052077f3d3b8
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Mon Mar 31 17:01:27 2008 -0700
Ok, final move of this code :-). I think I've found the correct
place for it now where it will cause minimal disruption (only
call the extra message_dispatch just before reading the next
smb off the wire).
Jeremy.
---
Summary of changes:
source/smbd/process.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 9aa775d..8868431 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -873,15 +873,6 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX
*mem_ctx, char **buffer,
return map_nt_error_from_unix(errno);
}
- /*
-* We've just woken up from a protentially long select sleep.
-* Ensure we process local messages as we need to synchronously
-* process any messages from other smbd's to avoid file rename race
-* conditions. This call is cheap if there are no messages waiting.
-* JRA.
-*/
- message_dispatch(smbd_messaging_context());
-
/* Did we timeout ? */
if (selrtn == 0) {
return NT_STATUS_IO_TIMEOUT;
@@ -903,6 +894,15 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX
*mem_ctx, char **buffer,
goto again;
}
+ /*
+* We've just woken up from a protentially long select sleep.
+* Ensure we process local messages as we need to synchronously
+* process any messages from other smbd's to avoid file rename race
+* conditions. This call is cheap if there are no messages waiting.
+* JRA.
+*/
+ message_dispatch(smbd_messaging_context());
+
status = receive_smb_talloc(mem_ctx, smbd_server_fd(), buffer, 0,
p_unread, p_encrypted, len);
--
Samba Shared Repository
