[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7dec1e1 delete duplicate test from cc9ba98 selftest: add a test for accessing previous version of directories with snapdirseverywhere https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7dec1e1eb192bb798138ea772fb7cda636edf3e2 Author: Herb Lewis <h...@samba.org> Date: Fri Jul 7 13:10:54 2017 -0700 delete duplicate test Signed-off-by: Herb Lewis <h...@samba.org> Reviewed-by: Richard Sharpe <realrichardsha...@gmail.com> Autobuild-User(master): Herb Lewis <h...@samba.org> Autobuild-Date(master): Sat Jul 8 05:57:55 CEST 2017 on sn-devel-144 --- Summary of changes: source4/torture/basic/delaywrite.c | 1 - 1 file changed, 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 45a5f4e..160674f 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -3088,7 +3088,6 @@ struct torture_suite *torture_delay_write(TALLOC_CTX *ctx) torture_suite_add_2smb_test(suite, "delayed update of write time 5b", test_delayed_write_update5b); torture_suite_add_2smb_test(suite, "delayed update of write time 6", test_delayed_write_update6); torture_suite_add_1smb_test(suite, "timestamp resolution test", test_delayed_write_update7); - torture_suite_add_1smb_test(suite, "timestamp resolution test", test_delayed_write_update7); torture_suite_add_1smb_test(suite, "directory timestamp update test", test_directory_update8); return suite; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 485ad76 test commit to see it push works for me. from 4732f5b s4:torture/smb2/lock: remove samba4 specific checks for NETWORK_NAME_DELETED/USER_SESSION_DELETED http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 485ad76a49c1fa33742a4d8bc510f6dcaf11c2cb Author: Herb Lewis h...@samba.org Date: Wed Sep 28 14:14:54 2011 -0700 test commit to see it push works for me. Autobuild-User: Herb Lewis h...@samba.org Autobuild-Date: Thu Sep 29 00:51:16 CEST 2011 on sn-devel-104 --- Summary of changes: Roadmap |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/Roadmap b/Roadmap index c5b8a4d..114fbf3 100644 --- a/Roadmap +++ b/Roadmap @@ -12,7 +12,7 @@ are in progress: Samba-3.0.xThis release turned into maintenance mode since we released 3.2. -Samba-3.4.xThis is the current stable Samba 3 release intended +Samba-3.6.xThis is the current stable Samba 3 release intended for all Samba production server. Samba-4Danger Will Robinson, a big code clean up with major -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3263-gdc3c9fd
The branch, v3-2-test has been updated
via dc3c9fd570850e69ad5166184726f9abb7d8a9c7 (commit)
from c48a4e52b707a860c2956b3eb9d1d631b1f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit dc3c9fd570850e69ad5166184726f9abb7d8a9c7
Author: Herb Lewis hle...@chomps.localdomain
Date: Fri Dec 12 13:47:10 2008 -0800
don't return 0 on error - bad for scripts
---
Summary of changes:
source/utils/smbcacls.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index 06ec984..611df8a 100644
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -737,6 +737,8 @@ static int owner_set(struct cli_state *cli, enum chown_mode
change_mode,
if (!cli_set_secdesc(cli, fnum, sd)) {
printf(ERROR: secdesc set failed: %s\n, cli_errstr(cli));
+ cli_close(cli, fnum);
+ return EXIT_FAILED;
}
cli_close(cli, fnum);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2975-g2a085d5
The branch, v3-2-test has been updated
via 2a085d5343ab954e1bd60c11033506dc7c9040e3 (commit)
from edd234e7a22dab105256f90df36d86f168dcea4c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2a085d5343ab954e1bd60c11033506dc7c9040e3
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Sep 4 13:58:06 2008 -0700
get rid of unneeded argument for get_methods
---
Summary of changes:
source/winbindd/idmap.c | 24 ++--
1 files changed, 10 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index a1c2b1f..850aeb4 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -75,12 +75,11 @@ static struct idmap_alloc_context *idmap_alloc_ctx = NULL;
goto done; \
} } while(0)
-static struct idmap_methods *get_methods(struct idmap_backend *be,
-const char *name)
+static struct idmap_methods *get_methods(const char *name)
{
struct idmap_backend *b;
- for (b = be; b; b = b-next) {
+ for (b = backends; b; b = b-next) {
if (strequal(b-name, name)) {
return b-methods;
}
@@ -140,7 +139,7 @@ NTSTATUS smb_register_idmap(int version, const char *name,
return NT_STATUS_INVALID_PARAMETER;
}
- test = get_methods(backends, name);
+ test = get_methods(name);
if (test) {
DEBUG(0,(Idmap module %s already registered!\n, name));
return NT_STATUS_OBJECT_NAME_COLLISION;
@@ -454,13 +453,12 @@ NTSTATUS idmap_init(void)
IDMAP_CHECK_ALLOC(parm_backend);
/* get the backend methods for this domain */
- dom-methods = get_methods(backends, parm_backend);
+ dom-methods = get_methods(parm_backend);
if ( ! dom-methods) {
ret = smb_probe_module(idmap, parm_backend);
if (NT_STATUS_IS_OK(ret)) {
- dom-methods = get_methods(backends,
- parm_backend);
+ dom-methods = get_methods(parm_backend);
}
}
if ( ! dom-methods) {
@@ -541,13 +539,11 @@ NTSTATUS idmap_init(void)
dom-readonly = False;
/* get the backend methods for this domain */
- dom-methods = get_methods(backends, compat_backend);
-
+ dom-methods = get_methods(compat_backend);
if ( ! dom-methods) {
ret = smb_probe_module(idmap, compat_backend);
if (NT_STATUS_IS_OK(ret)) {
- dom-methods = get_methods(backends,
- compat_backend);
+ dom-methods = get_methods(compat_backend);
}
}
if ( ! dom-methods) {
@@ -606,8 +602,8 @@ NTSTATUS idmap_init(void)
dom-default_domain = False;
dom-readonly = True;
- /* get the backend methods for passdb */
- dom-methods = get_methods(backends, nss);
+ /* get the backend methods for nss */
+ dom-methods = get_methods(nss);
/* (the nss module is always statically linked) */
if ( ! dom-methods) {
@@ -663,7 +659,7 @@ NTSTATUS idmap_init(void)
dom-readonly = True;
/* get the backend methods for passdb */
- dom-methods = get_methods(backends, passdb);
+ dom-methods = get_methods(passdb);
/* (the passdb module is always statically linked) */
if ( ! dom-methods) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2976-g59415cb
The branch, v3-2-test has been updated
via 59415cb8b3ce7981dbf576086e13675f343581a4 (commit)
from 2a085d5343ab954e1bd60c11033506dc7c9040e3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 59415cb8b3ce7981dbf576086e13675f343581a4
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Sep 4 14:32:09 2008 -0700
get rid of unneeded argument for get_alloc_methods as well
---
Summary of changes:
source/winbindd/idmap.c | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 850aeb4..d601210 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -88,13 +88,11 @@ static struct idmap_methods *get_methods(const char *name)
return NULL;
}
-static struct idmap_alloc_methods *get_alloc_methods(
- struct idmap_alloc_backend *be,
- const char *name)
+static struct idmap_alloc_methods *get_alloc_methods(const char *name)
{
struct idmap_alloc_backend *b;
- for (b = be; b; b = b-next) {
+ for (b = alloc_backends; b; b = b-next) {
if (strequal(b-name, name)) {
return b-methods;
}
@@ -192,7 +190,7 @@ NTSTATUS smb_register_idmap_alloc(int version, const char
*name,
return NT_STATUS_INVALID_PARAMETER;
}
- test = get_alloc_methods(alloc_backends, name);
+ test = get_alloc_methods(name);
if (test) {
DEBUG(0,(idmap_alloc module %s already registered!\n, name));
return NT_STATUS_OBJECT_NAME_COLLISION;
@@ -751,14 +749,12 @@ NTSTATUS idmap_init(void)
struct idmap_alloc_context);
IDMAP_CHECK_ALLOC(idmap_alloc_ctx);
- idmap_alloc_ctx-methods = get_alloc_methods(alloc_backends,
-alloc_backend);
+ idmap_alloc_ctx-methods = get_alloc_methods(alloc_backend);
if ( ! idmap_alloc_ctx-methods) {
ret = smb_probe_module(idmap, alloc_backend);
if (NT_STATUS_IS_OK(ret)) {
idmap_alloc_ctx-methods =
- get_alloc_methods(alloc_backends,
- alloc_backend);
+ get_alloc_methods(alloc_backend);
}
}
if (idmap_alloc_ctx-methods) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3971-g0311d17
The branch, v3-devel has been updated
via 0311d171970e888754cf614adfdfc1f8e0f5b04e (commit)
via 07b0323472b78d49cff06b78924c3015bea52a30 (commit)
from 3f821e8c88665a1e6a3d07a438cd978527306221 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 0311d171970e888754cf614adfdfc1f8e0f5b04e
Merge: 07b0323472b78d49cff06b78924c3015bea52a30
3f821e8c88665a1e6a3d07a438cd978527306221
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Sep 4 14:48:27 2008 -0700
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
commit 07b0323472b78d49cff06b78924c3015bea52a30
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Sep 4 14:35:27 2008 -0700
get rid of unneeded argument in get_methods and get_alloc_methods
---
Summary of changes:
source/winbindd/idmap.c | 23 +--
1 files changed, 9 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 2962fe6..cfc5597 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -81,12 +81,11 @@ static struct idmap_domain *passdb_idmap_domain;
static struct idmap_domain **idmap_domains = NULL;
static int num_domains = 0;
-static struct idmap_methods *get_methods(struct idmap_backend *be,
-const char *name)
+static struct idmap_methods *get_methods(const char *name)
{
struct idmap_backend *b;
- for (b = be; b; b = b-next) {
+ for (b = backends; b; b = b-next) {
if (strequal(b-name, name)) {
return b-methods;
}
@@ -95,13 +94,11 @@ static struct idmap_methods *get_methods(struct
idmap_backend *be,
return NULL;
}
-static struct idmap_alloc_methods *get_alloc_methods(
- struct idmap_alloc_backend *be,
- const char *name)
+static struct idmap_alloc_methods *get_alloc_methods(const char *name)
{
struct idmap_alloc_backend *b;
- for (b = be; b; b = b-next) {
+ for (b = alloc_backends; b; b = b-next) {
if (strequal(b-name, name)) {
return b-methods;
}
@@ -199,7 +196,7 @@ NTSTATUS smb_register_idmap_alloc(int version, const char
*name,
return NT_STATUS_INVALID_PARAMETER;
}
- test = get_alloc_methods(alloc_backends, name);
+ test = get_alloc_methods(name);
if (test) {
DEBUG(0,(idmap_alloc module %s already registered!\n, name));
return NT_STATUS_OBJECT_NAME_COLLISION;
@@ -300,7 +297,7 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX
*mem_ctx,
goto fail;
}
- result-methods = get_methods(backends, modulename);
+ result-methods = get_methods(modulename);
if (result-methods == NULL) {
DEBUG(3, (idmap backend %s not found\n, modulename));
@@ -311,7 +308,7 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX
*mem_ctx,
goto fail;
}
- result-methods = get_methods(backends, modulename);
+ result-methods = get_methods(modulename);
}
if (result-methods == NULL) {
DEBUG(1, (idmap backend %s not found\n, modulename));
@@ -564,15 +561,13 @@ static NTSTATUS idmap_alloc_init(struct
idmap_alloc_context **ctx)
goto fail;
}
- idmap_alloc_ctx-methods = get_alloc_methods(alloc_backends,
-modulename);
+ idmap_alloc_ctx-methods = get_alloc_methods(modulename);
if (idmap_alloc_ctx-methods == NULL) {
ret = smb_probe_module(idmap, modulename);
if (NT_STATUS_IS_OK(ret)) {
idmap_alloc_ctx-methods =
- get_alloc_methods(alloc_backends,
- modulename);
+ get_alloc_methods(modulename);
}
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2910-g4d83924
The branch, v3-2-test has been updated
via 4d83924470b267f2267abd62a3be2ac3ae373d7b (commit)
via b022e8c249c5f77ea5716613e97158669429c447 (commit)
from 12b4ed7c3c10a6a29d108f6a83d961bf19751ca7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4d83924470b267f2267abd62a3be2ac3ae373d7b
Merge: b022e8c249c5f77ea5716613e97158669429c447
12b4ed7c3c10a6a29d108f6a83d961bf19751ca7
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Aug 14 12:20:22 2008 -0700
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
my32-test
commit b022e8c249c5f77ea5716613e97158669429c447
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Aug 14 12:19:36 2008 -0700
use correct argument
---
Summary of changes:
source/auth/auth_util.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 2024526..23e3fc0 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -698,7 +698,7 @@ NTSTATUS create_local_token(auth_serversupplied_info
*server_info)
} else {
server_info-ptok = create_local_nt_token(
- server_info,
+ mem_ctx,
pdb_get_user_sid(server_info-sam_account),
server_info-guest,
server_info-num_sids, server_info-sids);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2806-g39d7dab
The branch, v3-2-test has been updated
via 39d7dab19ad7aa97ef8691cd3704ab976510aa78 (commit)
via ccd413b8b10c99f18b6369717116765c3397edfb (commit)
from 4779f1efccc8364fd8b3ba446aa96ba0bddec689 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 39d7dab19ad7aa97ef8691cd3704ab976510aa78
Merge: ccd413b8b10c99f18b6369717116765c3397edfb
4779f1efccc8364fd8b3ba446aa96ba0bddec689
Author: Herb Lewis [EMAIL PROTECTED]
Date: Tue Aug 12 13:55:50 2008 -0700
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
my32-test
commit ccd413b8b10c99f18b6369717116765c3397edfb
Author: Herb Lewis [EMAIL PROTECTED]
Date: Tue Aug 12 13:38:51 2008 -0700
print correct test status
---
Summary of changes:
source/torture/torture.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/torture/torture.c b/source/torture/torture.c
index d8add20..e909f8c 100644
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -3685,7 +3685,7 @@ static bool run_rename(int dummy)
}
if (!cli_rename(cli1, fname, fname1)) {
- printf(Fifth rename failed (SHARE_READ | SHARE_WRITE |
SHARE_DELETE) - this should have failed ! \n);
+ printf(Fifth rename failed (SHARE_READ | SHARE_WRITE |
SHARE_DELETE) - this should have succeeded - %s\n, cli_errstr(cli1));
correct = False;
} else {
printf(Fifth rename succeeded (SHARE_READ | SHARE_WRITE |
SHARE_DELETE) (this is correct) - %s\n, cli_errstr(cli1));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2761-g2b5425e
The branch, v3-2-test has been updated
via 2b5425efddfccb1010d082e6133cfdd79d72729e (commit)
from 76061eee93fd67b96916a088c64a038e47a48814 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2b5425efddfccb1010d082e6133cfdd79d72729e
Author: Herb Lewis [EMAIL PROTECTED]
Date: Tue Jul 22 17:50:33 2008 -0700
get rid of unused variable warnings when HAVE_IPV6 not defined
---
Summary of changes:
source/lib/util_sock.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 822ff26..7356b3e 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -43,9 +43,9 @@ bool is_ipaddress_v4(const char *str)
bool is_ipaddress(const char *str)
{
+#if defined(HAVE_IPV6)
int ret = -1;
-#if defined(HAVE_IPV6)
if (strchr_m(str, ':')) {
char addr[INET6_ADDRSTRLEN];
struct in6_addr dest6;
@@ -212,9 +212,9 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
const char *str,
int flags)
{
- char addr[INET6_ADDRSTRLEN];
struct addrinfo *res = NULL;
#if defined(HAVE_IPV6)
+ char addr[INET6_ADDRSTRLEN];
unsigned int scope_id = 0;
if (strchr_m(str, ':')) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2747-geaee722
The branch, v3-2-test has been updated
via eaee722ca74af274e628cbd868753800bddc3e97 (commit)
from 857e9d2b27eb6824a8056490076fa020fd185a6d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit eaee722ca74af274e628cbd868753800bddc3e97
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Jul 17 09:23:30 2008 -0700
allow SID with 0 in subauthority to be converted properly
from string representation.
---
Summary of changes:
source/nsswitch/libwbclient/wbc_sid.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/libwbclient/wbc_sid.c
b/source/nsswitch/libwbclient/wbc_sid.c
index b090926..4bfd62c 100644
--- a/source/nsswitch/libwbclient/wbc_sid.c
+++ b/source/nsswitch/libwbclient/wbc_sid.c
@@ -140,7 +140,8 @@ wbcErr wbcStringToSid(const char *str,
p = q +1;
sid-num_auths = 0;
while (sid-num_auths WBC_MAXSUBAUTHS) {
- if ((x=(uint32_t)strtoul(p, q, 10)) == 0)
+ x=(uint32_t)strtoul(p, q, 10);
+ if (p == q)
break;
sid-sub_auths[sid-num_auths++] = x;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2719-g710d42d
The branch, v3-2-test has been updated
via 710d42d0b7de44fb684edf7412bfb4a48c3daf07 (commit)
from ed8ae1969bbc116aef9ac693b78ca291b0db3a92 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 710d42d0b7de44fb684edf7412bfb4a48c3daf07
Author: Herb Lewis [EMAIL PROTECTED]
Date: Thu Jul 10 21:05:30 2008 -0700
cleanup some dup code by passing the password to the wbinfo_auth*
functions
---
Summary of changes:
source/nsswitch/wbinfo.c | 71 -
1 files changed, 25 insertions(+), 46 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 7bb4abe..22d9b21 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -880,27 +880,19 @@ static bool wbinfo_lookupname(const char *full_name)
/* Authenticate a user with a plaintext password */
-static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
+static bool wbinfo_auth_krb5(char *username, const char *pass, const char
*cctype, uint32 flags)
{
struct winbindd_request request;
struct winbindd_response response;
NSS_STATUS result;
- char *p;
/* Send off request */
ZERO_STRUCT(request);
ZERO_STRUCT(response);
- p = strchr(username, '%');
-
- if (p) {
- *p = 0;
- fstrcpy(request.data.auth.user, username);
- fstrcpy(request.data.auth.pass, p + 1);
- *p = '%';
- } else
- fstrcpy(request.data.auth.user, username);
+ fstrcpy(request.data.auth.user, username);
+ fstrcpy(request.data.auth.pass, pass);
request.flags = flags;
@@ -941,29 +933,11 @@ static bool wbinfo_auth_krb5(char *username, const char
*cctype, uint32 flags)
/* Authenticate a user with a plaintext password */
-static bool wbinfo_auth(char *username)
+static bool wbinfo_auth(char *username, const char *pass)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- char *s = NULL;
- char *p = NULL;
- const char *password = NULL;
- char *name = NULL;
- if ((s = SMB_STRDUP(username)) == NULL) {
- return false;
- }
-
- if ((p = strchr(s, '%')) != NULL) {
- *p = 0;
- p++;
- password = p;
- } else {
- password = ;
- }
-
- name = s;
-
- wbc_status = wbcAuthenticateUser(name, password);
+ wbc_status = wbcAuthenticateUser(username, pass);
d_printf(plaintext password authentication %s\n,
WBC_ERROR_IS_OK(wbc_status) ? succeeded : failed);
@@ -976,14 +950,12 @@ static bool wbinfo_auth(char *username)
response.data.auth.error_string);
#endif
- SAFE_FREE(s);
-
return WBC_ERROR_IS_OK(wbc_status);
}
/* Authenticate a user with a challenge/response */
-static bool wbinfo_auth_crap(char *username)
+static bool wbinfo_auth_crap(char *username, const char *pass)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcAuthUserParams params;
@@ -993,16 +965,7 @@ static bool wbinfo_auth_crap(char *username)
DATA_BLOB nt = data_blob_null;
fstring name_user;
fstring name_domain;
- fstring pass;
- char *p;
-
- p = strchr(username, '%');
- if (p) {
- *p = 0;
- fstrcpy(pass, p + 1);
- }
-
parse_wbinfo_domain_user(username, name_domain, name_user);
params.account_name = name_user;
@@ -1591,14 +1554,22 @@ int main(int argc, char **argv, char **envp)
break;
case 'a': {
bool got_error = false;
+ char *pass;
- if (!wbinfo_auth(string_arg)) {
+ if ((pass = strchr(string_arg, '%')) != NULL) {
+ *pass = 0;
+ pass++;
+ } else {
+ pass = (char *);
+ }
+
+ if (!wbinfo_auth(string_arg, pass)) {
d_fprintf(stderr, Could not
authenticate user %s with
plaintext password\n,
string_arg);
got_error = true;
}
- if (!wbinfo_auth_crap(string_arg)) {
+ if (!wbinfo_auth_crap(string_arg, pass)) {
d_fprintf(stderr, Could not
authenticate user %s
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2688-g8272dac
The branch, v3-2-test has been updated
via 8272dace64f39286e4255e9f5bc8d04fb47f2c51 (commit)
from 63316efeeb330d2cb7fa0906824c97da2c7b0074 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 8272dace64f39286e4255e9f5bc8d04fb47f2c51
Author: Herb Lewis [EMAIL PROTECTED]
Date: Mon Jul 7 12:32:16 2008 -0700
fix comment typo and change some uint32 to uint32_t
---
Summary of changes:
source/winbindd/idmap.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 10807e6..c9eae33 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -798,7 +798,7 @@ NTSTATUS idmap_init(void)
}
}
- /* cleanpu temporary strings */
+ /* cleanup temporary strings */
TALLOC_FREE( compat_backend );
idmap_init_status = NT_STATUS_OK;
@@ -897,7 +897,7 @@ NTSTATUS idmap_set_gid_hwm(struct unixid *id)
static struct idmap_domain* find_idmap_domain_from_sid( DOM_SID *account_sid )
{
DOM_SID domain_sid;
- uint32 rid;
+ uint32_t rid;
struct winbindd_domain *domain = NULL;
int i;
@@ -939,7 +939,7 @@ static struct idmap_domain* find_idmap_domain_from_sid(
DOM_SID *account_sid )
Lookup an index given an idmap_domain pointer
**/
-static uint32 find_idmap_domain_index( struct idmap_domain *id_domain)
+static uint32_t find_idmap_domain_index( struct idmap_domain *id_domain)
{
int i;
@@ -1212,7 +1212,7 @@ static NTSTATUS idmap_backends_sids_to_unixids(struct
id_map **ids)
/* partition the requests by domain */
for (i = 0; ids[i]; i++) {
- uint32 idx;
+ uint32_t idx;
if ((dom = find_idmap_domain_from_sid(ids[i]-sid)) == NULL) {
/* no available idmap_domain. Move on */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2689-gcee044b
The branch, v3-2-test has been updated via cee044bc42d955c535dbb6bb372af01089d37756 (commit) from 8272dace64f39286e4255e9f5bc8d04fb47f2c51 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit cee044bc42d955c535dbb6bb372af01089d37756 Author: Herb Lewis [EMAIL PROTECTED] Date: Mon Jul 7 12:44:13 2008 -0700 use variables for files used in multiple places --- Summary of changes: source/Makefile.in | 36 +++- 1 files changed, 19 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 136ac0c..d63063d 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -284,16 +284,20 @@ LIBNDR_OBJ = librpc/ndr/ndr_basic.o \ RPCCLIENT_NDR_OBJ = rpc_client/ndr.o +LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \ + librpc/gen_ndr/ndr_lsa.o + +LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o + LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \ -librpc/gen_ndr/ndr_lsa.o \ +$(LIBNDR_GEN_OBJ0) \ librpc/gen_ndr/ndr_dfs.o \ librpc/gen_ndr/ndr_echo.o \ librpc/gen_ndr/ndr_winreg.o \ librpc/gen_ndr/ndr_initshutdown.o \ librpc/gen_ndr/ndr_srvsvc.o \ librpc/gen_ndr/ndr_eventlog.o \ -librpc/gen_ndr/ndr_netlogon.o \ -librpc/gen_ndr/ndr_samr.o \ +$(LIBNDR_GEN_OBJ1) \ librpc/gen_ndr/ndr_dssetup.o \ librpc/gen_ndr/ndr_notify.o \ librpc/gen_ndr/ndr_xattr.o \ @@ -724,7 +728,7 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \ web/swat.o web/neg_lang.o @@ -908,7 +912,7 @@ NET_OBJ = $(NET_OBJ1) \ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) CIFS_MOUNT_OBJ = client/mount.cifs.o @@ -924,28 +928,28 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ -librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o +$(LIBNDR_GEN_OBJ0) MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ -librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o +$(LIBNDR_GEN_OBJ0) LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) \ -librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o +$(LIBNDR_GEN_OBJ0) PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \ $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) @@ -955,7 +959,7 @@ LOG2PCAP_OBJ = utils/log2pcaphex.o LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ - librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o + $(LIBNDR_GEN_OBJ0) SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \ @@ -997,7 +1001,7 @@ DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \ -librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o +$(LIBNDR_GEN_OBJ0) PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \ $(SMBD_OBJ_SRV) $(NMBD_OBJ1
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-40-g4e755cb
The branch, v3-0-test has been updated via 4e755cb5f56ee15c5151efc0dfed280c91819a39 (commit) from 9f4b28b984e9c41012f596675bf2afc29c36b553 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 4e755cb5f56ee15c5151efc0dfed280c91819a39 Author: Herb Lewis [EMAIL PROTECTED] Date: Wed Jun 18 14:29:17 2008 -0700 ENODATA is not defined in freeBSD 4.6.2 --- Summary of changes: source/include/includes.h |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/includes.h b/source/include/includes.h index 8253ee6..0917468 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -224,6 +224,10 @@ typedef int ber_int_t; #include sys/attributes.h #endif +#ifndef ENODATA +#define ENODATA EAGAIN +#endif + #ifndef ENOATTR #define ENOATTR ENODATA #endif -- Samba Shared Repository
svn commit: samba r24289 - in branches/SAMBA_3_0_25/source/services: .
Author: herb
Date: 2007-08-09 19:01:19 + (Thu, 09 Aug 2007)
New Revision: 24289
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24289
Log:
fix debug statments to match function name
Modified:
branches/SAMBA_3_0_25/source/services/services_db.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/services/services_db.c
===
--- branches/SAMBA_3_0_25/source/services/services_db.c 2007-08-09 18:30:42 UTC
(rev 24288)
+++ branches/SAMBA_3_0_25/source/services/services_db.c 2007-08-09 19:01:19 UTC
(rev 24289)
@@ -416,7 +416,7 @@
REG_KEY_ALL );
if ( !W_ERROR_IS_OK(wresult) ) {
- DEBUG(0,(init_services_keys: key lookup failed! (%s)\n,
+ DEBUG(0,(svcctl_init_keys: key lookup failed! (%s)\n,
dos_errstr(wresult)));
return;
}
@@ -424,7 +424,7 @@
/* lookup the available subkeys */
if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) {
- DEBUG(0,(init_services_keys: talloc() failed!\n));
+ DEBUG(0,(svcctl_init_keys: talloc() failed!\n));
regkey_close_internal( key );
return;
}
svn commit: samba r24290 - in branches: SAMBA_3_2/source/services SAMBA_3_2_0/source/services
Author: herb
Date: 2007-08-09 19:03:23 + (Thu, 09 Aug 2007)
New Revision: 24290
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24290
Log:
fix debug statments to match function name
Modified:
branches/SAMBA_3_2/source/services/services_db.c
branches/SAMBA_3_2_0/source/services/services_db.c
Changeset:
Modified: branches/SAMBA_3_2/source/services/services_db.c
===
--- branches/SAMBA_3_2/source/services/services_db.c2007-08-09 19:01:19 UTC
(rev 24289)
+++ branches/SAMBA_3_2/source/services/services_db.c2007-08-09 19:03:23 UTC
(rev 24290)
@@ -415,7 +415,7 @@
get_root_nt_token(), REG_KEY_ALL );
if ( !W_ERROR_IS_OK(wresult) ) {
- DEBUG(0,(init_services_keys: key lookup failed! (%s)\n,
+ DEBUG(0,(svcctl_init_keys: key lookup failed! (%s)\n,
dos_errstr(wresult)));
return;
}
@@ -423,7 +423,7 @@
/* lookup the available subkeys */
if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) {
- DEBUG(0,(init_services_keys: talloc() failed!\n));
+ DEBUG(0,(svcctl_init_keys: talloc() failed!\n));
TALLOC_FREE( key );
return;
}
Modified: branches/SAMBA_3_2_0/source/services/services_db.c
===
--- branches/SAMBA_3_2_0/source/services/services_db.c 2007-08-09 19:01:19 UTC
(rev 24289)
+++ branches/SAMBA_3_2_0/source/services/services_db.c 2007-08-09 19:03:23 UTC
(rev 24290)
@@ -415,7 +415,7 @@
get_root_nt_token(), REG_KEY_ALL );
if ( !W_ERROR_IS_OK(wresult) ) {
- DEBUG(0,(init_services_keys: key lookup failed! (%s)\n,
+ DEBUG(0,(svcctl_init_keys: key lookup failed! (%s)\n,
dos_errstr(wresult)));
return;
}
@@ -423,7 +423,7 @@
/* lookup the available subkeys */
if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) {
- DEBUG(0,(init_services_keys: talloc() failed!\n));
+ DEBUG(0,(svcctl_init_keys: talloc() failed!\n));
TALLOC_FREE( key );
return;
}
svn commit: samba r24255 - in branches/SAMBA_3_0_25/source/utils: .
Author: herb
Date: 2007-08-06 21:43:34 + (Mon, 06 Aug 2007)
New Revision: 24255
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24255
Log:
fix crash when username not specified in net rpc info command
Modified:
branches/SAMBA_3_0_25/source/utils/net.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/utils/net.c
===
--- branches/SAMBA_3_0_25/source/utils/net.c2007-08-06 21:03:03 UTC (rev
24254)
+++ branches/SAMBA_3_0_25/source/utils/net.c2007-08-06 21:43:34 UTC (rev
24255)
@@ -999,6 +999,10 @@
opt_user_name = getenv(LOGNAME);
}
+ if (!opt_user_name) {
+ opt_user_name = ;
+ }
+
if (!opt_workgroup) {
opt_workgroup = smb_xstrdup(lp_workgroup());
}
svn commit: samba r23868 - in branches/SAMBA_3_0_25/source/script: .
Author: herb
Date: 2007-07-13 22:05:05 + (Fri, 13 Jul 2007)
New Revision: 23868
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23868
Log:
missing quotes
Modified:
branches/SAMBA_3_0_25/source/script/mkversion.sh
Changeset:
Modified: branches/SAMBA_3_0_25/source/script/mkversion.sh
===
--- branches/SAMBA_3_0_25/source/script/mkversion.sh2007-07-13 16:27:16 UTC
(rev 23867)
+++ branches/SAMBA_3_0_25/source/script/mkversion.sh2007-07-13 22:05:05 UTC
(rev 23868)
@@ -104,7 +104,7 @@
if test -n ${SAMBA_VERSION_VENDOR_SUFFIX};then
echo -n $0: with VENDOR_SUFFIX = \
echo -n ${SAMBA_VERSION_VENDOR_SUFFIX} | sed 's///g'
-if test -n ${SAMBA_VENDOR_PATCH}; then
+if test -n ${SAMBA_VENDOR_PATCH}; then
echo -n -${SAMBA_VENDOR_PATCH}
fi
echo \
svn commit: samba r23732 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include SAMBA_3_0_26/source/include
Author: herb Date: 2007-07-06 17:48:19 + (Fri, 06 Jul 2007) New Revision: 23732 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23732 Log: removed reference to non-existent structure Modified: branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0_25/source/include/includes.h branches/SAMBA_3_0_26/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2007-07-06 16:39:58 UTC (rev 23731) +++ branches/SAMBA_3_0/source/include/includes.h2007-07-06 17:48:19 UTC (rev 23732) @@ -755,8 +755,6 @@ struct printjob; -struct smb_ldap_privates; - /* forward declarations from smbldap.c */ #include smbldap.h Modified: branches/SAMBA_3_0_25/source/include/includes.h === --- branches/SAMBA_3_0_25/source/include/includes.h 2007-07-06 16:39:58 UTC (rev 23731) +++ branches/SAMBA_3_0_25/source/include/includes.h 2007-07-06 17:48:19 UTC (rev 23732) @@ -757,8 +757,6 @@ struct printjob; -struct smb_ldap_privates; - /* forward declarations from smbldap.c */ #include smbldap.h Modified: branches/SAMBA_3_0_26/source/include/includes.h === --- branches/SAMBA_3_0_26/source/include/includes.h 2007-07-06 16:39:58 UTC (rev 23731) +++ branches/SAMBA_3_0_26/source/include/includes.h 2007-07-06 17:48:19 UTC (rev 23732) @@ -757,8 +757,6 @@ struct printjob; -struct smb_ldap_privates; - /* forward declarations from smbldap.c */ #include smbldap.h
svn commit: samba r23083 - in branches/SAMBA_3_0_25/source/tdb/tools: .
Author: herb Date: 2007-05-22 21:52:34 + (Tue, 22 May 2007) New Revision: 23083 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23083 Log: fix structure to match smb.h - this is really bad having this defined in multiple places. Modified: branches/SAMBA_3_0_25/source/tdb/tools/tdbtool.c Changeset: Modified: branches/SAMBA_3_0_25/source/tdb/tools/tdbtool.c === --- branches/SAMBA_3_0_25/source/tdb/tools/tdbtool.c2007-05-22 21:17:31 UTC (rev 23082) +++ branches/SAMBA_3_0_25/source/tdb/tools/tdbtool.c2007-05-22 21:52:34 UTC (rev 23083) @@ -116,7 +116,7 @@ int cnum; uid_t uid; gid_t gid; - char name[24]; + char servicename[FSTRING_LEN]; char addr[24]; char machine[FSTRING_LEN]; time_t start; @@ -373,7 +373,7 @@ printf( \ndata %d bytes\n, (int)dbuf.dsize); printf( pid=%5d , ((connections_data*)dbuf.dptr)-pid); printf( cnum =%10d , ((connections_data*)dbuf.dptr)-cnum); - printf( name =[%s]\n, ((connections_data*)dbuf.dptr)-name); + printf( name =[%s]\n, ((connections_data*)dbuf.dptr)-servicename); printf( uid=%5d , ((connections_data*)dbuf.dptr)-uid); printf( addr =[%s]\n, ((connections_data*)dbuf.dptr)-addr);
svn commit: samba-docs r1102 - in trunk/manpages-3: .
Author: herb Date: 2007-04-20 19:11:33 + (Fri, 20 Apr 2007) New Revision: 1102 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1102 Log: update manpage for profiling-level option Modified: trunk/manpages-3/smbd.8.xml Changeset: Modified: trunk/manpages-3/smbd.8.xml === --- trunk/manpages-3/smbd.8.xml 2007-04-20 10:33:56 UTC (rev 1101) +++ trunk/manpages-3/smbd.8.xml 2007-04-20 19:11:33 UTC (rev 1102) @@ -26,6 +26,7 @@ arg choice=opt-d lt;debug levelgt;/arg arg choice=opt-l lt;log directorygt;/arg arg choice=opt-p lt;port number(s)gt;/arg + arg choice=opt-P lt;profiling levelgt;/arg arg choice=opt-O lt;socket optiongt;/arg arg choice=opt-s lt;configuration filegt;/arg /cmdsynopsis @@ -133,15 +134,23 @@ /varlistentry varlistentry - term-p lt;port number(s)gt;/term + term-p|--portlt;port number(s)gt;/term listitemparareplaceableport number(s)/replaceable is a space or comma-separated list of TCP ports smbd should listen on. The default value is taken from the smbconfoption name=ports/ parameter in smb.conf;/para paraThe default ports are 139 (used for SMB over NetBIOS over TCP) and port 445 (used for plain SMB over TCP). - /para/listitem + /para/listitem + /varlistentry + varlistentry + term-P|--profiling-levellt;profiling levelgt;/term + listitemparareplaceableprofiling level/replaceable is a + number specifying the level of profiling data to be collected. + 0 turns off profiling, 1 turns on counter profiling only, + 2 turns on complete profiling, and 3 resets all profiling data. + /para/listitem /varlistentry /variablelist /refsect1
svn commit: samba r22395 - in branches: SAMBA_3_0/source/profile SAMBA_3_0/source/smbd SAMBA_3_0_25/source/profile SAMBA_3_0_25/source/smbd
Author: herb
Date: 2007-04-20 01:52:44 + (Fri, 20 Apr 2007)
New Revision: 22395
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22395
Log:
allow profiling level to be set on startup
Modified:
branches/SAMBA_3_0/source/profile/profile.c
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0_25/source/profile/profile.c
branches/SAMBA_3_0_25/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_0/source/profile/profile.c
===
--- branches/SAMBA_3_0/source/profile/profile.c 2007-04-19 23:47:55 UTC (rev
22394)
+++ branches/SAMBA_3_0/source/profile/profile.c 2007-04-20 01:52:44 UTC (rev
22395)
@@ -42,14 +42,10 @@
BOOL do_profile_times = False;
/
-receive a set profile level message
+Set a profiling level.
/
-void profile_message(int msg_type, struct process_id src,
-void *buf, size_t len, void *private_data)
+void set_profile_level(int level, struct process_id src)
{
-int level;
-
- memcpy(level, buf, sizeof(int));
#ifdef WITH_PROFILE
switch (level) {
case 0: /* turn off profiling */
@@ -95,6 +91,17 @@
}
/
+receive a set profile level message
+/
+void profile_message(int msg_type, struct process_id src, void *buf, size_t
len, void *private_data)
+{
+int level;
+
+ memcpy(level, buf, sizeof(int));
+ set_profile_level(level, src);
+}
+
+/
receive a request profile level message
/
void reqprofile_message(int msg_type, struct process_id src,
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2007-04-19 23:47:55 UTC (rev
22394)
+++ branches/SAMBA_3_0/source/smbd/server.c 2007-04-20 01:52:44 UTC (rev
22395)
@@ -863,6 +863,7 @@
static BOOL no_process_group = False;
static BOOL log_stdout = False;
static char *ports = NULL;
+ static char *profile_level = NULL;
int opt;
poptContext pc;
@@ -875,6 +876,7 @@
{log-stdout, 'S', POPT_ARG_VAL, log_stdout, True, Log to stdout },
{build-options, 'b', POPT_ARG_NONE, NULL, 'b', Print build options
},
{port, 'p', POPT_ARG_STRING, ports, 0, Listen on the specified
ports},
+ {profiling-level, 'P', POPT_ARG_STRING, profile_level, 0, Set
profiling level,PROFILE_LEVEL},
POPT_COMMON_SAMBA
POPT_COMMON_DYNCONFIG
POPT_TABLEEND
@@ -997,6 +999,14 @@
DEBUG(0,(ERROR: failed to setup profiling\n));
return -1;
}
+ if (profile_level != NULL) {
+ int pl = atoi(profile_level);
+ struct process_id src;
+
+ DEBUG(1, (setting profiling level: %s\n,profile_level));
+ src.pid = getpid();
+ set_profile_level(pl, src);
+ }
#endif
DEBUG(3,( loaded services\n));
Modified: branches/SAMBA_3_0_25/source/profile/profile.c
===
--- branches/SAMBA_3_0_25/source/profile/profile.c 2007-04-19 23:47:55 UTC
(rev 22394)
+++ branches/SAMBA_3_0_25/source/profile/profile.c 2007-04-20 01:52:44 UTC
(rev 22395)
@@ -42,13 +42,10 @@
BOOL do_profile_times = False;
/
-receive a set profile level message
+Set a profiling level.
/
-void profile_message(int msg_type, struct process_id src, void *buf, size_t
len, void *private_data)
+void set_profile_level(int level, struct process_id src)
{
-int level;
-
- memcpy(level, buf, sizeof(int));
#ifdef WITH_PROFILE
switch (level) {
case 0: /* turn off profiling */
@@ -94,6 +91,17 @@
}
/
+receive a set profile level message
+/
+void profile_message(int msg_type, struct process_id src, void *buf, size_t
len, void *private_data)
+{
+int level;
+
+ memcpy(level, buf, sizeof(int));
+ set_profile_level(level, src);
+}
+
+/
receive a request profile level message
/
void reqprofile_message
svn commit: samba r22018 - in branches: SAMBA_3_0/source/nmbd SAMBA_3_0_25/source/nmbd
Author: herb
Date: 2007-03-31 03:11:02 + (Sat, 31 Mar 2007)
New Revision: 22018
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22018
Log:
fix compile error
Modified:
branches/SAMBA_3_0/source/nmbd/nmbd_incomingdgrams.c
branches/SAMBA_3_0_25/source/nmbd/nmbd_incomingdgrams.c
Changeset:
Modified: branches/SAMBA_3_0/source/nmbd/nmbd_incomingdgrams.c
===
--- branches/SAMBA_3_0/source/nmbd/nmbd_incomingdgrams.c2007-03-31
01:14:00 UTC (rev 22017)
+++ branches/SAMBA_3_0/source/nmbd/nmbd_incomingdgrams.c2007-03-31
03:11:02 UTC (rev 22018)
@@ -431,13 +431,13 @@
fstring comment;
char *s = get_safe_offset(buf,len,buf,9);
+ START_PROFILE(lm_host_announce);
if (!s) {
- return;
+ goto done;
}
- START_PROFILE(lm_host_announce);
s = skip_string(buf,len,s,1);
if (!s) {
- return;
+ goto done;
}
pull_ascii(comment, s, sizeof(fstring), 43, STR_TERMINATE);
Modified: branches/SAMBA_3_0_25/source/nmbd/nmbd_incomingdgrams.c
===
--- branches/SAMBA_3_0_25/source/nmbd/nmbd_incomingdgrams.c 2007-03-31
01:14:00 UTC (rev 22017)
+++ branches/SAMBA_3_0_25/source/nmbd/nmbd_incomingdgrams.c 2007-03-31
03:11:02 UTC (rev 22018)
@@ -431,13 +431,13 @@
fstring comment;
char *s = get_safe_offset(buf,len,buf,9);
+ START_PROFILE(lm_host_announce);
if (!s) {
- return;
+ goto done;
}
- START_PROFILE(lm_host_announce);
s = skip_string(buf,len,s,1);
if (!s) {
- return;
+ goto done;
}
pull_ascii(comment, s, sizeof(fstring), 43, STR_TERMINATE);
svn commit: samba r21957 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-03-23 23:10:46 + (Fri, 23 Mar 2007)
New Revision: 21957
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21957
Log:
minor formatting fix
Modified:
branches/SAMBA_3_0/source/nsswitch/wbinfo.c
branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c
===
--- branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-03-23 22:23:09 UTC (rev
21956)
+++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-03-23 23:10:46 UTC (rev
21957)
@@ -1417,7 +1417,7 @@
group %s\n, string_arg);
goto done;
}
-break;
+ break;
case 'r':
if (!wbinfo_get_usergroups(string_arg)) {
d_fprintf(stderr, Could not get groups for
user %s\n,
Modified: branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c 2007-03-23 22:23:09 UTC
(rev 21956)
+++ branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c 2007-03-23 23:10:46 UTC
(rev 21957)
@@ -1417,7 +1417,7 @@
group %s\n, string_arg);
goto done;
}
-break;
+ break;
case 'r':
if (!wbinfo_get_usergroups(string_arg)) {
d_fprintf(stderr, Could not get groups for
user %s\n,
svn commit: samba r21825 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/param SAMBA_3_0_25/source/lib SAMBA_3_0_25/source/param
Author: herb
Date: 2007-03-13 17:39:06 + (Tue, 13 Mar 2007)
New Revision: 21825
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21825
Log:
add debug prefix timestamp to allow short timestamps to be
added to debug messages
Modified:
branches/SAMBA_3_0/source/lib/debug.c
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_25/source/lib/debug.c
branches/SAMBA_3_0_25/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/debug.c
===
--- branches/SAMBA_3_0/source/lib/debug.c 2007-03-13 17:05:04 UTC (rev
21824)
+++ branches/SAMBA_3_0/source/lib/debug.c 2007-03-13 17:39:06 UTC (rev
21825)
@@ -962,7 +962,7 @@
/* Print the header if timestamps are turned on. If parameters are
* not yet loaded, then default to timestamps on.
*/
- if( lp_timestamp_logs() || !(lp_loaded()) ) {
+ if( lp_timestamp_logs() || lp_debug_prefix_timestamp() ||
!(lp_loaded()) ) {
char header_str[200];
header_str[0] = '\0';
@@ -980,9 +980,15 @@
}
/* Print it all out at once to prevent split syslog output. */
- (void)Debug1( [%s, %d%s] %s:%s(%d)\n,
+ if( lp_debug_prefix_timestamp() ) {
+ (void)Debug1( [%s, %d%s] ,
current_timestring(lp_debug_hires_timestamp()), level,
+ header_str);
+ } else {
+ (void)Debug1( [%s, %d%s] %s:%s(%d)\n,
+ current_timestring(lp_debug_hires_timestamp()), level,
header_str, file, func, line );
+ }
}
errno = old_errno;
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-03-13 17:05:04 UTC (rev
21824)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-03-13 17:39:06 UTC (rev
21825)
@@ -290,6 +290,7 @@
BOOL bClientNTLMv2Auth;
BOOL bClientPlaintextAuth;
BOOL bClientUseSpnego;
+ BOOL bDebugPrefixTimestamp;
BOOL bDebugHiresTimestamp;
BOOL bDebugPid;
BOOL bDebugUid;
@@ -952,6 +953,7 @@
{max log size, P_INTEGER, P_GLOBAL, Globals.max_log_size, NULL,
NULL, FLAG_ADVANCED},
{debug timestamp, P_BOOL, P_GLOBAL, Globals.bTimestampLogs, NULL,
NULL, FLAG_ADVANCED},
{timestamp logs, P_BOOL, P_GLOBAL, Globals.bTimestampLogs, NULL,
NULL, FLAG_ADVANCED},
+ {debug prefix timestamp, P_BOOL, P_GLOBAL,
Globals.bDebugPrefixTimestamp, NULL, NULL, FLAG_ADVANCED},
{debug hires timestamp, P_BOOL, P_GLOBAL,
Globals.bDebugHiresTimestamp, NULL, NULL, FLAG_ADVANCED},
{debug pid, P_BOOL, P_GLOBAL, Globals.bDebugPid, NULL, NULL,
FLAG_ADVANCED},
{debug uid, P_BOOL, P_GLOBAL, Globals.bDebugUid, NULL, NULL,
FLAG_ADVANCED},
@@ -1516,6 +1518,7 @@
Globals.bSyslogOnly = False;
Globals.bTimestampLogs = True;
string_set(Globals.szLogLevel, 0);
+ Globals.bDebugPrefixTimestamp = False;
Globals.bDebugHiresTimestamp = False;
Globals.bDebugPid = False;
Globals.bDebugUid = False;
@@ -1947,6 +1950,7 @@
FN_GLOBAL_INTEGER(lp_server_schannel, Globals.serverSchannel)
FN_GLOBAL_BOOL(lp_syslog_only, Globals.bSyslogOnly)
FN_GLOBAL_BOOL(lp_timestamp_logs, Globals.bTimestampLogs)
+FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, Globals.bDebugPrefixTimestamp)
FN_GLOBAL_BOOL(lp_debug_hires_timestamp, Globals.bDebugHiresTimestamp)
FN_GLOBAL_BOOL(lp_debug_pid, Globals.bDebugPid)
FN_GLOBAL_BOOL(lp_debug_uid, Globals.bDebugUid)
Modified: branches/SAMBA_3_0_25/source/lib/debug.c
===
--- branches/SAMBA_3_0_25/source/lib/debug.c2007-03-13 17:05:04 UTC (rev
21824)
+++ branches/SAMBA_3_0_25/source/lib/debug.c2007-03-13 17:39:06 UTC (rev
21825)
@@ -962,7 +962,7 @@
/* Print the header if timestamps are turned on. If parameters are
* not yet loaded, then default to timestamps on.
*/
- if( lp_timestamp_logs() || !(lp_loaded()) ) {
+ if( lp_timestamp_logs() || lp_debug_prefix_timestamp() ||
!(lp_loaded()) ) {
char header_str[200];
header_str[0] = '\0';
@@ -980,9 +980,15 @@
}
/* Print it all out at once to prevent split syslog output. */
- (void)Debug1( [%s, %d%s] %s:%s(%d)\n,
+ if( lp_debug_prefix_timestamp() ) {
+ (void)Debug1( [%s, %d%s] ,
current_timestring(lp_debug_hires_timestamp()), level,
+ header_str);
+ } else {
+ (void)Debug1( [%s, %d%s] %s:%s(%d)\n,
+ current_timestring(lp_debug_hires_timestamp
svn commit: samba-docs r1061 - in trunk/smbdotconf: logging printing
Author: herb Date: 2007-03-13 17:40:17 + (Tue, 13 Mar 2007) New Revision: 1061 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1061 Log: add documentation for debug prefix timestamp fix missing tag close in printjobusername Added: trunk/smbdotconf/logging/debugprefixtimestamp.xml Modified: trunk/smbdotconf/printing/printjobusername.xml Changeset: Added: trunk/smbdotconf/logging/debugprefixtimestamp.xml === --- trunk/smbdotconf/logging/debugprefixtimestamp.xml 2007-03-08 01:42:35 UTC (rev 1060) +++ trunk/smbdotconf/logging/debugprefixtimestamp.xml 2007-03-13 17:40:17 UTC (rev 1061) @@ -0,0 +1,19 @@ +samba:parameter name=debug prefix timestamp + context=G + developer=1 +type=boolean + xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; +description +para +With this option enabled, the timestamp message header is prefixed to the debug message without the +filename and function information that is included with the smbconfoption name=debug timestamp/ +parameter. This gives timestamps to the messages without adding an additional line. +/para + +para +Note that this parameter overrides the smbconfoption name=debug timestamp/ parameter. +/para + +/description +value type=defaultno/value +/samba:parameter Modified: trunk/smbdotconf/printing/printjobusername.xml === --- trunk/smbdotconf/printing/printjobusername.xml 2007-03-08 01:42:35 UTC (rev 1060) +++ trunk/smbdotconf/printing/printjobusername.xml 2007-03-13 17:40:17 UTC (rev 1061) @@ -3,11 +3,12 @@ type=string print=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; - description +description paraThis parameter specifies which user information will be passed to the printing system. Usually, the username is sent, but in some cases, e.g. the domain prefix is useful, too./para - +/description + relatedprinting/related value type=example%D\%U/value
svn commit: samba r21775 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-03-09 15:34:12 + (Fri, 09 Mar 2007)
New Revision: 21775
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21775
Log:
make messages more understandable - don't leave part dangling after newline
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_user.c 2007-03-09 11:34:24 UTC
(rev 21774)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_user.c 2007-03-09 15:34:12 UTC
(rev 21775)
@@ -262,7 +262,7 @@
talloc_get_type_abort(private_data, struct getpwsid_state);
if (!success) {
- DEBUG(5, (Could not query user's %s\\%s uid\n,
+ DEBUG(5, (Could not query uid for user %s\\%s\n,
s-domain-name, s-username));
request_error(s-state);
return;
@@ -289,7 +289,7 @@
if ( s-gid == (gid_t)-1 ) {
if (!success) {
- DEBUG(5, (Could not query user's %s\\%s\n gid,
+ DEBUG(5, (Could not query gid for user %s\\%s\n,
s-domain-name, s-username));
goto failed;
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c 2007-03-09
11:34:24 UTC (rev 21774)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c 2007-03-09
15:34:12 UTC (rev 21775)
@@ -262,7 +262,7 @@
talloc_get_type_abort(private_data, struct getpwsid_state);
if (!success) {
- DEBUG(5, (Could not query user's %s\\%s uid\n,
+ DEBUG(5, (Could not query uid for user %s\\%s\n,
s-domain-name, s-username));
request_error(s-state);
return;
@@ -289,7 +289,7 @@
if ( s-gid == (gid_t)-1 ) {
if (!success) {
- DEBUG(5, (Could not query user's %s\\%s\n gid,
+ DEBUG(5, (Could not query gid for user %s\\%s\n,
s-domain-name, s-username));
goto failed;
}
svn commit: samba r21780 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_25/source/utils
Author: herb
Date: 2007-03-09 19:48:50 + (Fri, 09 Mar 2007)
New Revision: 21780
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21780
Log:
let smbcontrol use POPT_COMMON_SAMBA options to allow setting debug
level. Fix calculation of argc after options are stripped. I couldn't
find a popt function that returned this.
Modified:
branches/SAMBA_3_0/source/utils/smbcontrol.c
branches/SAMBA_3_0_25/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_0/source/utils/smbcontrol.c2007-03-09 19:28:35 UTC
(rev 21779)
+++ branches/SAMBA_3_0/source/utils/smbcontrol.c2007-03-09 19:48:50 UTC
(rev 21780)
@@ -1145,25 +1145,15 @@
poptContext pc;
int opt;
- static struct poptOption wbinfo_options[] = {
+ static struct poptOption long_options[] = {
+ POPT_AUTOHELP
{ timeout, 't', POPT_ARG_INT, timeout, 't',
Set timeout value in seconds, TIMEOUT },
- { configfile, 's', POPT_ARG_STRING, NULL, 's',
- Use alternative configuration file, CONFIGFILE },
-
+ POPT_COMMON_SAMBA
POPT_TABLEEND
};
- struct poptOption options[] = {
- { NULL, 0, POPT_ARG_INCLUDE_TABLE, wbinfo_options, 0,
- Options },
-
- POPT_AUTOHELP
- POPT_COMMON_VERSION
- POPT_TABLEEND
- };
-
load_case_tables();
setup_logging(argv[0],True);
@@ -1171,7 +1161,7 @@
/* Parse command line arguments using popt */
pc = poptGetContext(
- smbcontrol, argc, (const char **)argv, options, 0);
+ smbcontrol, argc, (const char **)argv, long_options, 0);
poptSetOtherOptionHelp(pc, [OPTION...] destination message-type
parameters);
@@ -1182,12 +1172,7 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
case 't': /* --timeout */
- argc -= 2;
break;
- case 's': /* --configfile */
- pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
- argc -= 2;
- break;
default:
fprintf(stderr, Invalid option\n);
poptPrintHelp(pc, stderr, 0);
@@ -1200,7 +1185,10 @@
correct value in the above switch statement. */
argv = (const char **)poptGetArgs(pc);
- argc--; /* Don't forget about argv[0] */
+ argc = 0;
+ while (argv[argc] != NULL) {
+ argc++;
+ }
if (argc == 1)
usage(pc);
Modified: branches/SAMBA_3_0_25/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_0_25/source/utils/smbcontrol.c 2007-03-09 19:28:35 UTC
(rev 21779)
+++ branches/SAMBA_3_0_25/source/utils/smbcontrol.c 2007-03-09 19:48:50 UTC
(rev 21780)
@@ -1145,25 +1145,15 @@
poptContext pc;
int opt;
- static struct poptOption wbinfo_options[] = {
+ static struct poptOption long_options[] = {
+ POPT_AUTOHELP
{ timeout, 't', POPT_ARG_INT, timeout, 't',
Set timeout value in seconds, TIMEOUT },
- { configfile, 's', POPT_ARG_STRING, NULL, 's',
- Use alternative configuration file, CONFIGFILE },
-
+ POPT_COMMON_SAMBA
POPT_TABLEEND
};
- struct poptOption options[] = {
- { NULL, 0, POPT_ARG_INCLUDE_TABLE, wbinfo_options, 0,
- Options },
-
- POPT_AUTOHELP
- POPT_COMMON_VERSION
- POPT_TABLEEND
- };
-
load_case_tables();
setup_logging(argv[0],True);
@@ -1171,7 +1161,7 @@
/* Parse command line arguments using popt */
pc = poptGetContext(
- smbcontrol, argc, (const char **)argv, options, 0);
+ smbcontrol, argc, (const char **)argv, long_options, 0);
poptSetOtherOptionHelp(pc, [OPTION...] destination message-type
parameters);
@@ -1182,12 +1172,7 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
case 't': /* --timeout */
- argc -= 2;
break;
- case 's': /* --configfile */
- pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
- argc -= 2;
- break;
default:
fprintf(stderr, Invalid option\n);
poptPrintHelp(pc, stderr, 0);
@@ -1200,7 +1185,10
svn commit: samba r21704 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-03-05 18:20:36 + (Mon, 05 Mar 2007)
New Revision: 21704
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21704
Log:
open sockets immediately in process_loop
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c 2007-03-05 17:02:20 UTC
(rev 21703)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c 2007-03-05 18:20:36 UTC
(rev 21704)
@@ -726,6 +726,15 @@
int maxfd, listen_sock, listen_priv_sock, selret;
struct timeval timeout, ev_timeout;
+ /* Open Sockets here to get stuff going ASAP */
+ listen_sock = open_winbindd_socket();
+ listen_priv_sock = open_winbindd_priv_socket();
+
+ if (listen_sock == -1 || listen_priv_sock == -1) {
+ perror(open_winbind_socket);
+ exit(1);
+ }
+
/* We'll be doing this a lot */
/* Handle messages */
@@ -745,14 +754,6 @@
/* Initialise fd lists for select() */
- listen_sock = open_winbindd_socket();
- listen_priv_sock = open_winbindd_priv_socket();
-
- if (listen_sock == -1 || listen_priv_sock == -1) {
- perror(open_winbind_socket);
- exit(1);
- }
-
maxfd = MAX(listen_sock, listen_priv_sock);
FD_ZERO(r_fds);
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd.c2007-03-05 17:02:20 UTC
(rev 21703)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd.c2007-03-05 18:20:36 UTC
(rev 21704)
@@ -726,6 +726,15 @@
int maxfd, listen_sock, listen_priv_sock, selret;
struct timeval timeout, ev_timeout;
+ /* Open Sockets here to get stuff going ASAP */
+ listen_sock = open_winbindd_socket();
+ listen_priv_sock = open_winbindd_priv_socket();
+
+ if (listen_sock == -1 || listen_priv_sock == -1) {
+ perror(open_winbind_socket);
+ exit(1);
+ }
+
/* We'll be doing this a lot */
/* Handle messages */
@@ -745,14 +754,6 @@
/* Initialise fd lists for select() */
- listen_sock = open_winbindd_socket();
- listen_priv_sock = open_winbindd_priv_socket();
-
- if (listen_sock == -1 || listen_priv_sock == -1) {
- perror(open_winbind_socket);
- exit(1);
- }
-
maxfd = MAX(listen_sock, listen_priv_sock);
FD_ZERO(r_fds);
svn commit: samba r21705 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include
Author: herb Date: 2007-03-05 18:27:20 + (Mon, 05 Mar 2007) New Revision: 21705 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21705 Log: add modify rights defines Modified: branches/SAMBA_3_0/source/include/rpc_secdes.h branches/SAMBA_3_0_25/source/include/rpc_secdes.h Changeset: Modified: branches/SAMBA_3_0/source/include/rpc_secdes.h === --- branches/SAMBA_3_0/source/include/rpc_secdes.h 2007-03-05 18:20:36 UTC (rev 21704) +++ branches/SAMBA_3_0/source/include/rpc_secdes.h 2007-03-05 18:27:20 UTC (rev 21705) @@ -152,6 +152,7 @@ /* Combinations of standard masks. */ #define STANDARD_RIGHTS_ALL_ACCESS STD_RIGHT_ALL_ACCESS /* 0x001f */ +#define STANDARD_RIGHTS_MODIFY_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_EXECUTE_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_READ_ACCESSSTD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_WRITE_ACCESS \ @@ -200,10 +201,23 @@ #define GENERIC_RIGHTS_FILE_EXECUTE \ (STANDARD_RIGHTS_EXECUTE_ACCESS | \ + STD_RIGHT_SYNCHRONIZE_ACCESS| \ SA_RIGHT_FILE_READ_ATTRIBUTES | \ SA_RIGHT_FILE_EXECUTE) - +#define GENERIC_RIGHTS_FILE_MODIFY \ + (STANDARD_RIGHTS_MODIFY_ACCESS | \ + STD_RIGHT_SYNCHRONIZE_ACCESS| \ + STD_RIGHT_DELETE_ACCESS | \ + SA_RIGHT_FILE_WRITE_ATTRIBUTES | \ + SA_RIGHT_FILE_READ_ATTRIBUTES | \ + SA_RIGHT_FILE_EXECUTE | \ + SA_RIGHT_FILE_WRITE_EA | \ + SA_RIGHT_FILE_READ_EA | \ + SA_RIGHT_FILE_APPEND_DATA | \ + SA_RIGHT_FILE_WRITE_DATA| \ + SA_RIGHT_FILE_READ_DATA) + /* SAM server specific access rights */ #define SA_RIGHT_SAM_CONNECT_SERVER0x0001 Modified: branches/SAMBA_3_0_25/source/include/rpc_secdes.h === --- branches/SAMBA_3_0_25/source/include/rpc_secdes.h 2007-03-05 18:20:36 UTC (rev 21704) +++ branches/SAMBA_3_0_25/source/include/rpc_secdes.h 2007-03-05 18:27:20 UTC (rev 21705) @@ -195,6 +195,7 @@ /* Combinations of standard masks. */ #define STANDARD_RIGHTS_ALL_ACCESS STD_RIGHT_ALL_ACCESS /* 0x001f */ +#define STANDARD_RIGHTS_MODIFY_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_EXECUTE_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_READ_ACCESSSTD_RIGHT_READ_CONTROL_ACCESS /* 0x0002 */ #define STANDARD_RIGHTS_WRITE_ACCESS \ @@ -243,10 +244,23 @@ #define GENERIC_RIGHTS_FILE_EXECUTE \ (STANDARD_RIGHTS_EXECUTE_ACCESS | \ + STD_RIGHT_SYNCHRONIZE_ACCESS| \ SA_RIGHT_FILE_READ_ATTRIBUTES | \ SA_RIGHT_FILE_EXECUTE) - +#define GENERIC_RIGHTS_FILE_MODIFY \ + (STANDARD_RIGHTS_MODIFY_ACCESS | \ + STD_RIGHT_SYNCHRONIZE_ACCESS| \ + STD_RIGHT_DELETE_ACCESS | \ + SA_RIGHT_FILE_WRITE_ATTRIBUTES | \ + SA_RIGHT_FILE_READ_ATTRIBUTES | \ + SA_RIGHT_FILE_EXECUTE | \ + SA_RIGHT_FILE_WRITE_EA | \ + SA_RIGHT_FILE_READ_EA | \ + SA_RIGHT_FILE_APPEND_DATA | \ + SA_RIGHT_FILE_WRITE_DATA| \ + SA_RIGHT_FILE_READ_DATA) + /* SAM server specific access rights */ #define SA_RIGHT_SAM_CONNECT_SERVER0x0001
svn commit: samba r21657 - in branches: SAMBA_3_0/source/client SAMBA_3_0_25/source/client
Author: herb
Date: 2007-03-02 15:08:09 + (Fri, 02 Mar 2007)
New Revision: 21657
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21657
Log:
get rid of warning - not everyone understands %F
Modified:
branches/SAMBA_3_0/source/client/client.c
branches/SAMBA_3_0_25/source/client/client.c
Changeset:
Modified: branches/SAMBA_3_0/source/client/client.c
===
--- branches/SAMBA_3_0/source/client/client.c 2007-03-02 14:53:09 UTC (rev
21656)
+++ branches/SAMBA_3_0/source/client/client.c 2007-03-02 15:08:09 UTC (rev
21657)
@@ -2526,7 +2526,7 @@
lt = localtime(sbuf.st_atime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
@@ -2534,7 +2534,7 @@
lt = localtime(sbuf.st_mtime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
@@ -2542,7 +2542,7 @@
lt = localtime(sbuf.st_ctime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
Modified: branches/SAMBA_3_0_25/source/client/client.c
===
--- branches/SAMBA_3_0_25/source/client/client.c2007-03-02 14:53:09 UTC
(rev 21656)
+++ branches/SAMBA_3_0_25/source/client/client.c2007-03-02 15:08:09 UTC
(rev 21657)
@@ -2557,7 +2557,7 @@
lt = localtime(sbuf.st_atime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
@@ -2565,7 +2565,7 @@
lt = localtime(sbuf.st_mtime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
@@ -2573,7 +2573,7 @@
lt = localtime(sbuf.st_ctime);
if (lt) {
- strftime(mode_str, sizeof(mode_str), %F %T %z, lt);
+ strftime(mode_str, sizeof(mode_str), %Y-%m-%d %T %z, lt);
} else {
fstrcpy(mode_str, unknown);
}
svn commit: samba r21546 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source
Author: herb Date: 2007-02-26 17:43:45 + (Mon, 26 Feb 2007) New Revision: 21546 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21546 Log: remove duplicate lines Modified: branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0_25/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2007-02-26 17:43:01 UTC (rev 21545) +++ branches/SAMBA_3_0/source/configure.in 2007-02-26 17:43:45 UTC (rev 21546) @@ -5865,9 +5865,6 @@ MODULE_idmap_passdb=STATIC MODULE_idmap_nss=STATIC -MODULE_idmap_passdb=STATIC -MODULE_idmap_nss=STATIC - MODULE_nss_info_template=STATIC AC_ARG_WITH(static-modules, Modified: branches/SAMBA_3_0_25/source/configure.in === --- branches/SAMBA_3_0_25/source/configure.in 2007-02-26 17:43:01 UTC (rev 21545) +++ branches/SAMBA_3_0_25/source/configure.in 2007-02-26 17:43:45 UTC (rev 21546) @@ -5849,9 +5849,6 @@ MODULE_idmap_passdb=STATIC MODULE_idmap_nss=STATIC -MODULE_idmap_passdb=STATIC -MODULE_idmap_nss=STATIC - MODULE_nss_info_template=STATIC AC_ARG_WITH(static-modules,
svn commit: samba r21548 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-02-26 22:19:23 + (Mon, 26 Feb 2007)
New Revision: 21548
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21548
Log:
prevent segv (reference to -1 element of array)
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap.c
branches/SAMBA_3_0_25/source/nsswitch/idmap.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap.c 2007-02-26 20:14:35 UTC (rev
21547)
+++ branches/SAMBA_3_0/source/nsswitch/idmap.c 2007-02-26 22:19:23 UTC (rev
21548)
@@ -497,7 +497,8 @@
/ finished adding idmap_passdb backend /
/* sort domains so that the default is the last one */
- if (def_dom_num != num_domains-1) { /* default is not last, move it */
+ /* don't sort if no default domain defined */
+ if (def_dom_num != -1 def_dom_num != num_domains-1) { /* default is
not last, move it */
struct idmap_domain *tmp;
if (pdb_dom_num def_dom_num) {
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-02-26 20:14:35 UTC
(rev 21547)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-02-26 22:19:23 UTC
(rev 21548)
@@ -497,7 +497,8 @@
/ finished adding idmap_passdb backend /
/* sort domains so that the default is the last one */
- if (def_dom_num != num_domains-1) { /* default is not last, move it */
+ /* don't sort if no default domain defined */
+ if (def_dom_num != -1 def_dom_num != num_domains-1) { /* default is
not last, move it */
struct idmap_domain *tmp;
if (pdb_dom_num def_dom_num) {
svn commit: samba r21396 - in branches: SAMBA_3_0/source SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-02-16 19:49:12 + (Fri, 16 Feb 2007)
New Revision: 21396
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21396
Log:
fix wbinfo --lookup-rids command
allow detection of libbiconv if all others fail - need for FreeBSD
Modified:
branches/SAMBA_3_0/source/aclocal.m4
branches/SAMBA_3_0/source/nsswitch/wb_common.c
branches/SAMBA_3_0/source/nsswitch/wbinfo.c
branches/SAMBA_3_0_25/source/aclocal.m4
branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c
Changeset:
Modified: branches/SAMBA_3_0/source/aclocal.m4
===
--- branches/SAMBA_3_0/source/aclocal.m42007-02-16 17:36:58 UTC (rev
21395)
+++ branches/SAMBA_3_0/source/aclocal.m42007-02-16 19:49:12 UTC (rev
21396)
@@ -362,6 +362,23 @@
jm_cv_func_iconv=yes
jm_cv_lib_iconv=iconv)
LIBS=$jm_save_LIBS
+
+ if test $jm_cv_lib_iconv != yes; then
+jm_save_LIBS=$LIBS
+LIBS=$LIBS -lbiconv
+AC_TRY_LINK([#include stdlib.h
+#include biconv.h],
+ [iconv_t cd = iconv_open(,);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ jm_cv_lib_iconv=yes
+ jm_cv_func_iconv=yes
+ jm_cv_include=biconv.h
+ jm_cv_biconv=yes
+ jm_cv_lib_iconv=biconv)
+
+LIBS=$jm_save_LIBS
+ fi
fi
fi
fi
Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-16 17:36:58 UTC
(rev 21395)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-16 19:49:12 UTC
(rev 21396)
@@ -504,7 +504,7 @@
/* Mallocate memory for extra data */
- if (!(response-extra_data.data = malloc(extra_data_len))) {
+ if (!(response-extra_data.data = SMB_MALLOC(extra_data_len))) {
return -1;
}
Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c
===
--- branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-02-16 17:36:58 UTC (rev
21395)
+++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-02-16 19:49:12 UTC (rev
21396)
@@ -638,7 +638,7 @@
/* Lookup a list of RIDs */
-static BOOL wbinfo_lookuprids(char *domain_sid, char *arg)
+static BOOL wbinfo_lookuprids(char *domain, char *arg)
{
size_t i;
DOM_SID sid;
@@ -650,12 +650,27 @@
enum lsa_SidType *types;
const char *domain_name;
TALLOC_CTX *mem_ctx;
+ struct winbindd_request request;
+ struct winbindd_response response;
- if (!string_to_sid(sid, domain_sid)) {
- d_printf(Could not convert %s to sid\n, domain_sid);
+ if ((domain == NULL) || (strequal(domain, .)) || (domain[0] == '\0'))
+ fstrcpy(request.domain_name, get_winbind_domain());
+ else
+ fstrcpy(request.domain_name, domain);
+
+ /* Send request */
+
+ if (winbindd_request_response(WINBINDD_DOMAIN_INFO, request,
response) !=
+ NSS_STATUS_SUCCESS) {
+ d_printf(Could not get domain sid for %s\n,
request.domain_name);
return False;
}
+ if (!string_to_sid(sid, response.data.domain_info.sid)) {
+ d_printf(Could not convert %s to sid\n,
response.data.domain_info.sid);
+ return False;
+ }
+
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {
d_printf(talloc_new failed\n);
Modified: branches/SAMBA_3_0_25/source/aclocal.m4
===
--- branches/SAMBA_3_0_25/source/aclocal.m4 2007-02-16 17:36:58 UTC (rev
21395)
+++ branches/SAMBA_3_0_25/source/aclocal.m4 2007-02-16 19:49:12 UTC (rev
21396)
@@ -362,6 +362,23 @@
jm_cv_func_iconv=yes
jm_cv_lib_iconv=iconv)
LIBS=$jm_save_LIBS
+
+ if test $jm_cv_lib_iconv != yes; then
+jm_save_LIBS=$LIBS
+LIBS=$LIBS -lbiconv
+AC_TRY_LINK([#include stdlib.h
+#include biconv.h],
+ [iconv_t cd = iconv_open(,);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ jm_cv_lib_iconv=yes
+ jm_cv_func_iconv=yes
+ jm_cv_include=biconv.h
+ jm_cv_biconv=yes
+ jm_cv_lib_iconv=biconv)
+
+LIBS=$jm_save_LIBS
+ fi
fi
fi
fi
Modified: branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-02-16 17:36:58 UTC
svn commit: samba r21397 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-02-16 20:02:13 + (Fri, 16 Feb 2007)
New Revision: 21397
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21397
Log:
revert accidential commit
Modified:
branches/SAMBA_3_0/source/nsswitch/wb_common.c
branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-16 19:49:12 UTC
(rev 21396)
+++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-16 20:02:13 UTC
(rev 21397)
@@ -504,7 +504,7 @@
/* Mallocate memory for extra data */
- if (!(response-extra_data.data = SMB_MALLOC(extra_data_len))) {
+ if (!(response-extra_data.data = malloc(extra_data_len))) {
return -1;
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-02-16 19:49:12 UTC
(rev 21396)
+++ branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-02-16 20:02:13 UTC
(rev 21397)
@@ -504,7 +504,7 @@
/* Mallocate memory for extra data */
- if (!(response-extra_data.data = SMB_MALLOC(extra_data_len))) {
+ if (!(response-extra_data.data = malloc(extra_data_len))) {
return -1;
}
svn commit: samba r21398 - in branches/SAMBA_3_0_25/source/utils: .
Author: herb Date: 2007-02-16 20:07:33 + (Fri, 16 Feb 2007) New Revision: 21398 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21398 Log: update sharesec to allow add modify and remove commands Modified: branches/SAMBA_3_0_25/source/utils/sharesec.c Changeset: Sorry, the patch is too large (588 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21398
svn commit: samba r21399 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb Date: 2007-02-16 20:27:30 + (Fri, 16 Feb 2007) New Revision: 21399 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21399 Log: need to zero the request and response structures Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c === --- branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-02-16 20:07:33 UTC (rev 21398) +++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c 2007-02-16 20:27:30 UTC (rev 21399) @@ -653,6 +653,9 @@ struct winbindd_request request; struct winbindd_response response; + ZERO_STRUCT(request); + ZERO_STRUCT(response); + if ((domain == NULL) || (strequal(domain, .)) || (domain[0] == '\0')) fstrcpy(request.domain_name, get_winbind_domain()); else Modified: branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c === --- branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c 2007-02-16 20:07:33 UTC (rev 21398) +++ branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c 2007-02-16 20:27:30 UTC (rev 21399) @@ -653,6 +653,9 @@ struct winbindd_request request; struct winbindd_response response; + ZERO_STRUCT(request); + ZERO_STRUCT(response); + if ((domain == NULL) || (strequal(domain, .)) || (domain[0] == '\0')) fstrcpy(request.domain_name, get_winbind_domain()); else
svn commit: samba r21231 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb Date: 2007-02-08 02:17:29 + (Thu, 08 Feb 2007) New Revision: 21231 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21231 Log: get rid of unused defines that cause a redefined warning Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c branches/SAMBA_3_0_25/source/nsswitch/wb_common.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c === --- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-08 00:58:17 UTC (rev 21230) +++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2007-02-08 02:17:29 UTC (rev 21231) @@ -75,8 +75,6 @@ } #define CONNECT_TIMEOUT 30 -#define WRITE_TIMEOUT CONNECT_TIMEOUT -#define READ_TIMEOUT CONNECT_TIMEOUT /* Make sure socket handle isn't stdin, stdout or stderr */ #define RECURSION_LIMIT 3 Modified: branches/SAMBA_3_0_25/source/nsswitch/wb_common.c === --- branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-02-08 00:58:17 UTC (rev 21230) +++ branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-02-08 02:17:29 UTC (rev 21231) @@ -75,8 +75,6 @@ } #define CONNECT_TIMEOUT 30 -#define WRITE_TIMEOUT CONNECT_TIMEOUT -#define READ_TIMEOUT CONNECT_TIMEOUT /* Make sure socket handle isn't stdin, stdout or stderr */ #define RECURSION_LIMIT 3
svn commit: samba r21002 - in branches/SAMBA_3_0/source: include smbd
Author: herb
Date: 2007-01-24 14:53:03 + (Wed, 24 Jan 2007)
New Revision: 21002
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21002
Log:
Get rid of unused macros - merge change from 3_0_24
Modified:
branches/SAMBA_3_0/source/include/smbprofile.h
branches/SAMBA_3_0/source/smbd/nttrans.c
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/smbprofile.h
===
--- branches/SAMBA_3_0/source/include/smbprofile.h 2007-01-24 14:39:46 UTC
(rev 21001)
+++ branches/SAMBA_3_0/source/include/smbprofile.h 2007-01-24 14:53:03 UTC
(rev 21002)
@@ -757,10 +757,6 @@
extern struct profile_header *profile_h;
extern struct profile_stats *profile_p;
-extern struct timeval profile_starttime;
-extern struct timeval profile_endtime;
-extern struct timeval profile_starttime_nested;
-extern struct timeval profile_endtime_nested;
extern BOOL do_profile_flag;
extern BOOL do_profile_times;
@@ -846,8 +842,6 @@
profile_timestamp() - __profstamp_##x); \
}
-#define START_PROFILE_NESTED(x) START_PROFILE(x)
-#define END_PROFILE_NESTED(x) END_PROFILE(x)
#else /* WITH_PROFILE */
@@ -856,10 +850,8 @@
#define DO_PROFILE_DEC_INC(x,y)
#define DO_PROFILE_ADD(x,n)
#define START_PROFILE(x)
-#define START_PROFILE_NESTED(x)
#define START_PROFILE_BYTES(x,n)
#define END_PROFILE(x)
-#define END_PROFILE_NESTED(x)
#endif /* WITH_PROFILE */
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-01-24 14:39:46 UTC (rev
21001)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-01-24 14:53:03 UTC (rev
21002)
@@ -2744,44 +2744,44 @@
switch(state-call) {
case NT_TRANSACT_CREATE:
{
- START_PROFILE_NESTED(NT_transact_create);
+ START_PROFILE(NT_transact_create);
outsize = call_nt_transact_create(conn, inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data,
state-max_data_return);
- END_PROFILE_NESTED(NT_transact_create);
+ END_PROFILE(NT_transact_create);
break;
}
case NT_TRANSACT_IOCTL:
{
- START_PROFILE_NESTED(NT_transact_ioctl);
+ START_PROFILE(NT_transact_ioctl);
outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data, state-max_data_return);
- END_PROFILE_NESTED(NT_transact_ioctl);
+ END_PROFILE(NT_transact_ioctl);
break;
}
case NT_TRANSACT_SET_SECURITY_DESC:
{
- START_PROFILE_NESTED(NT_transact_set_security_desc);
+ START_PROFILE(NT_transact_set_security_desc);
outsize = call_nt_transact_set_security_desc(conn,
inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data, state-max_data_return);
- END_PROFILE_NESTED(NT_transact_set_security_desc);
+ END_PROFILE(NT_transact_set_security_desc);
break;
}
case NT_TRANSACT_NOTIFY_CHANGE:
{
- START_PROFILE_NESTED(NT_transact_notify_change);
+ START_PROFILE(NT_transact_notify_change);
outsize = call_nt_transact_notify_change(
conn, inbuf, outbuf, size, bufsize,
state-setup, state-setup_count,
@@ -2789,56 +2789,56 @@
state-data, state-total_data,
state-max_data_return,
state-max_param_return
svn commit: samba r21006 - in branches/SAMBA_3_0_24/source: .
Author: herb Date: 2007-01-24 19:51:09 + (Wed, 24 Jan 2007) New Revision: 21006 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21006 Log: move $(SOCKET_WRAPPER_OBJ) to OBJ definition instead of link line like all other uses Modified: branches/SAMBA_3_0_24/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_24/source/Makefile.in === --- branches/SAMBA_3_0_24/source/Makefile.in2007-01-24 16:15:29 UTC (rev 21005) +++ branches/SAMBA_3_0_24/source/Makefile.in2007-01-24 19:51:09 UTC (rev 21006) @@ -824,11 +824,13 @@ iniparser/src/strlib.o TDBBACKUP_OBJ = tdb/tools/tdbbackup.o tdb/common/tdbback.o $(LIBREPLACE_OBJ) \ - $(TDBBASE_OBJ) + $(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ) -TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) +TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ + $(SOCKET_WRAPPER_OBJ) -TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) +TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ + $(SOCKET_WRAPPER_OBJ) NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o @@ -1541,15 +1543,15 @@ bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ) bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ) bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud
svn commit: samba r21007 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2007-01-24 19:53:58 + (Wed, 24 Jan 2007) New Revision: 21007 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21007 Log: move $(SOCKET_WRAPPER_OBJ) to OBJ definition instead of link line like all other uses - merge from 3_0_24 Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-01-24 19:51:09 UTC (rev 21006) +++ branches/SAMBA_3_0/source/Makefile.in 2007-01-24 19:53:58 UTC (rev 21007) @@ -843,11 +843,13 @@ iniparser/src/strlib.o TDBBACKUP_OBJ = tdb/tools/tdbbackup.o tdb/common/tdbback.o $(LIBREPLACE_OBJ) \ - $(TDBBASE_OBJ) + $(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ) -TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) +TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ + $(SOCKET_WRAPPER_OBJ) -TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) +TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \ + $(SOCKET_WRAPPER_OBJ) NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o @@ -1579,15 +1581,15 @@ bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ) bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ) $(SOCKET_WRAPPER_OBJ) + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ) bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud
svn commit: samba r20995 - in branches/SAMBA_3_0_24/source: include smbd
Author: herb
Date: 2007-01-24 06:30:58 + (Wed, 24 Jan 2007)
New Revision: 20995
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20995
Log:
Get rid of unused macros
Modified:
branches/SAMBA_3_0_24/source/include/smbprofile.h
branches/SAMBA_3_0_24/source/smbd/nttrans.c
branches/SAMBA_3_0_24/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/include/smbprofile.h
===
--- branches/SAMBA_3_0_24/source/include/smbprofile.h 2007-01-24 05:03:15 UTC
(rev 20994)
+++ branches/SAMBA_3_0_24/source/include/smbprofile.h 2007-01-24 06:30:58 UTC
(rev 20995)
@@ -757,10 +757,6 @@
extern struct profile_header *profile_h;
extern struct profile_stats *profile_p;
-extern struct timeval profile_starttime;
-extern struct timeval profile_endtime;
-extern struct timeval profile_starttime_nested;
-extern struct timeval profile_endtime_nested;
extern BOOL do_profile_flag;
extern BOOL do_profile_times;
@@ -846,8 +842,6 @@
profile_timestamp() - __profstamp_##x); \
}
-#define START_PROFILE_NESTED(x) START_PROFILE(x)
-#define END_PROFILE_NESTED(x) END_PROFILE(x)
#else /* WITH_PROFILE */
@@ -856,10 +850,8 @@
#define DO_PROFILE_DEC_INC(x,y)
#define DO_PROFILE_ADD(x,n)
#define START_PROFILE(x)
-#define START_PROFILE_NESTED(x)
#define START_PROFILE_BYTES(x,n)
#define END_PROFILE(x)
-#define END_PROFILE_NESTED(x)
#endif /* WITH_PROFILE */
Modified: branches/SAMBA_3_0_24/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_24/source/smbd/nttrans.c 2007-01-24 05:03:15 UTC (rev
20994)
+++ branches/SAMBA_3_0_24/source/smbd/nttrans.c 2007-01-24 06:30:58 UTC (rev
20995)
@@ -2715,44 +2715,44 @@
switch(state-call) {
case NT_TRANSACT_CREATE:
{
- START_PROFILE_NESTED(NT_transact_create);
+ START_PROFILE(NT_transact_create);
outsize = call_nt_transact_create(conn, inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data,
state-max_data_return);
- END_PROFILE_NESTED(NT_transact_create);
+ END_PROFILE(NT_transact_create);
break;
}
case NT_TRANSACT_IOCTL:
{
- START_PROFILE_NESTED(NT_transact_ioctl);
+ START_PROFILE(NT_transact_ioctl);
outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data, state-max_data_return);
- END_PROFILE_NESTED(NT_transact_ioctl);
+ END_PROFILE(NT_transact_ioctl);
break;
}
case NT_TRANSACT_SET_SECURITY_DESC:
{
- START_PROFILE_NESTED(NT_transact_set_security_desc);
+ START_PROFILE(NT_transact_set_security_desc);
outsize = call_nt_transact_set_security_desc(conn,
inbuf, outbuf,
size, bufsize,
state-setup,
state-setup_count,
state-param,
state-total_param,
state-data,
state-total_data, state-max_data_return);
- END_PROFILE_NESTED(NT_transact_set_security_desc);
+ END_PROFILE(NT_transact_set_security_desc);
break;
}
case NT_TRANSACT_NOTIFY_CHANGE:
{
- START_PROFILE_NESTED(NT_transact_notify_change);
+ START_PROFILE(NT_transact_notify_change);
outsize = call_nt_transact_notify_change(
conn, inbuf, outbuf, size, bufsize,
state-setup, state-setup_count,
@@ -2760,56 +2760,56 @@
state-data, state-total_data,
state-max_data_return,
state-max_param_return
svn commit: samba r20324 - in branches/SAMBA_3_0_24/source: .
Author: herb Date: 2006-12-22 18:30:36 + (Fri, 22 Dec 2006) New Revision: 20324 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20324 Log: since smbwrapper is no longer around, remove unused variables Modified: branches/SAMBA_3_0_24/source/Makefile.in branches/SAMBA_3_0_24/source/configure.in Changeset: Modified: branches/SAMBA_3_0_24/source/Makefile.in === --- branches/SAMBA_3_0_24/source/Makefile.in2006-12-22 18:22:40 UTC (rev 20323) +++ branches/SAMBA_3_0_24/source/Makefile.in2006-12-22 18:30:36 UTC (rev 20324) @@ -122,7 +122,7 @@ LIBADDNS_MAJOR=0 LIBADDNS_MINOR=1 -FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ @SMBWRAP_INC@ $(CPPFLAGS) +FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) FLAGS2 = FLAGS3 = FLAGS4 = @@ -721,7 +721,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \ $(SMBD_OBJ_SRV) $(NMBD_OBJ1) $(LIBSMB_OBJ) \ $(SMBTORTURE_OBJ1) $(RPCCLIENT_OBJ1) \ - $(LIBMSRPC_OBJ) @SMBWRAP_OBJS@ \ + $(LIBMSRPC_OBJ) \ $(LIB_WITH_PROTO_OBJ) \ $(RPC_PIPE_OBJ) $(RPC_PARSE_OBJ) $(KRBCLIENT_OBJ) \ $(AUTH_OBJ) $(PARAM_OBJ) $(LOCKING_OBJ) $(SECRETS_OBJ) \ Modified: branches/SAMBA_3_0_24/source/configure.in === --- branches/SAMBA_3_0_24/source/configure.in 2006-12-22 18:22:40 UTC (rev 20323) +++ branches/SAMBA_3_0_24/source/configure.in 2006-12-22 18:30:36 UTC (rev 20324) @@ -297,9 +297,6 @@ AC_SUBST(PAM_MODULES) AC_SUBST(INSTALL_PAM_MODULES) AC_SUBST(UNINSTALL_PAM_MODULES) -AC_SUBST(SMBWRAPPER) -AC_SUBST(SMBWRAP_OBJS) -AC_SUBST(SMBWRAP_INC) AC_SUBST(EXTRA_BIN_PROGS) AC_SUBST(CIFSMOUNT_PROGS) AC_SUBST(INSTALL_CIFSMOUNT)
svn commit: samba r20260 - in branches/SAMBA_3_0_24/source: client lib/replace/test modules nsswitch param torture utils
Author: herb Date: 2006-12-19 20:12:04 + (Tue, 19 Dec 2006) New Revision: 20260 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20260 Log: clean up a bunch of no previous prototype warnings Modified: branches/SAMBA_3_0_24/source/client/umount.cifs.c branches/SAMBA_3_0_24/source/lib/replace/test/os2_delete.c branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c branches/SAMBA_3_0_24/source/modules/vfs_afsacl.c branches/SAMBA_3_0_24/source/modules/vfs_aixacl.c branches/SAMBA_3_0_24/source/modules/vfs_aixacl2.c branches/SAMBA_3_0_24/source/modules/vfs_audit.c branches/SAMBA_3_0_24/source/modules/vfs_cacheprime.c branches/SAMBA_3_0_24/source/modules/vfs_cap.c branches/SAMBA_3_0_24/source/modules/vfs_catia.c branches/SAMBA_3_0_24/source/modules/vfs_commit.c branches/SAMBA_3_0_24/source/modules/vfs_default.c branches/SAMBA_3_0_24/source/modules/vfs_default_quota.c branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c branches/SAMBA_3_0_24/source/modules/vfs_extd_audit.c branches/SAMBA_3_0_24/source/modules/vfs_fake_perms.c branches/SAMBA_3_0_24/source/modules/vfs_full_audit.c branches/SAMBA_3_0_24/source/modules/vfs_gpfs.c branches/SAMBA_3_0_24/source/modules/vfs_hpuxacl.c branches/SAMBA_3_0_24/source/modules/vfs_irixacl.c branches/SAMBA_3_0_24/source/modules/vfs_netatalk.c branches/SAMBA_3_0_24/source/modules/vfs_posixacl.c branches/SAMBA_3_0_24/source/modules/vfs_prealloc.c branches/SAMBA_3_0_24/source/modules/vfs_readonly.c branches/SAMBA_3_0_24/source/modules/vfs_recycle.c branches/SAMBA_3_0_24/source/modules/vfs_shadow_copy.c branches/SAMBA_3_0_24/source/modules/vfs_solarisacl.c branches/SAMBA_3_0_24/source/modules/vfs_tru64acl.c branches/SAMBA_3_0_24/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_0_24/source/param/loadparm.c branches/SAMBA_3_0_24/source/torture/locktest.c branches/SAMBA_3_0_24/source/torture/masktest.c branches/SAMBA_3_0_24/source/torture/msgtest.c branches/SAMBA_3_0_24/source/utils/debugparse.c branches/SAMBA_3_0_24/source/utils/eventlogadm.c branches/SAMBA_3_0_24/source/utils/log2pcaphex.c branches/SAMBA_3_0_24/source/utils/smbget.c Changeset: Sorry, the patch is too large (698 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20260
svn commit: samba r20261 - in branches/SAMBA_3_0/source: client lib/replace/test modules nsswitch param torture utils
Author: herb Date: 2006-12-19 20:16:52 + (Tue, 19 Dec 2006) New Revision: 20261 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20261 Log: merge 20260 from samba_3_0_24 clean up a bunch of no previous prototype warnings Modified: branches/SAMBA_3_0/source/client/umount.cifs.c branches/SAMBA_3_0/source/lib/replace/test/os2_delete.c branches/SAMBA_3_0/source/lib/replace/test/testsuite.c branches/SAMBA_3_0/source/modules/vfs_afsacl.c branches/SAMBA_3_0/source/modules/vfs_aixacl.c branches/SAMBA_3_0/source/modules/vfs_aixacl2.c branches/SAMBA_3_0/source/modules/vfs_audit.c branches/SAMBA_3_0/source/modules/vfs_cacheprime.c branches/SAMBA_3_0/source/modules/vfs_cap.c branches/SAMBA_3_0/source/modules/vfs_catia.c branches/SAMBA_3_0/source/modules/vfs_commit.c branches/SAMBA_3_0/source/modules/vfs_default.c branches/SAMBA_3_0/source/modules/vfs_default_quota.c branches/SAMBA_3_0/source/modules/vfs_expand_msdfs.c branches/SAMBA_3_0/source/modules/vfs_extd_audit.c branches/SAMBA_3_0/source/modules/vfs_fake_perms.c branches/SAMBA_3_0/source/modules/vfs_full_audit.c branches/SAMBA_3_0/source/modules/vfs_gpfs.c branches/SAMBA_3_0/source/modules/vfs_hpuxacl.c branches/SAMBA_3_0/source/modules/vfs_irixacl.c branches/SAMBA_3_0/source/modules/vfs_netatalk.c branches/SAMBA_3_0/source/modules/vfs_posixacl.c branches/SAMBA_3_0/source/modules/vfs_prealloc.c branches/SAMBA_3_0/source/modules/vfs_readonly.c branches/SAMBA_3_0/source/modules/vfs_recycle.c branches/SAMBA_3_0/source/modules/vfs_shadow_copy.c branches/SAMBA_3_0/source/modules/vfs_solarisacl.c branches/SAMBA_3_0/source/modules/vfs_tru64acl.c branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/torture/locktest.c branches/SAMBA_3_0/source/torture/masktest.c branches/SAMBA_3_0/source/torture/msgtest.c branches/SAMBA_3_0/source/utils/debugparse.c branches/SAMBA_3_0/source/utils/eventlogadm.c branches/SAMBA_3_0/source/utils/log2pcaphex.c branches/SAMBA_3_0/source/utils/smbget.c Changeset: Sorry, the patch is too large (698 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20261
svn commit: samba r20262 - in branches/SAMBA_3_0_24/source: include modules
Author: herb
Date: 2006-12-19 21:32:29 + (Tue, 19 Dec 2006)
New Revision: 20262
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20262
Log:
clean up a couple more no previous prototype warnings
Modified:
branches/SAMBA_3_0_24/source/include/charset.h
branches/SAMBA_3_0_24/source/modules/weird.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/include/charset.h
===
--- branches/SAMBA_3_0_24/source/include/charset.h 2006-12-19 20:16:52 UTC
(rev 20261)
+++ branches/SAMBA_3_0_24/source/include/charset.h 2006-12-19 21:32:29 UTC
(rev 20262)
@@ -119,6 +119,7 @@
struct charset_functions CHARSETNAME ## _functions =
\
{#CHARSETNAME, CHARSETNAME ## _pull, CHARSETNAME ## _push};
\
\
+NTSTATUS charset_ ## CHARSETNAME ## _init(void);
\
NTSTATUS charset_ ## CHARSETNAME ## _init(void)
\
{
\
return smb_register_charset( CHARSETNAME ## _functions);
\
Modified: branches/SAMBA_3_0_24/source/modules/weird.c
===
--- branches/SAMBA_3_0_24/source/modules/weird.c2006-12-19 20:16:52 UTC
(rev 20261)
+++ branches/SAMBA_3_0_24/source/modules/weird.c2006-12-19 21:32:29 UTC
(rev 20262)
@@ -125,6 +125,7 @@
struct charset_functions weird_functions = {WEIRD, weird_pull, weird_push};
+NTSTATUS charset_weird_init(void);
NTSTATUS charset_weird_init(void)
{
return smb_register_charset(weird_functions);
svn commit: samba r20263 - in branches/SAMBA_3_0_24/source/auth: .
Author: herb
Date: 2006-12-19 21:35:32 + (Tue, 19 Dec 2006)
New Revision: 20263
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20263
Log:
one more no previous prototype warning
Modified:
branches/SAMBA_3_0_24/source/auth/auth_script.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/auth/auth_script.c
===
--- branches/SAMBA_3_0_24/source/auth/auth_script.c 2006-12-19 21:32:29 UTC
(rev 20262)
+++ branches/SAMBA_3_0_24/source/auth/auth_script.c 2006-12-19 21:35:32 UTC
(rev 20263)
@@ -141,6 +141,7 @@
return NT_STATUS_OK;
}
+NTSTATUS auth_script_init(void);
NTSTATUS auth_script_init(void)
{
return smb_register_auth(AUTH_INTERFACE_VERSION, script,
auth_init_script);
svn commit: samba r20265 - in branches/SAMBA_3_0_24/source: nsswitch printing script
Author: herb
Date: 2006-12-19 22:40:39 + (Tue, 19 Dec 2006)
New Revision: 20265
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20265
Log:
fix a couple more no previous prototype warnings
Modified:
branches/SAMBA_3_0_24/source/nsswitch/wb_common.c
branches/SAMBA_3_0_24/source/printing/print_test.c
branches/SAMBA_3_0_24/source/script/mkbuildoptions.awk
Changeset:
Modified: branches/SAMBA_3_0_24/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0_24/source/nsswitch/wb_common.c 2006-12-19 22:13:10 UTC
(rev 20264)
+++ branches/SAMBA_3_0_24/source/nsswitch/wb_common.c 2006-12-19 22:40:39 UTC
(rev 20265)
@@ -53,7 +53,7 @@
/* Initialise a response structure */
-void init_response(struct winbindd_response *response)
+static void init_response(struct winbindd_response *response)
{
/* Initialise return value */
Modified: branches/SAMBA_3_0_24/source/printing/print_test.c
===
--- branches/SAMBA_3_0_24/source/printing/print_test.c 2006-12-19 22:13:10 UTC
(rev 20264)
+++ branches/SAMBA_3_0_24/source/printing/print_test.c 2006-12-19 22:40:39 UTC
(rev 20265)
@@ -77,5 +77,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_test_dummy(void);
void print_test_dummy(void) {}
#endif /* DEVELOPER||ENABLE_BUILD_FARM_HACKS */
Modified: branches/SAMBA_3_0_24/source/script/mkbuildoptions.awk
===
--- branches/SAMBA_3_0_24/source/script/mkbuildoptions.awk 2006-12-19
22:13:10 UTC (rev 20264)
+++ branches/SAMBA_3_0_24/source/script/mkbuildoptions.awk 2006-12-19
22:40:39 UTC (rev 20265)
@@ -25,6 +25,7 @@
print #include \dynconfig.h\;
print ;
print static void output(BOOL screen, const char *format, ...)
PRINTF_ATTRIBUTE(2,3);;
+ print void build_options(BOOL screen);;
print ;
print ;
print
/;
svn commit: samba r20266 - in branches/SAMBA_3_0_24/source: rpc_parse rpc_server
Author: herb
Date: 2006-12-19 23:30:03 + (Tue, 19 Dec 2006)
New Revision: 20266
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20266
Log:
fix more no previous prototype warnings - these functions were only referenced
in the same file so I made them static
Modified:
branches/SAMBA_3_0_24/source/rpc_parse/parse_net.c
branches/SAMBA_3_0_24/source/rpc_server/srv_eventlog_nt.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/rpc_parse/parse_net.c
===
--- branches/SAMBA_3_0_24/source/rpc_parse/parse_net.c 2006-12-19 22:40:39 UTC
(rev 20265)
+++ branches/SAMBA_3_0_24/source/rpc_parse/parse_net.c 2006-12-19 23:30:03 UTC
(rev 20266)
@@ -1522,7 +1522,7 @@
/* other sids are set up above */
}
- void dump_acct_flags(uint32 acct_flags) {
+static void dump_acct_flags(uint32 acct_flags) {
int lvl = 10;
DEBUG(lvl,(dump_acct_flags\n));
@@ -1549,7 +1549,7 @@
}
}
- void dump_user_flgs(uint32 user_flags) {
+static void dump_user_flgs(uint32 user_flags) {
int lvl = 10;
DEBUG(lvl,(dump_user_flgs\n));
Modified: branches/SAMBA_3_0_24/source/rpc_server/srv_eventlog_nt.c
===
--- branches/SAMBA_3_0_24/source/rpc_server/srv_eventlog_nt.c 2006-12-19
22:40:39 UTC (rev 20265)
+++ branches/SAMBA_3_0_24/source/rpc_server/srv_eventlog_nt.c 2006-12-19
23:30:03 UTC (rev 20266)
@@ -281,7 +281,7 @@
Eventlog_entry. returns NULL if it can't get the record for some reason.
/
-Eventlog_entry *get_eventlog_record( prs_struct * ps, TDB_CONTEXT * tdb,
+static Eventlog_entry *get_eventlog_record( prs_struct * ps, TDB_CONTEXT * tdb,
int recno, Eventlog_entry * ee )
{
TDB_DATA ret, key;
svn commit: samba r20267 - in branches/SAMBA_3_0_24/source: lib/ldb/common lib/ldb/ldb_tdb lib/ldb/modules libmsrpc libsmb nsswitch registry tdb/common
Author: herb
Date: 2006-12-20 00:58:09 + (Wed, 20 Dec 2006)
New Revision: 20267
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20267
Log:
fix more no previous prototype warnings
Modified:
branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_msg.c
branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_parse.c
branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_cache.c
branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_3_0_24/source/lib/ldb/modules/paged_results.c
branches/SAMBA_3_0_24/source/libmsrpc/cac_samr.c
branches/SAMBA_3_0_24/source/libmsrpc/cac_svcctl.c
branches/SAMBA_3_0_24/source/libmsrpc/cac_winreg.c
branches/SAMBA_3_0_24/source/libmsrpc/libmsrpc.c
branches/SAMBA_3_0_24/source/libmsrpc/libmsrpc_internal.c
branches/SAMBA_3_0_24/source/libsmb/libsmb_cache.c
branches/SAMBA_3_0_24/source/libsmb/libsmbclient.c
branches/SAMBA_3_0_24/source/libsmb/smb_share_modes.c
branches/SAMBA_3_0_24/source/nsswitch/wb_common.c
branches/SAMBA_3_0_24/source/nsswitch/winbind_nss_linux.c
branches/SAMBA_3_0_24/source/nsswitch/wins.c
branches/SAMBA_3_0_24/source/registry/reg_perfcount.c
branches/SAMBA_3_0_24/source/tdb/common/transaction.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_msg.c
===
--- branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_msg.c 2006-12-19
23:30:03 UTC (rev 20266)
+++ branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_msg.c 2006-12-20
00:58:09 UTC (rev 20267)
@@ -35,6 +35,10 @@
#include includes.h
#include ldb/include/includes.h
+void ldb_dump_results(struct ldb_context *ldb, struct ldb_result *result, FILE
*f);
+int ldb_msg_element_compare_name(struct ldb_message_element *el1,
+struct ldb_message_element *el2);
+
/*
create a new ldb_message in a given memory context (NULL for top level)
*/
Modified: branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_parse.c
===
--- branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_parse.c 2006-12-19
23:30:03 UTC (rev 20266)
+++ branches/SAMBA_3_0_24/source/lib/ldb/common/ldb_parse.c 2006-12-20
00:58:09 UTC (rev 20267)
@@ -45,6 +45,8 @@
#include ldb/include/includes.h
#include system/locale.h
+struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str);
+
/*
a filter is defined by:
filter ::= '(' filtercomp ')'
Modified: branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_cache.c
===
--- branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_cache.c2006-12-19
23:30:03 UTC (rev 20266)
+++ branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_cache.c2006-12-20
00:58:09 UTC (rev 20267)
@@ -42,6 +42,8 @@
#define LTDB_FLAG_HIDDEN (12)
#define LTDB_FLAG_OBJECTCLASS (13)
+int ltdb_attribute_flags(struct ldb_module *module, const char *attr_name);
+
/* valid attribute flags */
static const struct {
const char *name;
@@ -314,7 +316,7 @@
struct ldb_dn *baseinfo_dn = NULL;
struct ldb_dn *indexlist_dn = NULL;
uint64_t seq;
- struct ldb_message *baseinfo;
+ struct ldb_message *baseinfo = NULL;
/* a very fast check to avoid extra database reads */
if (ltdb-cache != NULL
Modified: branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_tdb.c
===
--- branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-19
23:30:03 UTC (rev 20266)
+++ branches/SAMBA_3_0_24/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-20
00:58:09 UTC (rev 20267)
@@ -47,6 +47,7 @@
#include ldb/ldb_tdb/ldb_tdb.h
+int ltdb_check_special_dn(struct ldb_module *module, const struct ldb_message
*msg);
/*
map a tdb error code to a ldb error code
Modified: branches/SAMBA_3_0_24/source/lib/ldb/modules/paged_results.c
===
--- branches/SAMBA_3_0_24/source/lib/ldb/modules/paged_results.c
2006-12-19 23:30:03 UTC (rev 20266)
+++ branches/SAMBA_3_0_24/source/lib/ldb/modules/paged_results.c
2006-12-20 00:58:09 UTC (rev 20267)
@@ -75,6 +75,8 @@
};
+int store_destructor(struct results_store *store);
+
int store_destructor(struct results_store *store)
{
if (store-prev) {
Modified: branches/SAMBA_3_0_24/source/libmsrpc/cac_samr.c
===
--- branches/SAMBA_3_0_24/source/libmsrpc/cac_samr.c2006-12-19 23:30:03 UTC
(rev 20266)
+++ branches/SAMBA_3_0_24/source/libmsrpc/cac_samr.c2006-12-20 00:58:09 UTC
(rev 20267)
@@ -30,6 +30,9 @@
/*not sure what this is.. taken from rpcclient/cmd_samr.c*/
#define SAMR_LOOKUP_FLAGS 0x03e8
+DOM_SID *cac_get_domain_sid( CacServerHandle * hnd, TALLOC_CTX * mem_ctx
svn commit: samba r20268 - in branches/SAMBA_3_0/source: auth include modules
Author: herb
Date: 2006-12-20 01:07:21 + (Wed, 20 Dec 2006)
New Revision: 20268
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20268
Log:
merge -r 20261:20263 from samba_3_0_24
get rid of previous prototype warnings
Modified:
branches/SAMBA_3_0/source/auth/auth_script.c
branches/SAMBA_3_0/source/include/charset.h
branches/SAMBA_3_0/source/modules/weird.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_script.c
===
--- branches/SAMBA_3_0/source/auth/auth_script.c2006-12-20 00:58:09 UTC
(rev 20267)
+++ branches/SAMBA_3_0/source/auth/auth_script.c2006-12-20 01:07:21 UTC
(rev 20268)
@@ -141,6 +141,7 @@
return NT_STATUS_OK;
}
+NTSTATUS auth_script_init(void);
NTSTATUS auth_script_init(void)
{
return smb_register_auth(AUTH_INTERFACE_VERSION, script,
auth_init_script);
Modified: branches/SAMBA_3_0/source/include/charset.h
===
--- branches/SAMBA_3_0/source/include/charset.h 2006-12-20 00:58:09 UTC (rev
20267)
+++ branches/SAMBA_3_0/source/include/charset.h 2006-12-20 01:07:21 UTC (rev
20268)
@@ -119,6 +119,7 @@
struct charset_functions CHARSETNAME ## _functions =
\
{#CHARSETNAME, CHARSETNAME ## _pull, CHARSETNAME ## _push};
\
\
+NTSTATUS charset_ ## CHARSETNAME ## _init(void);
\
NTSTATUS charset_ ## CHARSETNAME ## _init(void)
\
{
\
return smb_register_charset( CHARSETNAME ## _functions);
\
Modified: branches/SAMBA_3_0/source/modules/weird.c
===
--- branches/SAMBA_3_0/source/modules/weird.c 2006-12-20 00:58:09 UTC (rev
20267)
+++ branches/SAMBA_3_0/source/modules/weird.c 2006-12-20 01:07:21 UTC (rev
20268)
@@ -125,6 +125,7 @@
struct charset_functions weird_functions = {WEIRD, weird_pull, weird_push};
+NTSTATUS charset_weird_init(void);
NTSTATUS charset_weird_init(void)
{
return smb_register_charset(weird_functions);
svn commit: samba r20269 - in branches/SAMBA_3_0/source: lib/ldb/common lib/ldb/ldb_tdb lib/ldb/modules libmsrpc libsmb nsswitch printing registry rpc_parse rpc_server script tdb/common
Author: herb
Date: 2006-12-20 01:10:04 + (Wed, 20 Dec 2006)
New Revision: 20269
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20269
Log:
merge -r20264:20267 from SAMBA_3_0_24
more no previous prototype warnings
Modified:
branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c
branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c
branches/SAMBA_3_0/source/libmsrpc/cac_samr.c
branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c
branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c
branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c
branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c
branches/SAMBA_3_0/source/libsmb/libsmb_cache.c
branches/SAMBA_3_0/source/libsmb/libsmbclient.c
branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
branches/SAMBA_3_0/source/nsswitch/wb_common.c
branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
branches/SAMBA_3_0/source/nsswitch/wins.c
branches/SAMBA_3_0/source/printing/print_test.c
branches/SAMBA_3_0/source/registry/reg_perfcount.c
branches/SAMBA_3_0/source/rpc_parse/parse_net.c
branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
branches/SAMBA_3_0/source/script/mkbuildoptions.awk
branches/SAMBA_3_0/source/tdb/common/transaction.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c
===
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c 2006-12-20 01:07:21 UTC
(rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_msg.c 2006-12-20 01:10:04 UTC
(rev 20269)
@@ -35,6 +35,10 @@
#include includes.h
#include ldb/include/includes.h
+void ldb_dump_results(struct ldb_context *ldb, struct ldb_result *result, FILE
*f);
+int ldb_msg_element_compare_name(struct ldb_message_element *el1,
+struct ldb_message_element *el2);
+
/*
create a new ldb_message in a given memory context (NULL for top level)
*/
Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c
===
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c2006-12-20
01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_parse.c2006-12-20
01:10:04 UTC (rev 20269)
@@ -45,6 +45,8 @@
#include ldb/include/includes.h
#include system/locale.h
+struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str);
+
/*
a filter is defined by:
filter ::= '(' filtercomp ')'
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c
===
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c 2006-12-20
01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_cache.c 2006-12-20
01:10:04 UTC (rev 20269)
@@ -42,6 +42,8 @@
#define LTDB_FLAG_HIDDEN (12)
#define LTDB_FLAG_OBJECTCLASS (13)
+int ltdb_attribute_flags(struct ldb_module *module, const char *attr_name);
+
/* valid attribute flags */
static const struct {
const char *name;
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-20 01:07:21 UTC
(rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-12-20 01:10:04 UTC
(rev 20269)
@@ -47,6 +47,7 @@
#include ldb/ldb_tdb/ldb_tdb.h
+int ltdb_check_special_dn(struct ldb_module *module, const struct ldb_message
*msg);
/*
map a tdb error code to a ldb error code
Modified: branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c
===
--- branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c 2006-12-20
01:07:21 UTC (rev 20268)
+++ branches/SAMBA_3_0/source/lib/ldb/modules/paged_results.c 2006-12-20
01:10:04 UTC (rev 20269)
@@ -75,6 +75,8 @@
};
+int store_destructor(struct results_store *store);
+
int store_destructor(struct results_store *store)
{
if (store-prev) {
Modified: branches/SAMBA_3_0/source/libmsrpc/cac_samr.c
===
--- branches/SAMBA_3_0/source/libmsrpc/cac_samr.c 2006-12-20 01:07:21 UTC
(rev 20268)
+++ branches/SAMBA_3_0/source/libmsrpc/cac_samr.c 2006-12-20 01:10:04 UTC
(rev 20269)
@@ -30,6 +30,9 @@
/*not sure what this is.. taken from rpcclient/cmd_samr.c*/
#define SAMR_LOOKUP_FLAGS 0x03e8
+DOM_SID *cac_get_domain_sid( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
+uint32 des_access );
+
int cac_SamConnect( CacServerHandle * hnd, TALLOC_CTX * mem_ctx,
struct SamConnect *op )
{
Modified: branches
svn commit: samba r20244 - in branches/SAMBA_3_0_24/source: nsswitch printing torture
Author: herb
Date: 2006-12-18 20:31:43 + (Mon, 18 Dec 2006)
New Revision: 20244
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20244
Log:
get rid of more nested extern declaration warnings
Modified:
branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0_24/source/printing/print_cups.c
branches/SAMBA_3_0_24/source/torture/locktest.c
branches/SAMBA_3_0_24/source/torture/locktest2.c
branches/SAMBA_3_0_24/source/torture/masktest.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c 2006-12-18 20:05:50 UTC
(rev 20243)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c 2006-12-18 20:31:43 UTC
(rev 20244)
@@ -71,6 +71,7 @@
};
extern struct winbindd_methods reconnect_methods;
+extern BOOL override_logfile;
static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain);
static void set_dc_type_and_flags( struct winbindd_domain *domain );
@@ -160,7 +161,6 @@
static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
{
- extern BOOL override_logfile;
struct dc_name_ip *dcs = NULL;
int num_dcs = 0;
TALLOC_CTX *mem_ctx = NULL;
Modified: branches/SAMBA_3_0_24/source/printing/print_cups.c
===
--- branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-18 20:05:50 UTC
(rev 20243)
+++ branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-18 20:31:43 UTC
(rev 20244)
@@ -25,6 +25,7 @@
#include cups/cups.h
#include cups/language.h
+extern userdom_struct current_user_info;
/*
* 'cups_passwd_cb()' - The CUPS password callback...
@@ -1006,7 +1007,6 @@
static int cups_queue_pause(int snum)
{
- extern userdom_struct current_user_info;
int ret = 1;/* Return value */
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
@@ -1098,7 +1098,6 @@
static int cups_queue_resume(int snum)
{
- extern userdom_struct current_user_info;
int ret = 1;/* Return value */
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
Modified: branches/SAMBA_3_0_24/source/torture/locktest.c
===
--- branches/SAMBA_3_0_24/source/torture/locktest.c 2006-12-18 20:05:50 UTC
(rev 20243)
+++ branches/SAMBA_3_0_24/source/torture/locktest.c 2006-12-18 20:31:43 UTC
(rev 20244)
@@ -36,6 +36,9 @@
static BOOL exact_error_codes;
static BOOL zero_zero;
+extern char *optarg;
+extern int optind;
+
#define FILENAME \\locktest.dat
#define READ_PCT 50
@@ -581,8 +584,6 @@
int main(int argc,char *argv[])
{
char *share[NSERVERS];
- extern char *optarg;
- extern int optind;
int opt;
char *p;
int seed, server;
Modified: branches/SAMBA_3_0_24/source/torture/locktest2.c
===
--- branches/SAMBA_3_0_24/source/torture/locktest2.c2006-12-18 20:05:50 UTC
(rev 20243)
+++ branches/SAMBA_3_0_24/source/torture/locktest2.c2006-12-18 20:31:43 UTC
(rev 20244)
@@ -29,6 +29,9 @@
static BOOL hide_unlock_fails;
static BOOL use_oplocks;
+extern char *optarg;
+extern int optind;
+
#define FILENAME \\locktest.dat
#define LOCKRANGE 100
#define LOCKBASE 0
@@ -471,8 +474,6 @@
int main(int argc,char *argv[])
{
char *share1, *share2, *nfspath1, *nfspath2;
- extern char *optarg;
- extern int optind;
int opt;
char *p;
int seed;
Modified: branches/SAMBA_3_0_24/source/torture/masktest.c
===
--- branches/SAMBA_3_0_24/source/torture/masktest.c 2006-12-18 20:05:50 UTC
(rev 20243)
+++ branches/SAMBA_3_0_24/source/torture/masktest.c 2006-12-18 20:31:43 UTC
(rev 20244)
@@ -33,6 +33,10 @@
static int NumLoops = 0;
static int ignore_dot_errors = 0;
+extern char *optarg;
+extern int optind;
+extern BOOL AllowDebugChange;
+
/* a test fn for LANMAN mask support */
int ms_fnmatch_lanman_core(const char *pattern, const char *string)
{
@@ -426,9 +430,6 @@
{
char *share;
struct cli_state *cli;
- extern char *optarg;
- extern int optind;
- extern BOOL AllowDebugChange;
int opt;
char *p;
int seed;
svn commit: samba r20245 - in branches/SAMBA_3_0/source: nsswitch printing torture
Author: herb
Date: 2006-12-18 20:37:26 + (Mon, 18 Dec 2006)
New Revision: 20245
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20245
Log:
merge 20244 from samba_3_0_24
get rid of more nested extern declarations warnings
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0/source/printing/print_cups.c
branches/SAMBA_3_0/source/torture/locktest.c
branches/SAMBA_3_0/source/torture/locktest2.c
branches/SAMBA_3_0/source/torture/masktest.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-12-18 20:31:43 UTC
(rev 20244)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-12-18 20:37:26 UTC
(rev 20245)
@@ -65,13 +65,14 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-extern struct winbindd_methods reconnect_methods;
-
struct dc_name_ip {
fstring name;
struct in_addr ip;
};
+extern struct winbindd_methods reconnect_methods;
+extern BOOL override_logfile;
+
static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain);
static void set_dc_type_and_flags( struct winbindd_domain *domain );
static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
@@ -160,7 +161,6 @@
static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
{
- extern BOOL override_logfile;
struct dc_name_ip *dcs = NULL;
int num_dcs = 0;
TALLOC_CTX *mem_ctx = NULL;
Modified: branches/SAMBA_3_0/source/printing/print_cups.c
===
--- branches/SAMBA_3_0/source/printing/print_cups.c 2006-12-18 20:31:43 UTC
(rev 20244)
+++ branches/SAMBA_3_0/source/printing/print_cups.c 2006-12-18 20:37:26 UTC
(rev 20245)
@@ -25,6 +25,7 @@
#include cups/cups.h
#include cups/language.h
+extern userdom_struct current_user_info;
/*
* 'cups_passwd_cb()' - The CUPS password callback...
@@ -1006,7 +1007,6 @@
static int cups_queue_pause(int snum)
{
- extern userdom_struct current_user_info;
int ret = 1;/* Return value */
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
@@ -1098,7 +1098,6 @@
static int cups_queue_resume(int snum)
{
- extern userdom_struct current_user_info;
int ret = 1;/* Return value */
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
Modified: branches/SAMBA_3_0/source/torture/locktest.c
===
--- branches/SAMBA_3_0/source/torture/locktest.c2006-12-18 20:31:43 UTC
(rev 20244)
+++ branches/SAMBA_3_0/source/torture/locktest.c2006-12-18 20:37:26 UTC
(rev 20245)
@@ -36,6 +36,9 @@
static BOOL exact_error_codes;
static BOOL zero_zero;
+extern char *optarg;
+extern int optind;
+
#define FILENAME \\locktest.dat
#define READ_PCT 50
@@ -581,8 +584,6 @@
int main(int argc,char *argv[])
{
char *share[NSERVERS];
- extern char *optarg;
- extern int optind;
int opt;
char *p;
int seed, server;
Modified: branches/SAMBA_3_0/source/torture/locktest2.c
===
--- branches/SAMBA_3_0/source/torture/locktest2.c 2006-12-18 20:31:43 UTC
(rev 20244)
+++ branches/SAMBA_3_0/source/torture/locktest2.c 2006-12-18 20:37:26 UTC
(rev 20245)
@@ -29,6 +29,9 @@
static BOOL hide_unlock_fails;
static BOOL use_oplocks;
+extern char *optarg;
+extern int optind;
+
#define FILENAME \\locktest.dat
#define LOCKRANGE 100
#define LOCKBASE 0
@@ -471,8 +474,6 @@
int main(int argc,char *argv[])
{
char *share1, *share2, *nfspath1, *nfspath2;
- extern char *optarg;
- extern int optind;
int opt;
char *p;
int seed;
Modified: branches/SAMBA_3_0/source/torture/masktest.c
===
--- branches/SAMBA_3_0/source/torture/masktest.c2006-12-18 20:31:43 UTC
(rev 20244)
+++ branches/SAMBA_3_0/source/torture/masktest.c2006-12-18 20:37:26 UTC
(rev 20245)
@@ -33,6 +33,10 @@
static int NumLoops = 0;
static int ignore_dot_errors = 0;
+extern char *optarg;
+extern int optind;
+extern BOOL AllowDebugChange;
+
/* a test fn for LANMAN mask support */
int ms_fnmatch_lanman_core(const char *pattern, const char *string)
{
@@ -426,9 +430,6 @@
{
char *share;
struct cli_state *cli;
- extern char *optarg;
- extern int optind;
- extern BOOL AllowDebugChange;
int opt;
char *p;
int seed;
svn commit: samba r20246 - in branches/SAMBA_3_0_24/source/rpc_server: .
Author: herb Date: 2006-12-18 20:53:51 + (Mon, 18 Dec 2006) New Revision: 20246 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20246 Log: fix unititialized variable Modified: branches/SAMBA_3_0_24/source/rpc_server/srv_srvsvc_nt.c Changeset: Modified: branches/SAMBA_3_0_24/source/rpc_server/srv_srvsvc_nt.c === --- branches/SAMBA_3_0_24/source/rpc_server/srv_srvsvc_nt.c 2006-12-18 20:37:26 UTC (rev 20245) +++ branches/SAMBA_3_0_24/source/rpc_server/srv_srvsvc_nt.c 2006-12-18 20:53:51 UTC (rev 20246) @@ -1671,6 +1671,8 @@ return WERR_NO_SUCH_SHARE; } + snum = find_service(share_name); + /* No change to printer shares. */ if (lp_print_ok(snum)) return WERR_ACCESS_DENIED;
svn commit: samba r20247 - in branches/SAMBA_3_0_24/source/lib/replace: .
Author: herb
Date: 2006-12-18 21:59:11 + (Mon, 18 Dec 2006)
New Revision: 20247
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20247
Log:
get rid of warning: value computed is not used
Modified:
branches/SAMBA_3_0_24/source/lib/replace/snprintf.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/replace/snprintf.c
===
--- branches/SAMBA_3_0_24/source/lib/replace/snprintf.c 2006-12-18 20:53:51 UTC
(rev 20246)
+++ branches/SAMBA_3_0_24/source/lib/replace/snprintf.c 2006-12-18 21:59:11 UTC
(rev 20247)
@@ -540,7 +540,7 @@
printf(parameter at position %d not used\n, pnum+1);
#endif
/* eat the parameter */
- va_arg (args, int);
+ (void)va_arg (args, int);
continue;
}
for (i = 1; i clist[pnum].num; i++) {
svn commit: samba r20248 - in branches/SAMBA_3_0/source/lib/replace: .
Author: herb
Date: 2006-12-18 22:01:39 + (Mon, 18 Dec 2006)
New Revision: 20248
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20248
Log:
merge 20247 from samba_3_0_24
get rid of warning: value computed is not used
Modified:
branches/SAMBA_3_0/source/lib/replace/snprintf.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/snprintf.c
===
--- branches/SAMBA_3_0/source/lib/replace/snprintf.c2006-12-18 21:59:11 UTC
(rev 20247)
+++ branches/SAMBA_3_0/source/lib/replace/snprintf.c2006-12-18 22:01:39 UTC
(rev 20248)
@@ -540,7 +540,7 @@
printf(parameter at position %d not used\n, pnum+1);
#endif
/* eat the parameter */
- va_arg (args, int);
+ (void)va_arg (args, int);
continue;
}
for (i = 1; i clist[pnum].num; i++) {
svn commit: samba r20199 - in branches/SAMBA_3_0_24/source: .
Author: herb Date: 2006-12-15 23:24:57 + (Fri, 15 Dec 2006) New Revision: 20199 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20199 Log: make files that are referenced several places a variable fix make clean Modified: branches/SAMBA_3_0_24/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_24/source/Makefile.in === --- branches/SAMBA_3_0_24/source/Makefile.in2006-12-15 23:00:24 UTC (rev 20198) +++ branches/SAMBA_3_0_24/source/Makefile.in2006-12-15 23:24:57 UTC (rev 20199) @@ -217,6 +217,12 @@ RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o +# this includes only the low level parse code, not stuff +# that requires knowledge of security contexts +RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o + +RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o rpc_parse/parse_srv.o + LIBREPLACE_OBJ = @LIBREPLACE_OBJS@ SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@ @@ -299,10 +305,12 @@ $(DOSERR_OBJ) \ $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(LIBNMB_OBJ) +RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o rpc_client/cli_srvsvc.o + LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \ - rpc_client/cli_netlogon.o rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \ + $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \ rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o \ - rpc_client/cli_ds.o rpc_client/cli_svcctl.o rpc_client/cli_srvsvc.o \ + rpc_client/cli_ds.o rpc_client/cli_svcctl.o \ rpc_client/cli_shutdown.o rpc_client/cli_dfs.o rpc_client/cli_echo.o LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wkssvc.o \ @@ -351,16 +359,12 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) -# this includes only the low level parse code, not stuff -# that requires knowledge of security contexts -RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o - -RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \ -rpc_parse/parse_rpc.o rpc_parse/parse_samr.o \ +RPC_PARSE_OBJ = rpc_parse/parse_lsa.o $(RPC_PARSE_OBJ2) \ +rpc_parse/parse_samr.o \ rpc_parse/parse_ds.o rpc_parse/parse_spoolss.o \ rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o \ rpc_parse/parse_ntsvcs.o rpc_parse/parse_svcctl.o $(REGOBJS_OBJ) \ - rpc_parse/parse_srv.o rpc_parse/parse_dfs.o \ + rpc_parse/parse_dfs.o \ rpc_parse/parse_reg.o rpc_parse/parse_echo.o \ rpc_parse/parse_shutdown.o @@ -521,34 +525,37 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \ - rpc_client/cli_pipe.o rpc_parse/parse_rpc.o \ - rpc_client/cli_netlogon.o rpc_parse/parse_net.o \ -rpc_client/cli_srvsvc.o rpc_parse/parse_srv.o \ + rpc_client/cli_pipe.o $(RPC_PARSE_OBJ2) \ + $(RPC_CLIENT_OBJ1) \ $(LIBMSRPC_GEN_OBJ) TESTPARM_OBJ = utils/testparm.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) -SMBPASSWD_OBJ = utils/smbpasswd.o utils/passwd_util.o $(PASSCHANGE_OBJ) \ +PASSWD_UTIL_OBJ = utils/passwd_util.o + +SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \ $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \ $(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ) -PDBEDIT_OBJ = utils/pdbedit.o utils/passwd_util.o $(PARAM_OBJ) $(PASSDB_OBJ) \ +PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \ $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \ $(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) libsmb/errormap.o SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ) +DISPLAY_SEC_OBJ= lib/display_sec.o + RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \ rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \ rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \ rpcclient/cmd_dfs.o \ rpcclient/cmd_ds.o rpcclient/cmd_echo.o \ rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \ -lib/display_sec.o +$(DISPLAY_SEC_OBJ) RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -558,7 +565,7 @@ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ
svn commit: samba r20200 - in branches/SAMBA_3_0_24/source: .
Author: herb Date: 2006-12-16 00:14:28 + (Sat, 16 Dec 2006) New Revision: 20200 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20200 Log: add sharesec to EVERYTHING target so it gets cleaned Modified: branches/SAMBA_3_0_24/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_24/source/Makefile.in === --- branches/SAMBA_3_0_24/source/Makefile.in2006-12-15 23:24:57 UTC (rev 20199) +++ branches/SAMBA_3_0_24/source/Makefile.in2006-12-16 00:14:28 UTC (rev 20200) @@ -165,7 +165,7 @@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
svn commit: samba r20201 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2006-12-16 00:25:34 + (Sat, 16 Dec 2006) New Revision: 20201 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20201 Log: merge makefile changes from 3_0_24 Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-12-16 00:14:28 UTC (rev 20200) +++ branches/SAMBA_3_0/source/Makefile.in 2006-12-16 00:25:34 UTC (rev 20201) @@ -154,7 +154,7 @@ bin/[EMAIL PROTECTED]@ BIN_PROGS3 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ BIN_PROGS4 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @@ -167,7 +167,7 @@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@ @@ -223,6 +223,12 @@ RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o +# this includes only the low level parse code, not stuff +# that requires knowledge of security contexts +RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o + +RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o + LIBREPLACE_OBJ = @LIBREPLACE_OBJS@ SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@ @@ -305,8 +311,10 @@ $(DOSERR_OBJ) \ $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(LIBNMB_OBJ) +RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o + LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \ - rpc_client/cli_netlogon.o rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \ + $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \ rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o \ rpc_client/cli_ds.o rpc_client/cli_svcctl.o @@ -363,12 +371,8 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) -# this includes only the low level parse code, not stuff -# that requires knowledge of security contexts -RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0) rpc_parse/parse_sec.o - -RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \ -rpc_parse/parse_rpc.o rpc_parse/parse_samr.o \ +RPC_PARSE_OBJ = rpc_parse/parse_lsa.o $(RPC_PARSE_OBJ2) \ +rpc_parse/parse_samr.o \ rpc_parse/parse_ds.o rpc_parse/parse_spoolss.o \ rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o \ rpc_parse/parse_ntsvcs.o rpc_parse/parse_svcctl.o $(REGOBJS_OBJ) @@ -530,33 +534,37 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) \ - rpc_client/cli_pipe.o rpc_parse/parse_rpc.o \ - rpc_client/cli_netlogon.o rpc_parse/parse_net.o \ - $(LIBMSRPC_GEN_OBJ) + rpc_client/cli_pipe.o $(RPC_PARSE_OBJ2) \ + $(RPC_CLIENT_OBJ1) \ + $(LIBMSRPC_GEN_OBJ) TESTPARM_OBJ = utils/testparm.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) -SMBPASSWD_OBJ = utils/smbpasswd.o utils/passwd_util.o $(PASSCHANGE_OBJ) \ +PASSWD_UTIL_OBJ = utils/passwd_util.o + +SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \ $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \ $(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ) -PDBEDIT_OBJ = utils/pdbedit.o utils/passwd_util.o $(PARAM_OBJ) $(PASSDB_OBJ) \ +PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \ $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \ $(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) libsmb/errormap.o SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ) +DISPLAY_SEC_OBJ= lib/display_sec.o + RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \ rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \ rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \ rpcclient/cmd_dfs.o \ rpcclient/cmd_ds.o rpcclient/cmd_echo.o \ rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \ -rpcclient/cmd_unixinfo.o lib/display_sec.o +rpcclient
svn commit: samba r20202 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2006-12-16 00:51:15 + (Sat, 16 Dec 2006) New Revision: 20202 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20202 Log: fix make clean Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2006-12-16 00:25:34 UTC (rev 20201) +++ branches/SAMBA_3_0/source/Makefile.in 2006-12-16 00:51:15 UTC (rev 20202) @@ -1798,7 +1798,7 @@ -rm -f core */*~ *~ */*.o */*/*.o */*/*/*.o \ */[EMAIL PROTECTED]@ */*/[EMAIL PROTECTED]@ */*/*/[EMAIL PROTECTED]@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ - $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ + $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ .headers.stamp */src/*.o -rm -rf t_dir
svn commit: samba r20203 - in branches/SAMBA_3_0_24/source: .
Author: herb Date: 2006-12-16 00:54:00 + (Sat, 16 Dec 2006) New Revision: 20203 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20203 Log: fix make clean Modified: branches/SAMBA_3_0_24/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_24/source/Makefile.in === --- branches/SAMBA_3_0_24/source/Makefile.in2006-12-16 00:51:15 UTC (rev 20202) +++ branches/SAMBA_3_0_24/source/Makefile.in2006-12-16 00:54:00 UTC (rev 20203) @@ -1776,7 +1776,7 @@ -rm -f core */*~ *~ */*.o */*/*.o */*/*/*.o \ */[EMAIL PROTECTED]@ */*/[EMAIL PROTECTED]@ */*/*/[EMAIL PROTECTED]@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ - $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ + $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \ $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ .headers.stamp */src/*.o -rm -rf t_dir
svn commit: samba r20153 - in branches/SAMBA_3_0_24/source: . utils
Author: herb
Date: 2006-12-13 21:00:45 + (Wed, 13 Dec 2006)
New Revision: 20153
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20153
Log:
allow bin/sharesec to be built (not by default)
Added:
branches/SAMBA_3_0_24/source/utils/sharesec.c
Modified:
branches/SAMBA_3_0_24/source/Makefile.in
Changeset:
Modified: branches/SAMBA_3_0_24/source/Makefile.in
===
--- branches/SAMBA_3_0_24/source/Makefile.in2006-12-13 20:47:24 UTC (rev
20152)
+++ branches/SAMBA_3_0_24/source/Makefile.in2006-12-13 21:00:45 UTC (rev
20153)
@@ -685,6 +685,11 @@
registry/reg_eventlog.o rpc_server/srv_eventlog_lib.o
registry/reg_util.o \
registry/reg_db.o
+SHARESEC_OBJ0 = utils/sharesec.o
+SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
$(REGOBJS_OBJ) \
+ $(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ)
\
+$(POPT_LIB_OBJ) $(SECRETS_OBJ)
+
TALLOCTORT_OBJ = lib/talloc/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LIBSAMBA_OBJ) $(SECRETS_OBJ)
@@ -865,6 +870,8 @@
eventlogadm: SHOWFLAGS bin/[EMAIL PROTECTED]@
+sharesec: SHOWFLAGS bin/[EMAIL PROTECTED]@
+
talloctort : SHOWFLAGS bin/[EMAIL PROTECTED]@
replacetort : SHOWFLAGS bin/[EMAIL PROTECTED]@
@@ -1096,6 +1103,10 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
+bin/[EMAIL PROTECTED]@: $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
+
bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
Added: branches/SAMBA_3_0_24/source/utils/sharesec.c
===
--- branches/SAMBA_3_0_24/source/utils/sharesec.c 2006-12-13 20:47:24 UTC
(rev 20152)
+++ branches/SAMBA_3_0_24/source/utils/sharesec.c 2006-12-13 21:00:45 UTC
(rev 20153)
@@ -0,0 +1,415 @@
+/*
+ * Unix SMB/Netbios implementation.
+ * Utility for managing share permissions
+ *
+ * Copyright (C) Tim Potter2000
+ * Copyright (C) Jeremy Allison2000
+ * Copyright (C) Jelmer Vernooij 2003
+ * Copyright (C) Gerald (Jerry) Carter 2005.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include includes.h
+
+#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
+
+/* numeric is set when the user wants numeric SIDs and ACEs rather
+ than going via LSA calls to resolve them */
+static BOOL numeric = False;
+
+enum acl_mode {SMB_ACL_REMOVE, SMB_ACL_MODIFY, SMB_ACL_ADD, SMB_ACL_REPLACE,
SMB_ACL_VIEW };
+enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
+
+struct perm_value {
+ const char *perm;
+ uint32 mask;
+};
+
+/* These values discovered by inspection */
+
+static const struct perm_value special_values[] = {
+ { R, 0x00120089 },
+ { W, 0x00120116 },
+ { X, 0x001200a0 },
+ { D, 0x0001 },
+ { P, 0x0004 },
+ { O, 0x0008 },
+ { NULL, 0 },
+};
+
+static const struct perm_value standard_values[] = {
+ { READ, 0x001200a9 },
+ { CHANGE, 0x001301bf },
+ { FULL, 0x001f01ff },
+ { NULL, 0 },
+};
+
+/
+ print an ACE on a FILE, using either numeric or ascii representation
+/
+
+static void print_ace(FILE *f, SEC_ACE *ace)
+{
+ const struct perm_value *v;
+ fstring sidstr;
+ int do_print = 0;
+ uint32 got_mask;
+
+ sid_to_string(sidstr, ace-trustee);
+
+ fprintf(f, %s:, sidstr);
+
+ if (numeric) {
+ fprintf(f, %d/%d/0x%08x,
+ ace-type, ace-flags, ace-info.mask);
+ return;
+ }
+
+ /* Ace type */
+
+ if (ace-type == SEC_ACE_TYPE_ACCESS_ALLOWED) {
+ fprintf(f, ALLOWED);
+ } else if (ace-type
svn commit: samba r20156 - in branches/SAMBA_3_0_24/source: client include libsmb modules nsswitch printing smbd
Author: herb
Date: 2006-12-13 21:19:33 + (Wed, 13 Dec 2006)
New Revision: 20156
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20156
Log:
clean up nested extern declaration warnings
Modified:
branches/SAMBA_3_0_24/source/client/smbmount.c
branches/SAMBA_3_0_24/source/include/smb_macros.h
branches/SAMBA_3_0_24/source/libsmb/clientgen.c
branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c
branches/SAMBA_3_0_24/source/modules/vfs_full_audit.c
branches/SAMBA_3_0_24/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_24/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0_24/source/nsswitch/winbindd_dual.c
branches/SAMBA_3_0_24/source/nsswitch/winbindd_util.c
branches/SAMBA_3_0_24/source/printing/print_generic.c
branches/SAMBA_3_0_24/source/printing/printing.c
branches/SAMBA_3_0_24/source/smbd/blocking.c
branches/SAMBA_3_0_24/source/smbd/nttrans.c
branches/SAMBA_3_0_24/source/smbd/sesssetup.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/client/smbmount.c
===
--- branches/SAMBA_3_0_24/source/client/smbmount.c 2006-12-13 21:05:47 UTC
(rev 20155)
+++ branches/SAMBA_3_0_24/source/client/smbmount.c 2006-12-13 21:19:33 UTC
(rev 20156)
@@ -26,6 +26,8 @@
extern BOOL in_client;
extern pstring user_socket_options;
+extern char *optarg;
+extern int optind;
static pstring credentials;
static pstring my_netbios_name;
@@ -712,7 +714,6 @@
int opt;
char *opts;
char *opteq;
- extern char *optarg;
int val;
char *p;
@@ -862,8 +863,6 @@
/
int main(int argc,char *argv[])
{
- extern char *optarg;
- extern int optind;
char *p;
DEBUGLEVEL = 1;
Modified: branches/SAMBA_3_0_24/source/include/smb_macros.h
===
--- branches/SAMBA_3_0_24/source/include/smb_macros.h 2006-12-13 21:05:47 UTC
(rev 20155)
+++ branches/SAMBA_3_0_24/source/include/smb_macros.h 2006-12-13 21:19:33 UTC
(rev 20156)
@@ -86,10 +86,10 @@
#define IS_IPC(conn) ((conn) (conn)-ipc)
#define IS_PRINT(conn) ((conn) (conn)-printer)
/* you must add the following extern declaration to files using this macro
+ * (do not add it to the macro as that causes nested extern declaration
warnings)
* extern struct current_user current_user;
*/
#define FSP_BELONGS_CONN(fsp,conn) do {\
- extern struct current_user current_user;\
if (!((fsp) (conn) ((conn)==(fsp)-conn)
(current_user.vuid==(fsp)-vuid))) \
return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
} while(0)
@@ -97,10 +97,10 @@
#define FNUM_OK(fsp,c) ((fsp) !(fsp)-is_directory (c)==(fsp)-conn
current_user.vuid==(fsp)-vuid)
/* you must add the following extern declaration to files using this macro
+ * (do not add it to the macro as that causes nested extern declaration
warnings)
* extern struct current_user current_user;
*/
#define CHECK_FSP(fsp,conn) do {\
- extern struct current_user current_user;\
if (!(fsp) || !(conn)) \
return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
else if (((conn) != (fsp)-conn) || current_user.vuid
!= (fsp)-vuid) \
Modified: branches/SAMBA_3_0_24/source/libsmb/clientgen.c
===
--- branches/SAMBA_3_0_24/source/libsmb/clientgen.c 2006-12-13 21:05:47 UTC
(rev 20155)
+++ branches/SAMBA_3_0_24/source/libsmb/clientgen.c 2006-12-13 21:19:33 UTC
(rev 20156)
@@ -20,6 +20,8 @@
#include includes.h
+extern int smb_read_error;
+
/
Change the timeout (in milliseconds).
/
@@ -79,7 +81,6 @@
BOOL cli_receive_smb(struct cli_state *cli)
{
- extern int smb_read_error;
BOOL ret;
/* fd == -1 causes segfaults -- Tom ([EMAIL PROTECTED]) */
Modified: branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c
===
--- branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c 2006-12-13
21:05:47 UTC (rev 20155)
+++ branches/SAMBA_3_0_24/source/modules/vfs_expand_msdfs.c 2006-12-13
21:19:33 UTC (rev 20156)
@@ -23,6 +23,8 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
+extern userdom_struct current_user_info;
+
/**
Under mapfile we expect a table of the following format:
@@ -110,7 +112,6 @@
int filename_len;
pstring targethost;
pstring new_target
svn commit: samba r20157 - in branches/SAMBA_3_0_24/source: lib lib/talloc libaddns printing smbd utils
Author: herb
Date: 2006-12-13 21:24:02 + (Wed, 13 Dec 2006)
New Revision: 20157
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20157
Log:
get rid of a few no previous prototype warnings
Modified:
branches/SAMBA_3_0_24/source/lib/interfaces.c
branches/SAMBA_3_0_24/source/lib/talloc/talloc.h
branches/SAMBA_3_0_24/source/libaddns/dns.h
branches/SAMBA_3_0_24/source/printing/print_cups.c
branches/SAMBA_3_0_24/source/printing/print_iprint.c
branches/SAMBA_3_0_24/source/smbd/oplock_irix.c
branches/SAMBA_3_0_24/source/smbd/server.c
branches/SAMBA_3_0_24/source/utils/status_profile.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/interfaces.c
===
--- branches/SAMBA_3_0_24/source/lib/interfaces.c 2006-12-13 21:19:33 UTC
(rev 20156)
+++ branches/SAMBA_3_0_24/source/lib/interfaces.c 2006-12-13 21:24:02 UTC
(rev 20157)
@@ -362,6 +362,7 @@
return r;
}
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
/* this wrapper is used to remove duplicates from the interface list generated
above */
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
Modified: branches/SAMBA_3_0_24/source/lib/talloc/talloc.h
===
--- branches/SAMBA_3_0_24/source/lib/talloc/talloc.h2006-12-13 21:19:33 UTC
(rev 20156)
+++ branches/SAMBA_3_0_24/source/lib/talloc/talloc.h2006-12-13 21:24:02 UTC
(rev 20157)
@@ -123,6 +123,7 @@
const char *talloc_get_name(const void *ptr);
void *talloc_check_name(const void *ptr, const char *name);
void *talloc_parent(const void *ptr);
+const char *talloc_parent_name(const void *context);
void *talloc_init(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
int talloc_free(void *ptr);
void talloc_free_children(void *ptr);
Modified: branches/SAMBA_3_0_24/source/libaddns/dns.h
===
--- branches/SAMBA_3_0_24/source/libaddns/dns.h 2006-12-13 21:19:33 UTC (rev
20156)
+++ branches/SAMBA_3_0_24/source/libaddns/dns.h 2006-12-13 21:24:02 UTC (rev
20157)
@@ -405,6 +405,9 @@
const char *name,
const in_addr_t *ip,
struct dns_rrec **prec);
+DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx,
+ const char *name, uint32 type,
+ struct dns_rrec **prec);
DNS_ERROR dns_create_delete_record(TALLOC_CTX *mem_ctx, const char *name,
uint16 type, uint16 r_class,
struct dns_rrec **prec);
Modified: branches/SAMBA_3_0_24/source/printing/print_cups.c
===
--- branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-13 21:19:33 UTC
(rev 20156)
+++ branches/SAMBA_3_0_24/source/printing/print_cups.c 2006-12-13 21:24:02 UTC
(rev 20157)
@@ -1201,5 +1201,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_cups_dummy(void);
void print_cups_dummy(void) {}
#endif /* HAVE_CUPS */
Modified: branches/SAMBA_3_0_24/source/printing/print_iprint.c
===
--- branches/SAMBA_3_0_24/source/printing/print_iprint.c2006-12-13
21:19:33 UTC (rev 20156)
+++ branches/SAMBA_3_0_24/source/printing/print_iprint.c2006-12-13
21:24:02 UTC (rev 20157)
@@ -1235,5 +1235,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_iprint_dummy(void);
void print_iprint_dummy(void) {}
#endif /* HAVE_IPRINT */
Modified: branches/SAMBA_3_0_24/source/smbd/oplock_irix.c
===
--- branches/SAMBA_3_0_24/source/smbd/oplock_irix.c 2006-12-13 21:19:33 UTC
(rev 20156)
+++ branches/SAMBA_3_0_24/source/smbd/oplock_irix.c 2006-12-13 21:24:02 UTC
(rev 20157)
@@ -266,5 +266,6 @@
return koplocks;
}
#else
+ void oplock_irix_dummy(void);
void oplock_irix_dummy(void) {}
#endif /* HAVE_KERNEL_OPLOCKS_IRIX */
Modified: branches/SAMBA_3_0_24/source/smbd/server.c
===
--- branches/SAMBA_3_0_24/source/smbd/server.c 2006-12-13 21:19:33 UTC (rev
20156)
+++ branches/SAMBA_3_0_24/source/smbd/server.c 2006-12-13 21:24:02 UTC (rev
20157)
@@ -786,7 +786,7 @@
mkproto.h. Mixing $(builddir) and $(srcdir) source files in the current
prototype generation system is too complicated. */
-void build_options(BOOL screen);
+extern void build_options(BOOL screen);
int main(int argc,const char *argv[])
{
Modified: branches/SAMBA_3_0_24/source/utils/status_profile.c
===
--- branches/SAMBA_3_0_24/source/utils
svn commit: samba r20158 - in branches/SAMBA_3_0_24/source/libads: .
Author: herb Date: 2006-12-13 21:27:45 + (Wed, 13 Dec 2006) New Revision: 20158 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20158 Log: get rid of defined but not used warning - static function only used inside the #ifdef HAVE_KRB5 Modified: branches/SAMBA_3_0_24/source/libads/sasl.c Changeset: Modified: branches/SAMBA_3_0_24/source/libads/sasl.c === --- branches/SAMBA_3_0_24/source/libads/sasl.c 2006-12-13 21:24:02 UTC (rev 20157) +++ branches/SAMBA_3_0_24/source/libads/sasl.c 2006-12-13 21:27:45 UTC (rev 20158) @@ -136,6 +136,7 @@ return ADS_ERROR(rc); } +#ifdef HAVE_KRB5 /* perform a LDAP/SASL/SPNEGO/KRB5 bind */ @@ -165,6 +166,7 @@ return ADS_ERROR(rc); } +#endif /* this performs a SASL/SPNEGO bind
svn commit: samba r20159 - in branches/SAMBA_3_0_24/source/lib: .
Author: herb
Date: 2006-12-13 21:28:45 + (Wed, 13 Dec 2006)
New Revision: 20159
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20159
Log:
get rid of defined but not used warning - static function only used
inside the #ifdef HAVE_NATIVE_ICONV
Modified:
branches/SAMBA_3_0_24/source/lib/iconv.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/iconv.c
===
--- branches/SAMBA_3_0_24/source/lib/iconv.c2006-12-13 21:27:45 UTC (rev
20158)
+++ branches/SAMBA_3_0_24/source/lib/iconv.c2006-12-13 21:28:45 UTC (rev
20159)
@@ -128,6 +128,7 @@
}
}
+#ifdef HAVE_NATIVE_ICONV
/* if there was an error then reset the internal state,
this ensures that we don't have a shift state remaining for
character sets like SJIS */
@@ -135,7 +136,6 @@
const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
-#ifdef HAVE_NATIVE_ICONV
size_t ret = iconv((iconv_t)cd,
(char **)inbuf, inbytesleft,
outbuf, outbytesleft);
@@ -145,11 +145,8 @@
errno = saved_errno;
}
return ret;
-#else
- errno = EINVAL;
- return -1;
-#endif
}
+#endif
/**
* This is a simple portable iconv() implementaion.
svn commit: samba r20124 - in branches/SAMBA_3_0/source: client include libsmb modules nsswitch printing smbd
Author: herb
Date: 2006-12-12 17:38:42 + (Tue, 12 Dec 2006)
New Revision: 20124
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20124
Log:
clean up nested extern declaration warnings
Modified:
branches/SAMBA_3_0/source/client/smbmount.c
branches/SAMBA_3_0/source/include/smb_macros.h
branches/SAMBA_3_0/source/libsmb/clientgen.c
branches/SAMBA_3_0/source/modules/vfs_expand_msdfs.c
branches/SAMBA_3_0/source/modules/vfs_full_audit.c
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
branches/SAMBA_3_0/source/printing/print_generic.c
branches/SAMBA_3_0/source/printing/printing.c
branches/SAMBA_3_0/source/smbd/blocking.c
branches/SAMBA_3_0/source/smbd/nttrans.c
branches/SAMBA_3_0/source/smbd/sesssetup.c
Changeset:
Modified: branches/SAMBA_3_0/source/client/smbmount.c
===
--- branches/SAMBA_3_0/source/client/smbmount.c 2006-12-12 17:37:41 UTC (rev
20123)
+++ branches/SAMBA_3_0/source/client/smbmount.c 2006-12-12 17:38:42 UTC (rev
20124)
@@ -26,6 +26,8 @@
extern BOOL in_client;
extern pstring user_socket_options;
+extern char *optarg;
+extern int optind;
static pstring credentials;
static pstring my_netbios_name;
@@ -712,7 +714,6 @@
int opt;
char *opts;
char *opteq;
- extern char *optarg;
int val;
char *p;
@@ -862,8 +863,6 @@
/
int main(int argc,char *argv[])
{
- extern char *optarg;
- extern int optind;
char *p;
DEBUGLEVEL = 1;
Modified: branches/SAMBA_3_0/source/include/smb_macros.h
===
--- branches/SAMBA_3_0/source/include/smb_macros.h 2006-12-12 17:37:41 UTC
(rev 20123)
+++ branches/SAMBA_3_0/source/include/smb_macros.h 2006-12-12 17:38:42 UTC
(rev 20124)
@@ -86,10 +86,10 @@
#define IS_IPC(conn) ((conn) (conn)-ipc)
#define IS_PRINT(conn) ((conn) (conn)-printer)
/* you must add the following extern declaration to files using this macro
+ * (do not add it to the macro as that causes nested extern declaration
warnings)
* extern struct current_user current_user;
*/
#define FSP_BELONGS_CONN(fsp,conn) do {\
- extern struct current_user current_user;\
if (!((fsp) (conn) ((conn)==(fsp)-conn)
(current_user.vuid==(fsp)-vuid))) \
return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
} while(0)
@@ -97,10 +97,10 @@
#define FNUM_OK(fsp,c) ((fsp) !(fsp)-is_directory (c)==(fsp)-conn
current_user.vuid==(fsp)-vuid)
/* you must add the following extern declaration to files using this macro
+ * (do not add it to the macro as that causes nested extern declaration
warnings)
* extern struct current_user current_user;
*/
#define CHECK_FSP(fsp,conn) do {\
- extern struct current_user current_user;\
if (!(fsp) || !(conn)) \
return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
else if (((conn) != (fsp)-conn) || current_user.vuid
!= (fsp)-vuid) \
Modified: branches/SAMBA_3_0/source/libsmb/clientgen.c
===
--- branches/SAMBA_3_0/source/libsmb/clientgen.c2006-12-12 17:37:41 UTC
(rev 20123)
+++ branches/SAMBA_3_0/source/libsmb/clientgen.c2006-12-12 17:38:42 UTC
(rev 20124)
@@ -20,6 +20,8 @@
#include includes.h
+extern int smb_read_error;
+
/
Change the timeout (in milliseconds).
/
@@ -79,7 +81,6 @@
BOOL cli_receive_smb(struct cli_state *cli)
{
- extern int smb_read_error;
BOOL ret;
/* fd == -1 causes segfaults -- Tom ([EMAIL PROTECTED]) */
Modified: branches/SAMBA_3_0/source/modules/vfs_expand_msdfs.c
===
--- branches/SAMBA_3_0/source/modules/vfs_expand_msdfs.c2006-12-12
17:37:41 UTC (rev 20123)
+++ branches/SAMBA_3_0/source/modules/vfs_expand_msdfs.c2006-12-12
17:38:42 UTC (rev 20124)
@@ -23,6 +23,8 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
+extern userdom_struct current_user_info;
+
/**
Under mapfile we expect a table of the following format:
@@ -110,7 +112,6 @@
int filename_len;
pstring targethost;
pstring new_target;
- extern userdom_struct current_user_info
svn commit: samba r20131 - in branches/SAMBA_3_0/source: lib lib/talloc libaddns printing smbd utils
Author: herb
Date: 2006-12-12 20:15:47 + (Tue, 12 Dec 2006)
New Revision: 20131
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20131
Log:
get rid of a few no previous prototype warnings
Modified:
branches/SAMBA_3_0/source/lib/interfaces.c
branches/SAMBA_3_0/source/lib/talloc/talloc.h
branches/SAMBA_3_0/source/libaddns/dns.h
branches/SAMBA_3_0/source/printing/print_cups.c
branches/SAMBA_3_0/source/printing/print_iprint.c
branches/SAMBA_3_0/source/smbd/oplock_irix.c
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0/source/utils/status_profile.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/interfaces.c
===
--- branches/SAMBA_3_0/source/lib/interfaces.c 2006-12-12 19:02:14 UTC (rev
20130)
+++ branches/SAMBA_3_0/source/lib/interfaces.c 2006-12-12 20:15:47 UTC (rev
20131)
@@ -362,6 +362,7 @@
return r;
}
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
/* this wrapper is used to remove duplicates from the interface list generated
above */
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h
===
--- branches/SAMBA_3_0/source/lib/talloc/talloc.h 2006-12-12 19:02:14 UTC
(rev 20130)
+++ branches/SAMBA_3_0/source/lib/talloc/talloc.h 2006-12-12 20:15:47 UTC
(rev 20131)
@@ -123,6 +123,7 @@
const char *talloc_get_name(const void *ptr);
void *talloc_check_name(const void *ptr, const char *name);
void *talloc_parent(const void *ptr);
+const char *talloc_parent_name(const void *context);
void *talloc_init(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
int talloc_free(void *ptr);
void talloc_free_children(void *ptr);
Modified: branches/SAMBA_3_0/source/libaddns/dns.h
===
--- branches/SAMBA_3_0/source/libaddns/dns.h2006-12-12 19:02:14 UTC (rev
20130)
+++ branches/SAMBA_3_0/source/libaddns/dns.h2006-12-12 20:15:47 UTC (rev
20131)
@@ -405,6 +405,9 @@
const char *name,
const in_addr_t *ip,
struct dns_rrec **prec);
+DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx,
+ const char *name, uint32 type,
+ struct dns_rrec **prec);
DNS_ERROR dns_create_delete_record(TALLOC_CTX *mem_ctx, const char *name,
uint16 type, uint16 r_class,
struct dns_rrec **prec);
Modified: branches/SAMBA_3_0/source/printing/print_cups.c
===
--- branches/SAMBA_3_0/source/printing/print_cups.c 2006-12-12 19:02:14 UTC
(rev 20130)
+++ branches/SAMBA_3_0/source/printing/print_cups.c 2006-12-12 20:15:47 UTC
(rev 20131)
@@ -1201,5 +1201,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_cups_dummy(void);
void print_cups_dummy(void) {}
#endif /* HAVE_CUPS */
Modified: branches/SAMBA_3_0/source/printing/print_iprint.c
===
--- branches/SAMBA_3_0/source/printing/print_iprint.c 2006-12-12 19:02:14 UTC
(rev 20130)
+++ branches/SAMBA_3_0/source/printing/print_iprint.c 2006-12-12 20:15:47 UTC
(rev 20131)
@@ -1235,5 +1235,6 @@
#else
/* this keeps fussy compilers happy */
+ void print_iprint_dummy(void);
void print_iprint_dummy(void) {}
#endif /* HAVE_IPRINT */
Modified: branches/SAMBA_3_0/source/smbd/oplock_irix.c
===
--- branches/SAMBA_3_0/source/smbd/oplock_irix.c2006-12-12 19:02:14 UTC
(rev 20130)
+++ branches/SAMBA_3_0/source/smbd/oplock_irix.c2006-12-12 20:15:47 UTC
(rev 20131)
@@ -266,5 +266,6 @@
return koplocks;
}
#else
+ void oplock_irix_dummy(void);
void oplock_irix_dummy(void) {}
#endif /* HAVE_KERNEL_OPLOCKS_IRIX */
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2006-12-12 19:02:14 UTC (rev
20130)
+++ branches/SAMBA_3_0/source/smbd/server.c 2006-12-12 20:15:47 UTC (rev
20131)
@@ -786,7 +786,7 @@
mkproto.h. Mixing $(builddir) and $(srcdir) source files in the current
prototype generation system is too complicated. */
-void build_options(BOOL screen);
+extern void build_options(BOOL screen);
int main(int argc,const char *argv[])
{
Modified: branches/SAMBA_3_0/source/utils/status_profile.c
===
--- branches/SAMBA_3_0/source/utils/status_profile.c2006-12-12 19:02:14 UTC
(rev 20130)
+++ branches/SAMBA_3_0/source/utils
svn commit: samba r20132 - in branches/SAMBA_3_0/source/libads: .
Author: herb Date: 2006-12-12 20:27:01 + (Tue, 12 Dec 2006) New Revision: 20132 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20132 Log: get rid of defined but not used warning - static function only used inside the #ifdef HAVE_KRB5 Modified: branches/SAMBA_3_0/source/libads/sasl.c Changeset: Modified: branches/SAMBA_3_0/source/libads/sasl.c === --- branches/SAMBA_3_0/source/libads/sasl.c 2006-12-12 20:15:47 UTC (rev 20131) +++ branches/SAMBA_3_0/source/libads/sasl.c 2006-12-12 20:27:01 UTC (rev 20132) @@ -136,6 +136,7 @@ return ADS_ERROR(rc); } +#ifdef HAVE_KRB5 /* perform a LDAP/SASL/SPNEGO/KRB5 bind */ @@ -165,6 +166,7 @@ return ADS_ERROR(rc); } +#endif /* this performs a SASL/SPNEGO bind
svn commit: samba r20133 - in branches/SAMBA_3_0/source/lib: .
Author: herb
Date: 2006-12-12 20:30:31 + (Tue, 12 Dec 2006)
New Revision: 20133
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20133
Log:
get rid of defined but not used warning - static function only used
inside the #ifdef HAVE_NATIVE_ICONV
Modified:
branches/SAMBA_3_0/source/lib/iconv.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/iconv.c
===
--- branches/SAMBA_3_0/source/lib/iconv.c 2006-12-12 20:27:01 UTC (rev
20132)
+++ branches/SAMBA_3_0/source/lib/iconv.c 2006-12-12 20:30:31 UTC (rev
20133)
@@ -128,6 +128,7 @@
}
}
+#ifdef HAVE_NATIVE_ICONV
/* if there was an error then reset the internal state,
this ensures that we don't have a shift state remaining for
character sets like SJIS */
@@ -135,7 +136,6 @@
const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
-#ifdef HAVE_NATIVE_ICONV
size_t ret = iconv((iconv_t)cd,
(char **)inbuf, inbytesleft,
outbuf, outbytesleft);
@@ -145,11 +145,8 @@
errno = saved_errno;
}
return ret;
-#else
- errno = EINVAL;
- return -1;
-#endif
}
+#endif
/**
* This is a simple portable iconv() implementaion.
svn commit: samba-docs r979 - in trunk/manpages-3: .
Author: herb Date: 2006-07-19 20:39:44 + (Wed, 19 Jul 2006) New Revision: 979 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=979 Log: update wbinfo manpage Modified: trunk/manpages-3/wbinfo.1.xml Changeset: Modified: trunk/manpages-3/wbinfo.1.xml === --- trunk/manpages-3/wbinfo.1.xml 2006-07-18 01:29:55 UTC (rev 978) +++ trunk/manpages-3/wbinfo.1.xml 2006-07-19 20:39:44 UTC (rev 979) @@ -17,29 +17,36 @@ cmdsynopsis commandwbinfo/command arg choice=opt-a user%password/arg - arg choice=opt-c username/arg - arg choice=opt-C groupname/arg + arg choice=opt--all-domains/arg + arg choice=opt--allocate-gid/arg + arg choice=opt--allocate-uid/arg + arg choice=opt-D domain/arg arg choice=opt--domain domain/arg - arg choice=opt-I ip/arg - arg choice=opt-s sid/arg - arg choice=opt-u/arg - arg choice=opt-U uid/arg arg choice=opt-g/arg + arg choice=opt--getdcname domain/arg arg choice=opt--get-auth-user/arg arg choice=opt-G gid/arg + arg choice=opt-h/arg + arg choice=opt-i user/arg + arg choice=opt-I ip/arg + arg choice=opt-K user%password/arg arg choice=opt-m/arg arg choice=opt-n name/arg arg choice=opt-N netbios-name/arg - arg choice=opt-o user:group/arg - arg choice=opt-O user:group/arg + arg choice=opt--own-domain/arg arg choice=opt-p/arg arg choice=opt-r user/arg + arg choice=opt-s sid/arg + arg choice=opt--separator/arg + arg choice=opt--sequence/arg arg choice=opt--set-auth-user user%password/arg - arg choice=opt--sequence/arg arg choice=opt-S sid/arg arg choice=opt-t/arg - arg choice=opt-x username/arg - arg choice=opt-X groupname/arg + arg choice=opt-u/arg + arg choice=opt--user-domgroups sid/arg + arg choice=opt--user-sids sid/arg + arg choice=opt-U uid/arg + arg choice=opt-V/arg arg choice=opt-Y sid/arg /cmdsynopsis /refsynopsisdiv @@ -65,7 +72,7 @@ variablelist varlistentry - term-a username%password/term + term-a|--authenticate username%password/term listitemparaAttempt to authenticate a user via winbindd. This checks both authenticaion methods and reports its results. /paranoteparaDo not be tempted to use this @@ -75,18 +82,25 @@ /varlistentry varlistentry - term-c user/term - listitemparaCreate a local winbind user. + term--allocate-gid/term + listitemparaGet a new GID out of idmap /para/listitem /varlistentry - + varlistentry - term-C group/term - listitemparaCreate a local winbindd group. + term--allocate-uid/term + listitemparaGet a new UID out of idmap /para/listitem /varlistentry - + varlistentry + term--all-domains/term + listitemparaList all domains (trusted and + own domain). + /para/listitem + /varlistentry + + varlistentry term--domain name/term listitemparaThis parameter sets the domain on which any specified operations will performed. If special domain name '.' is used to represent @@ -97,7 +111,13 @@ /varlistentry varlistentry - term-g/term + term-D|--domain-info domain/term + listitemparaShow most of the info we have about the domain. + /para/listitem + /varlistentry + + varlistentry + term-g|--domain-groups/term listitemparaThis option will list all groups available in the Windows NT domain for which the citerefentryrefentrytitlesamba/refentrytitle manvolnum7/manvolnum/citerefentry daemon is operating in. Groups in all trusted domains @@ -111,19 +131,31 @@ term--get-auth-user/term listitemparaPrint username and password used by winbindd during session setup to a domain controller. Username - and password can be set using '-A'. Only available
svn commit: samba r9057 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2005-08-04 15:07:17 + (Thu, 04 Aug 2005) New Revision: 9057 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9057 Log: fix cut-and-paste error Modified: branches/SAMBA_3_0/source/VERSION Changeset: Modified: branches/SAMBA_3_0/source/VERSION === --- branches/SAMBA_3_0/source/VERSION 2005-08-04 07:27:25 UTC (rev 9056) +++ branches/SAMBA_3_0/source/VERSION 2005-08-04 15:07:17 UTC (rev 9057) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r9058 - in trunk/source: .
Author: herb Date: 2005-08-04 15:09:18 + (Thu, 04 Aug 2005) New Revision: 9058 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=9058 Log: fix cut-and-paste error Modified: trunk/source/VERSION Changeset: Modified: trunk/source/VERSION === --- trunk/source/VERSION2005-08-04 15:07:17 UTC (rev 9057) +++ trunk/source/VERSION2005-08-04 15:09:18 UTC (rev 9058) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # MAJOR.MINOR.RELEASEREVISION # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# SAMBA_VERSION_REVISION=
svn commit: samba r6636 - in trunk/source/tdb: .
Author: herb Date: 2005-05-06 18:35:41 + (Fri, 06 May 2005) New Revision: 6636 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6636 Log: merge change 6623 from SAMBA_3_0 Modified: trunk/source/tdb/tdb.c trunk/source/tdb/tdbdump.c trunk/source/tdb/tdbtool.c Changeset: Sorry, the patch is too large (762 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6636
svn commit: samba r6623 - in branches/SAMBA_3_0/source/tdb: .
Author: herb Date: 2005-05-06 01:28:02 + (Fri, 06 May 2005) New Revision: 6623 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6623 Log: This change fixes a few broken commands plus adds some new commands. It also restructures it so you can execute a single command from the command line. Input strings are parsed to allow input of arbitrary characters using the \xx syntax for hex values. Modified: branches/SAMBA_3_0/source/tdb/tdb.c branches/SAMBA_3_0/source/tdb/tdbdump.c branches/SAMBA_3_0/source/tdb/tdbtool.c Changeset: Sorry, the patch is too large (762 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6623
svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:49:43 + (Mon, 02 May 2005)
New Revision: 6586
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6586
Log:
get rid of a few more compiler warnings
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
branches/SAMBA_3_0/source/lib/interfaces.c
branches/SAMBA_3_0/source/lib/sysquotas.c
branches/SAMBA_3_0/source/lib/sysquotas_4A.c
branches/SAMBA_3_0/source/lib/sysquotas_linux.c
branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libsmb/clikrb5.c
branches/SAMBA_3_0/source/smbd/notify_kernel.c
branches/SAMBA_3_0/source/smbd/oplock_linux.c
branches/SAMBA_3_0/source/tests/shlib.c
branches/SAMBA_3_0/source/tests/sysquotas.c
branches/SAMBA_3_0/source/torture/denytest.c
branches/SAMBA_3_0/source/torture/mangle_test.c
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: branches/SAMBA_3_0/source/lib/interfaces.c
===
--- branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: branches/SAMBA_3_0/source/lib/sysquotas.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/sysquotas_4A.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 17:49:43 UTC
(rev 6586)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_linux.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -248,7 +248,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service
svn commit: samba r6587 - in trunk/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:53:09 + (Mon, 02 May 2005)
New Revision: 6587
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6587
Log:
merge change 6586 from SAMBA_3_0
Modified:
trunk/source/lib/dummyroot.c
trunk/source/lib/dummysmbd.c
trunk/source/lib/interfaces.c
trunk/source/lib/sysquotas.c
trunk/source/lib/sysquotas_4A.c
trunk/source/lib/sysquotas_linux.c
trunk/source/lib/sysquotas_xfs.c
trunk/source/libads/kerberos.c
trunk/source/libsmb/clikrb5.c
trunk/source/smbd/notify_kernel.c
trunk/source/smbd/oplock_linux.c
trunk/source/tests/shlib.c
trunk/source/tests/sysquotas.c
trunk/source/torture/denytest.c
trunk/source/torture/mangle_test.c
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/lib/dummyroot.c
===
--- trunk/source/lib/dummyroot.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummyroot.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: trunk/source/lib/dummysmbd.c
===
--- trunk/source/lib/dummysmbd.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummysmbd.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: trunk/source/lib/interfaces.c
===
--- trunk/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/interfaces.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: trunk/source/lib/sysquotas.c
===
--- trunk/source/lib/sysquotas.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: trunk/source/lib/sysquotas_4A.c
===
--- trunk/source/lib/sysquotas_4A.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_4A.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: trunk/source/lib/sysquotas_linux.c
===
--- trunk/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_linux.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: trunk/source/lib/sysquotas_xfs.c
===
--- trunk/source/lib/sysquotas_xfs.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_xfs.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: trunk/source/libads/kerberos.c
===
--- trunk/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libads/kerberos.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -247,7 +247,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
int enctype,
const char *principal)
{
Modified: trunk/source/libsmb/clikrb5.c
===
--- trunk/source/libsmb/clikrb5.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libsmb/clikrb5.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -525,11 +525,13 @@
#if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING)
!defined(HAVE_KRB5_PRINC_COMPONENT)
+ const krb5_data
svn commit: samba r6588 - in branches/SAMBA_3_0/source/lib: .
Author: herb
Date: 2005-05-02 21:30:57 + (Mon, 02 May 2005)
New Revision: 6588
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6588
Log:
just include includes.h to get prototypes here.
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,8 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void become_root(void);
-void unbecome_root(void);
+#include includes.h
void become_root(void)
{
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,7 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void decrement_smbd_process_count( void );
+#include includes.h
void decrement_smbd_process_count( void )
{
svn commit: samba r6502 - in branches/SAMBA_3_0/source: include lib locking smbd
Author: herb Date: 2005-04-27 18:32:37 + (Wed, 27 Apr 2005) New Revision: 6502 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6502 Log: add LOCKING debug class - pull PRINTINGDB class definition from trunk so our numbers don't get out of sync Modified: branches/SAMBA_3_0/source/include/debug.h branches/SAMBA_3_0/source/lib/debug.c branches/SAMBA_3_0/source/lib/util.c branches/SAMBA_3_0/source/locking/brlock.c branches/SAMBA_3_0/source/locking/locking.c branches/SAMBA_3_0/source/locking/posix.c branches/SAMBA_3_0/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_0/source/include/debug.h === --- branches/SAMBA_3_0/source/include/debug.h 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/include/debug.h 2005-04-27 18:32:37 UTC (rev 6502) @@ -94,6 +94,8 @@ #define DBGC_IDMAP 13 #define DBGC_QUOTA 14 #define DBGC_ACLS 15 +#define DBGC_PRINTERDB 16 +#define DBGC_LOCKING 17 /* So you can define DBGC_CLASS before including debug.h */ #ifndef DBGC_CLASS Modified: branches/SAMBA_3_0/source/lib/debug.c === --- branches/SAMBA_3_0/source/lib/debug.c 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/lib/debug.c 2005-04-27 18:32:37 UTC (rev 6502) @@ -164,6 +164,8 @@ idmap, /* DBGC_IDMAP*/ quota, /* DBGC_QUOTA*/ acls, /* DBGC_ACLS */ + printerdb, /* DBGC_PRINTERDB*/ + locking, /* DBGC_LOCKING */ NULL }; Modified: branches/SAMBA_3_0/source/lib/util.c === --- branches/SAMBA_3_0/source/lib/util.c2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/lib/util.c2005-04-27 18:32:37 UTC (rev 6502) @@ -1793,6 +1793,9 @@ SAFE_FREE(name_array); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + / Simple routine to do POSIX file locking. Cruft in NFS and 64-32 bit mapping is dealt with in posix.c @@ -1843,6 +1846,9 @@ return(True); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_ALL + /*** Is the name specified one of my netbios names. Returns true if it is equal, false otherwise. Modified: branches/SAMBA_3_0/source/locking/brlock.c === --- branches/SAMBA_3_0/source/locking/brlock.c 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/locking/brlock.c 2005-04-27 18:32:37 UTC (rev 6502) @@ -27,6 +27,9 @@ #include includes.h +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + #define ZERO_ZERO 0 /* This contains elements that differentiate locks. The smbpid is a Modified: branches/SAMBA_3_0/source/locking/locking.c === --- branches/SAMBA_3_0/source/locking/locking.c 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/locking/locking.c 2005-04-27 18:32:37 UTC (rev 6502) @@ -37,6 +37,9 @@ #include includes.h uint16 global_smbpid; +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + /* the locking database handle */ static TDB_CONTEXT *tdb; Modified: branches/SAMBA_3_0/source/locking/posix.c === --- branches/SAMBA_3_0/source/locking/posix.c 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/locking/posix.c 2005-04-27 18:32:37 UTC (rev 6502) @@ -24,6 +24,9 @@ #include includes.h +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + /* * The POSIX locking database handle. */ Modified: branches/SAMBA_3_0/source/smbd/reply.c === --- branches/SAMBA_3_0/source/smbd/reply.c 2005-04-27 14:05:02 UTC (rev 6501) +++ branches/SAMBA_3_0/source/smbd/reply.c 2005-04-27 18:32:37 UTC (rev 6502) @@ -2129,6 +2129,9 @@ return -1; } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + / Reply to a lockread (core+ protocol). / @@ -,6 +2225,9 @@ return(outsize); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_ALL + / Reply to a read. / @@ -2610,6 +2616,9 @@ return(outsize); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING
svn commit: samba r6503 - in trunk/source: include lib locking smbd
Author: herb Date: 2005-04-27 18:43:43 + (Wed, 27 Apr 2005) New Revision: 6503 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6503 Log: pull change 6502 from samba_3_0 (add LOCKING debug class) Modified: trunk/source/include/debug.h trunk/source/lib/debug.c trunk/source/lib/util.c trunk/source/locking/brlock.c trunk/source/locking/locking.c trunk/source/locking/posix.c trunk/source/smbd/reply.c Changeset: Modified: trunk/source/include/debug.h === --- trunk/source/include/debug.h2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/include/debug.h2005-04-27 18:43:43 UTC (rev 6503) @@ -95,6 +95,7 @@ #define DBGC_QUOTA 14 #define DBGC_ACLS 15 #define DBGC_PRINTERDB 16 +#define DBGC_LOCKING 17 /* So you can define DBGC_CLASS before including debug.h */ #ifndef DBGC_CLASS Modified: trunk/source/lib/debug.c === --- trunk/source/lib/debug.c2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/lib/debug.c2005-04-27 18:43:43 UTC (rev 6503) @@ -165,6 +165,7 @@ quota, /* DBGC_QUOTA*/ acls, /* DBGC_ACLS */ printerdb, /* DBGC_PRINTERDB*/ + locking, /* DBGC_LOCKING */ NULL }; Modified: trunk/source/lib/util.c === --- trunk/source/lib/util.c 2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/lib/util.c 2005-04-27 18:43:43 UTC (rev 6503) @@ -1793,6 +1793,9 @@ SAFE_FREE(name_array); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + / Simple routine to do POSIX file locking. Cruft in NFS and 64-32 bit mapping is dealt with in posix.c @@ -1843,6 +1846,9 @@ return(True); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_ALL + /*** Is the name specified one of my netbios names. Returns true if it is equal, false otherwise. Modified: trunk/source/locking/brlock.c === --- trunk/source/locking/brlock.c 2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/locking/brlock.c 2005-04-27 18:43:43 UTC (rev 6503) @@ -27,6 +27,9 @@ #include includes.h +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + #define ZERO_ZERO 0 /* This contains elements that differentiate locks. The smbpid is a Modified: trunk/source/locking/locking.c === --- trunk/source/locking/locking.c 2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/locking/locking.c 2005-04-27 18:43:43 UTC (rev 6503) @@ -37,6 +37,9 @@ #include includes.h uint16 global_smbpid; +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + /* the locking database handle */ static TDB_CONTEXT *tdb; Modified: trunk/source/locking/posix.c === --- trunk/source/locking/posix.c2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/locking/posix.c2005-04-27 18:43:43 UTC (rev 6503) @@ -24,6 +24,9 @@ #include includes.h +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + /* * The POSIX locking database handle. */ Modified: trunk/source/smbd/reply.c === --- trunk/source/smbd/reply.c 2005-04-27 18:32:37 UTC (rev 6502) +++ trunk/source/smbd/reply.c 2005-04-27 18:43:43 UTC (rev 6503) @@ -2129,6 +2129,9 @@ return -1; } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + / Reply to a lockread (core+ protocol). / @@ -,6 +2225,9 @@ return(outsize); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_ALL + / Reply to a read. / @@ -2610,6 +2616,9 @@ return(outsize); } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_LOCKING + / Reply to a writeunlock (core+). / @@ -2674,6 +2683,9 @@ return outsize; } +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_ALL + / Reply to a write. / @@ -3121,6 +3133,9 @@ return(outsize); } +#undef
svn commit: samba r6318 - in branches/SAMBA_3_0/source: . include
Author: herb
Date: 2005-04-12 18:59:49 + (Tue, 12 Apr 2005)
New Revision: 6318
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6318
Log:
don't include smbwrapper stuff unless asked for
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/source/include/includes.h
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2005-04-12 17:30:18 UTC (rev
6317)
+++ branches/SAMBA_3_0/source/Makefile.in 2005-04-12 18:59:49 UTC (rev
6318)
@@ -98,7 +98,7 @@
LIBSMBCLIENT_MINOR=1
-FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx
-I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir)
+FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx
@SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir)
FLAGS2 =
FLAGS3 =
FLAGS4 =
@@ -617,8 +617,8 @@
PROTO_OBJ = $(SMBD_OBJ_MAIN) \
$(SMBD_OBJ_SRV) $(NMBD_OBJ1) $(SWAT_OBJ1) $(LIB_OBJ) $(LIBSMB_OBJ) \
- $(SMBW_OBJ1) $(SMBWRAPPER_OBJ1) $(SMBTORTURE_OBJ1)
$(RPCCLIENT_OBJ1) \
- $(LIBMSRPC_OBJ) \
+ $(SMBTORTURE_OBJ1) $(RPCCLIENT_OBJ1) \
+ $(LIBMSRPC_OBJ) @SMBWRAP_OBJS@ \
$(RPC_PIPE_OBJ) $(RPC_PARSE_OBJ) $(KRBCLIENT_OBJ) \
$(AUTH_OBJ) $(PARAM_OBJ) $(LOCKING_OBJ) $(SECRETS_OBJ) \
$(PRINTING_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) $(NOTIFY_OBJ) \
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2005-04-12 17:30:18 UTC (rev
6317)
+++ branches/SAMBA_3_0/source/configure.in 2005-04-12 18:59:49 UTC (rev
6318)
@@ -225,6 +225,8 @@
AC_SUBST(LDAP_LIBS)
AC_SUBST(SHLIB_PROGS)
AC_SUBST(SMBWRAPPER)
+AC_SUBST(SMBWRAP_OBJS)
+AC_SUBST(SMBWRAP_INC)
AC_SUBST(EXTRA_BIN_PROGS)
AC_SUBST(EXTRA_SBIN_PROGS)
AC_SUBST(EXTRA_ALL_TARGETS)
@@ -1193,7 +1195,7 @@
if test $enable_shared = yes; then
# this bit needs to be modified for each OS that is suported by
- # smbwrapper. You need to specify how to created a shared library and
+ # smbwrapper. You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
AC_MSG_CHECKING([ability to build shared libraries])
@@ -2094,7 +2096,7 @@
AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
SAVE_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx
-I${srcdir-.}/popt -I${srcdir-.}/smbwrapper
+CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx
-I${srcdir-.}/popt
AC_TRY_COMPILE([
#define REPLACE_GETPASS 1
#define NO_PROTO_H 1
@@ -2410,6 +2412,8 @@
AC_DEFINE(WITH_SMBWRAPPER,1,[Whether to include smbwrapper support])
WRAPPROG=bin/smbsh\$(EXEEXT)
WRAP=bin/smbwrapper.$SHLIBEXT
+ WRAP_OBJS=\$(SMBW_OBJ1) \$(SMBWRAPPER_OBJ1)
+ WRAP_INC=-I\$(srcdir)/smbwrapper
# Conditions under which smbwrapper should not be built.
@@ -2417,13 +2421,19 @@
echo No support for PIC code - disabling smbwrapper and smbsh
WRAPPROG=
WRAP=
+ WRAP_OBJS=
+ WRAP_INC=
elif test x$ac_cv_func_syscall = xno; then
AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh])
WRAPPROG=
WRAP=
+ WRAP_OBJS=
+ WRAP_INC=
fi
EXTRA_ALL_TARGETS=$EXTRA_ALL_TARGETS $WRAPPROG $WRAP
SMBWRAPPER=$WRAPPROG $WRAP
+ SMBWRAP_OBJS=$WRAP_OBJS
+ SMBWRAP_INC=$WRAP_INC
;;
*)
AC_MSG_RESULT(no)
@@ -3539,7 +3549,7 @@
if test x$samba_cv_SYSQUOTA_FOUND != xno; then
AC_CACHE_CHECK([whether the sys_quota interface
works],samba_cv_SYSQUOTA_WORKS,[
SAVE_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include
-I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper
-I${srcdir-.}/nsswitch
+CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include
-I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch
AC_TRY_COMPILE([
#include confdefs.h
#define NO_PROTO_H 1
@@ -3566,7 +3576,7 @@
if test x$samba_cv_SYSQUOTA_FOUND != xno -a x$samba_cv_found_xfs_header
= xyes; then
AC_CACHE_CHECK([whether the sys_quota interface works with
XFS],samba_cv_SYSQUOTA_WORKS_XFS,[
SAVE_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include
-I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper
-I${srcdir-.}/nsswitch
+CPPFLAGS=$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include
-I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch
AC_TRY_COMPILE([
#include confdefs.h
#define NO_PROTO_H 1
@@ -3586,7 +3596,7 @@
AC_CACHE_CHECK([whether the old quota support works],samba_cv_QUOTA_WORKS,[
SAVE_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS -I${srcdir
svn commit: samba r6319 - in branches/SAMBA_3_0/source/tests: .
Author: herb Date: 2005-04-12 21:56:34 + (Tue, 12 Apr 2005) New Revision: 6319 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6319 Log: add prototype so -Wstrict-prototypes will not fail Modified: branches/SAMBA_3_0/source/tests/sysquotas.c Changeset: Modified: branches/SAMBA_3_0/source/tests/sysquotas.c === --- branches/SAMBA_3_0/source/tests/sysquotas.c 2005-04-12 18:59:49 UTC (rev 6318) +++ branches/SAMBA_3_0/source/tests/sysquotas.c 2005-04-12 21:56:34 UTC (rev 6319) @@ -1,5 +1,7 @@ /* this test should find out what quota api is available on the os */ + int autoconf_quota(void); + #if defined(HAVE_QUOTACTL_4A) /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */
svn commit: samba r6225 - in branches/SAMBA_3_0/source: auth client groupdb include lib libsmb modules nmbd nsswitch param passdb printing rpc_server smbd tdb utils web
Author: herb Date: 2005-04-06 16:28:04 + (Wed, 06 Apr 2005) New Revision: 6225 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6225 Log: get rid of warnings from my compiler about nested externs Modified: branches/SAMBA_3_0/source/auth/auth_compat.c branches/SAMBA_3_0/source/auth/auth_sam.c branches/SAMBA_3_0/source/client/client.c branches/SAMBA_3_0/source/client/clitar.c branches/SAMBA_3_0/source/groupdb/mapping.c branches/SAMBA_3_0/source/include/smb_macros.h branches/SAMBA_3_0/source/lib/substitute.c branches/SAMBA_3_0/source/lib/util.c branches/SAMBA_3_0/source/lib/util_seaccess.c branches/SAMBA_3_0/source/lib/wins_srv.c branches/SAMBA_3_0/source/libsmb/cliconnect.c branches/SAMBA_3_0/source/libsmb/clientgen.c branches/SAMBA_3_0/source/libsmb/clilist.c branches/SAMBA_3_0/source/libsmb/nmblib.c branches/SAMBA_3_0/source/modules/vfs_fake_perms.c branches/SAMBA_3_0/source/nmbd/nmbd.c branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c branches/SAMBA_3_0/source/nmbd/nmbd_synclists.c branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0/source/nsswitch/winbindd_util.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/param/params.c branches/SAMBA_3_0/source/passdb/pdb_ldap.c branches/SAMBA_3_0/source/printing/nt_printing.c branches/SAMBA_3_0/source/printing/printfsp.c branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c branches/SAMBA_3_0/source/rpc_server/srv_netlog_nt.c branches/SAMBA_3_0/source/rpc_server/srv_pipe.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0/source/smbd/dir.c branches/SAMBA_3_0/source/smbd/error.c branches/SAMBA_3_0/source/smbd/fake_file.c branches/SAMBA_3_0/source/smbd/lanman.c branches/SAMBA_3_0/source/smbd/negprot.c branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/open.c branches/SAMBA_3_0/source/smbd/oplock.c branches/SAMBA_3_0/source/smbd/oplock_linux.c branches/SAMBA_3_0/source/smbd/posix_acls.c branches/SAMBA_3_0/source/smbd/process.c branches/SAMBA_3_0/source/smbd/reply.c branches/SAMBA_3_0/source/smbd/server.c branches/SAMBA_3_0/source/smbd/service.c branches/SAMBA_3_0/source/smbd/sesssetup.c branches/SAMBA_3_0/source/smbd/trans2.c branches/SAMBA_3_0/source/tdb/tdbbackup.c branches/SAMBA_3_0/source/utils/net.c branches/SAMBA_3_0/source/web/diagnose.c Changeset: Sorry, the patch is too large (1541 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6225
svn commit: samba r6230 - in branches/SAMBA_3_0/source/lib: .
Author: herb Date: 2005-04-06 23:50:48 + (Wed, 06 Apr 2005) New Revision: 6230 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6230 Log: don't know how this ever worked! the compiler complained we were comparing an integer to a pointer and it was right. Modified: branches/SAMBA_3_0/source/lib/util_unistr.c Changeset: Modified: branches/SAMBA_3_0/source/lib/util_unistr.c === --- branches/SAMBA_3_0/source/lib/util_unistr.c 2005-04-06 23:22:52 UTC (rev 6229) +++ branches/SAMBA_3_0/source/lib/util_unistr.c 2005-04-06 23:50:48 UTC (rev 6230) @@ -113,7 +113,7 @@ if (len1 == 0) return 0; len2 = convert_string(CH_DOS, CH_UCS2, buf, len1, c2, 2,False); if (len2 != 2) return 0; - return (c == c2); + return (c == *c2); }
svn commit: samba r5888 - in branches/SAMBA_3_0/source/utils: .
Author: herb
Date: 2005-03-18 22:31:44 + (Fri, 18 Mar 2005)
New Revision: 5888
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5888
Log:
fix incorrect test - don't print anything if user is not in any groups
Modified:
branches/SAMBA_3_0/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2005-03-18 21:45:37 UTC (rev
5887)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2005-03-18 22:31:44 UTC (rev
5888)
@@ -1009,7 +1009,7 @@
/* Look up rids */
- if (rids) {
+ if (num_rids) {
rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids);
for (i = 0; i num_rids; i++)
@@ -1028,9 +1028,6 @@
for (i = 0; i num_names; i++)
printf(%s\n, names[i]);
}
- else {
- printf(no groups\n);
- }
done:
return result;
}
svn commit: samba r5889 - in trunk/source/utils: .
Author: herb
Date: 2005-03-18 22:39:41 + (Fri, 18 Mar 2005)
New Revision: 5889
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5889
Log:
fix incorrect test and don't print anything if user is not in any groups
Modified:
trunk/source/utils/net_rpc.c
Changeset:
Modified: trunk/source/utils/net_rpc.c
===
--- trunk/source/utils/net_rpc.c2005-03-18 22:31:44 UTC (rev 5888)
+++ trunk/source/utils/net_rpc.c2005-03-18 22:39:41 UTC (rev 5889)
@@ -1009,7 +1009,7 @@
/* Look up rids */
- if (rids) {
+ if (num_rids) {
rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids);
for (i = 0; i num_rids; i++)
@@ -1028,9 +1028,6 @@
for (i = 0; i num_names; i++)
printf(%s\n, names[i]);
}
- else {
- printf(no groups\n);
- }
done:
return result;
}
svn commit: samba r5650 - in branches/SAMBA_3_0/source/utils: .
Author: herb Date: 2005-03-03 18:55:36 + (Thu, 03 Mar 2005) New Revision: 5650 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5650 Log: add help lines for net rpc group addmem and delmem commands partial fix for Bug 2417 - we need to look for other missing commands Modified: branches/SAMBA_3_0/source/utils/net_help.c Changeset: Modified: branches/SAMBA_3_0/source/utils/net_help.c === --- branches/SAMBA_3_0/source/utils/net_help.c 2005-03-03 17:58:47 UTC (rev 5649) +++ branches/SAMBA_3_0/source/utils/net_help.c 2005-03-03 18:55:36 UTC (rev 5650) @@ -99,6 +99,8 @@ d_printf(\nnet [method] group ADD name [-C comment] [-c container]\ [misc. options] [targets]\n\tCreate specified group\n); d_printf(\nnet rpc group MEMBERS name\n\tList Group Members\n\n); + d_printf(\nnet rpc group ADDMEM group member\n\tAdd Group Members\n\n); + d_printf(\nnet rpc group DELMEM group member\n\tDelete Group Members\n\n); net_common_methods_usage(argc, argv); net_common_flags_usage(argc, argv); d_printf(\t-C or --comment=comment\tdescriptive comment (for add only)\n);
svn commit: samba r5287 - in branches/SAMBA_3_0/source/smbd: .
Author: herb
Date: 2005-02-09 21:23:33 + (Wed, 09 Feb 2005)
New Revision: 5287
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5287
Log:
fix build problem when HAVE_POSIX_ACL not defined
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-09 21:10:23 UTC (rev
5286)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-09 21:23:33 UTC (rev
5287)
@@ -2191,6 +2191,7 @@
return UNIXERROR(def_class,def_code);
}
+#if defined(HAVE_POSIX_ACLS)
/
Utility function to count the number of entries in a POSIX acl.
/
@@ -2305,6 +2306,7 @@
return True;
}
+#endif
/
Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
@@ -2870,6 +2872,7 @@
break;
}
+#if defined(HAVE_POSIX_ACLS)
case SMB_QUERY_POSIX_ACL:
{
SMB_ACL_T file_acl = NULL;
@@ -2946,6 +2949,7 @@
data_size = (num_file_acls +
num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE;
break;
}
+#endif
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);
@@ -3755,6 +3759,7 @@
return(-1);
}
+#if defined(HAVE_POSIX_ACLS)
case SMB_SET_POSIX_ACL:
{
uint16 posix_acl_version;
@@ -3804,6 +3809,7 @@
send_trans2_replies(outbuf, bufsize, params, 2,
*ppdata, 0);
return(-1);
}
+#endif
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);
svn commit: samba r4103 - in branches/SAMBA_3_0/source/torture: .
Author: herb
Date: 2004-12-08 17:30:50 + (Wed, 08 Dec 2004)
New Revision: 4103
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4103
Log:
lock timeout is in milliseconds (as in reply.c)
Modified:
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/torture/torture.c
===
--- branches/SAMBA_3_0/source/torture/torture.c 2004-12-08 11:30:26 UTC (rev
4102)
+++ branches/SAMBA_3_0/source/torture/torture.c 2004-12-08 17:30:50 UTC (rev
4103)
@@ -870,7 +870,7 @@
lock_timeout = (1 + (random() % 20));
printf(Testing lock timeout with timeout=%u\n, lock_timeout);
t1 = time(NULL);
- if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 500, WRITE_LOCK)) {
+ if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
printf(lock3 succeeded! This is a locking bug\n);
return False;
} else {
svn commit: samba r4104 - in trunk/source/torture: .
Author: herb
Date: 2004-12-08 17:43:04 + (Wed, 08 Dec 2004)
New Revision: 4104
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=4104
Log:
lock timeout is in milliseconds (as in reply.c)
Modified:
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/torture/torture.c
===
--- trunk/source/torture/torture.c 2004-12-08 17:30:50 UTC (rev 4103)
+++ trunk/source/torture/torture.c 2004-12-08 17:43:04 UTC (rev 4104)
@@ -870,7 +870,7 @@
lock_timeout = (1 + (random() % 20));
printf(Testing lock timeout with timeout=%u\n, lock_timeout);
t1 = time(NULL);
- if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 500, WRITE_LOCK)) {
+ if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
printf(lock3 succeeded! This is a locking bug\n);
return False;
} else {
svn commit: samba r3339 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2004-10-28 22:58:21 + (Thu, 28 Oct 2004) New Revision: 3339 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3339 Log: allow tdbtool to be built Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2004-10-28 22:38:27 UTC (rev 3338) +++ branches/SAMBA_3_0/source/Makefile.in 2004-10-28 22:58:21 UTC (rev 3339) @@ -124,7 +124,8 @@ BIN_PROGS1 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ BIN_PROGS2 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ + bin/[EMAIL PROTECTED]@ BIN_PROGS3 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ @@ -677,6 +678,8 @@ TDBBACKUP_OBJ = tdb/tdbbackup.o tdb/tdbback.o $(SNPRINTF_OBJ) $(TDBBASE_OBJ) +TDBTOOL_OBJ = tdb/tdbtool.o $(TDBBASE_OBJ) + TDBDUMP_OBJ = tdb/tdbdump.o $(TDBBASE_OBJ) NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o @@ -1249,6 +1252,10 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) +bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) + bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ)
svn commit: samba r1103 - branches/SAMBA_3_0/source/utils
Author: herb Date: 2004-06-10 14:23:34 + (Thu, 10 Jun 2004) New Revision: 1103 Modified: branches/SAMBA_3_0/source/utils/smbcacls.c Log: need to leave empty dacl so we can remove last ACE WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1103nolog=1
svn commit: samba r1109 - trunk/source/utils
Author: herb Date: 2004-06-10 17:43:15 + (Thu, 10 Jun 2004) New Revision: 1109 Modified: trunk/source/utils/smbcacls.c Log: merge from 3.0 - allow smbcacls to remove last ACL entry WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1109nolog=1
svn commit: samba r938 - branches/SAMBA_3_0/source/lib
Author: herb Date: 2004-05-28 17:57:18 + (Fri, 28 May 2004) New Revision: 938 Modified: branches/SAMBA_3_0/source/lib/iconv.c Log: on an error save the original errno before calling iconv to reset the conversion state WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=938nolog=1
svn commit: samba r814 - branches/SAMBA_3_0/source/smbd
Author: herb Date: 2004-05-22 05:01:25 + (Sat, 22 May 2004) New Revision: 814 Modified: branches/SAMBA_3_0/source/smbd/process.c branches/SAMBA_3_0/source/smbd/reply.c Log: conn is 0 during ioctl (at least during smbtorture IOCTL test) fix smbd panic WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=814nolog=1
svn commit: samba r772 - branches/SAMBA_3_0/source/lib
Author: herb Date: 2004-05-18 17:24:59 + (Tue, 18 May 2004) New Revision: 772 Modified: branches/SAMBA_3_0/source/lib/debug.c Log: fix cut and paste error in comment WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=772nolog=1
svn commit: samba r773 - trunk/source/lib
Author: herb Date: 2004-05-18 17:31:37 + (Tue, 18 May 2004) New Revision: 773 Modified: trunk/source/lib/debug.c Log: merge 772 into trunk (fix cut-and-paste error in comment) WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=773nolog=1
svn commit: samba r774 - trunk/source/libsmb
Author: herb Date: 2004-05-18 18:10:17 + (Tue, 18 May 2004) New Revision: 774 Modified: trunk/source/libsmb/nmblib.c Log: fix typo in compare - get rid of unneeded ifdef WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=774nolog=1
svn commit: samba r775 - branches/SAMBA_3_0/source/libsmb
Author: herb Date: 2004-05-18 18:13:19 + (Tue, 18 May 2004) New Revision: 775 Modified: branches/SAMBA_3_0/source/libsmb/nmblib.c Log: merge trunk 774 to samba 3_0 - fix bad compare in for loop WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=775nolog=1
