[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-515-g61f1747
The branch, master has been updated via 61f1747441ff43c1d9c99bbf69e218c1984834c7 (commit) via 02f13538f00cc8368e3e5e8e510bac468c21089b (commit) from e4ad0a1d1f3235405d42bc58b6bdb3c7d04e8486 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 61f1747441ff43c1d9c99bbf69e218c1984834c7 Author: Karolin Seeger ksee...@samba.org Date: Fri Feb 6 09:41:21 2009 +0100 docs: Clarify ldap ssl description in man smb.conf. Mention ldap ssl ads. Karolin commit 02f13538f00cc8368e3e5e8e510bac468c21089b Author: Karolin Seeger ksee...@samba.org Date: Fri Feb 6 09:10:15 2009 +0100 docs: Add description of ldap ssl ads to man smb.conf. Karolin --- Summary of changes: docs-xml/smbdotconf/ldap/ldapssl.xml| 15 +-- docs-xml/smbdotconf/ldap/ldapsslads.xml | 21 + 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 docs-xml/smbdotconf/ldap/ldapsslads.xml Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index b2e9537..fa7fea9 100644 --- a/docs-xml/smbdotconf/ldap/ldapssl.xml +++ b/docs-xml/smbdotconf/ldap/ldapssl.xml @@ -13,9 +13,9 @@ script./para paraLDAP connections should be secured where possible. This may be - done setting either this parameter to + done setting emphasiseither/emphasis this parameter to parameter moreinfo=noneStart_tls/parameter - or by specifying parameter moreinfo=noneldaps:///parameter in + emphasisor/emphasis by specifying parameter moreinfo=noneldaps:///parameter in the URL argument of smbconfoption name=passdb backend/./para paraThe smbconfoption name=ldap ssl/ can be set to one of @@ -32,6 +32,17 @@ communicating with the directory server./para /listitem /itemizedlist + para + Please note that this parameter does only affect emphasisrpc/emphasis + methods. To enable the LDAPv3 StartTLS extended operation (RFC2830) for + emphasisads/emphasis, set + smbconfoption name=ldap sslyes/smbconfoption + emphasisand/emphasis + smbconfoption name=ldap ssl adsyes/smbconfoption. + See refentrytitlesmb.conf/refentrytitlemanvolnum5/manvolnum + for more information on smbconfoption name=ldap ssl ads/. +/para + /description value type=defaultstart tls/value /samba:parameter diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml new file mode 100644 index 000..e6998cb --- /dev/null +++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml @@ -0,0 +1,21 @@ +samba:parameter name=ldap ssl ads +context=G +type=boolean + advanced=1 developer=1 +xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; +description + paraThis option is used to define whether or not Samba should + use SSL when connecting to the ldap server using + emphasisads/emphasis methods. + Rpc methods are not affected by this parameter. Please note, that + this parameter won't have any effect if smbconfoption name=ldap ssl/ + is set to parameterno/parameter. + /para + + paraSee refentrytitlesmb.conf/refentrytitlemanvolnum5/manvolnum + for more information on smbconfoption name=ldap ssl/. + /para + +/description +value type=defaultno/value +/samba:parameter -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4912-gba3884d
The branch, v3-3-test has been updated via ba3884d4d5c55723c1989e8e3868aa7ea8db8c60 (commit) via fef1a664de477b3d434b9d8c276933236042ae20 (commit) from 1d277bdb6997e3b913bcd1c0b3173c9c735e64c1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit ba3884d4d5c55723c1989e8e3868aa7ea8db8c60 Author: Karolin Seeger ksee...@samba.org Date: Fri Feb 6 09:41:21 2009 +0100 docs: Clarify ldap ssl description in man smb.conf. Mention ldap ssl ads. Karolin (cherry picked from commit 61f1747441ff43c1d9c99bbf69e218c1984834c7) commit fef1a664de477b3d434b9d8c276933236042ae20 Author: Karolin Seeger ksee...@samba.org Date: Fri Feb 6 09:10:15 2009 +0100 docs: Add description of ldap ssl ads to man smb.conf. Karolin (cherry picked from commit 02f13538f00cc8368e3e5e8e510bac468c21089b) --- Summary of changes: docs-xml/smbdotconf/ldap/ldapssl.xml| 15 +-- docs-xml/smbdotconf/ldap/ldapsslads.xml | 21 + 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 docs-xml/smbdotconf/ldap/ldapsslads.xml Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index b2e9537..fa7fea9 100644 --- a/docs-xml/smbdotconf/ldap/ldapssl.xml +++ b/docs-xml/smbdotconf/ldap/ldapssl.xml @@ -13,9 +13,9 @@ script./para paraLDAP connections should be secured where possible. This may be - done setting either this parameter to + done setting emphasiseither/emphasis this parameter to parameter moreinfo=noneStart_tls/parameter - or by specifying parameter moreinfo=noneldaps:///parameter in + emphasisor/emphasis by specifying parameter moreinfo=noneldaps:///parameter in the URL argument of smbconfoption name=passdb backend/./para paraThe smbconfoption name=ldap ssl/ can be set to one of @@ -32,6 +32,17 @@ communicating with the directory server./para /listitem /itemizedlist + para + Please note that this parameter does only affect emphasisrpc/emphasis + methods. To enable the LDAPv3 StartTLS extended operation (RFC2830) for + emphasisads/emphasis, set + smbconfoption name=ldap sslyes/smbconfoption + emphasisand/emphasis + smbconfoption name=ldap ssl adsyes/smbconfoption. + See refentrytitlesmb.conf/refentrytitlemanvolnum5/manvolnum + for more information on smbconfoption name=ldap ssl ads/. +/para + /description value type=defaultstart tls/value /samba:parameter diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml new file mode 100644 index 000..e6998cb --- /dev/null +++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml @@ -0,0 +1,21 @@ +samba:parameter name=ldap ssl ads +context=G +type=boolean + advanced=1 developer=1 +xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; +description + paraThis option is used to define whether or not Samba should + use SSL when connecting to the ldap server using + emphasisads/emphasis methods. + Rpc methods are not affected by this parameter. Please note, that + this parameter won't have any effect if smbconfoption name=ldap ssl/ + is set to parameterno/parameter. + /para + + paraSee refentrytitlesmb.conf/refentrytitlemanvolnum5/manvolnum + for more information on smbconfoption name=ldap ssl/. + /para + +/description +value type=defaultno/value +/samba:parameter -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-523-g2c1d980
The branch, master has been updated
via 2c1d980abebef1748627bd953b0661f6d711b5cb (commit)
via e0f91c89300a737f774d806d6c5ec3de3486d7f7 (commit)
via 2125777803cf4b9f259391e34847aafa4ce7668c (commit)
via 30d08223e65d4b610dbfa59e2486a41c37b3b8b1 (commit)
via 9c626e37cf74f94a35c0b03feaf6bec6e3604811 (commit)
via 77b4437b123f50612e40d521fe3d5faf5932808b (commit)
via e4035ab304208ebb1876b1485291a048564b0c27 (commit)
via a9184d5c62c2c89cf473e189c8beeed6fa7da1b2 (commit)
from 61f1747441ff43c1d9c99bbf69e218c1984834c7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2c1d980abebef1748627bd953b0661f6d711b5cb
Author: Michael Adam ob...@samba.org
Date: Mon Jan 26 13:28:15 2009 +0100
s3:idmap_tdb2: untangle assignment and check in idmap_tdb2_alloc_load()
Michael
commit e0f91c89300a737f774d806d6c5ec3de3486d7f7
Author: Michael Adam ob...@samba.org
Date: Mon Jan 26 13:12:41 2009 +0100
s3:idmap_tdb2: factor lodaing of ranges out into idmap_tdb2_load_ranges()
Michael
commit 2125777803cf4b9f259391e34847aafa4ce7668c
Author: Michael Adam ob...@samba.org
Date: Mon Jan 26 13:07:59 2009 +0100
s3:idmap_tdb2: move together code that belongs together in
idmap_tdb2_alloc_load
Michael
commit 30d08223e65d4b610dbfa59e2486a41c37b3b8b1
Author: Michael Adam ob...@samba.org
Date: Sat Jan 24 23:52:23 2009 +0100
s3:idmap_tdb2: streamline idmap_tdb2_sid_to_id,
adding tmp talloc ctx and removing a variable
Michael
commit 9c626e37cf74f94a35c0b03feaf6bec6e3604811
Author: Michael Adam ob...@samba.org
Date: Mon Jan 26 13:17:49 2009 +0100
s3:idmap_tdb: simplify talloc usage with temp context from talloc_stackframe
Michael
commit 77b4437b123f50612e40d521fe3d5faf5932808b
Author: Michael Adam ob...@samba.org
Date: Mon Jan 26 13:03:28 2009 +0100
s3:idmap_tdb: refactor out new function idmap_tdb_load_ranges()
Michael
commit e4035ab304208ebb1876b1485291a048564b0c27
Author: Michael Adam ob...@samba.org
Date: Sun Jan 25 00:48:34 2009 +0100
s3:idmap_tdb: use transactions in idmap_tdb_allocate_id()
Michael
commit a9184d5c62c2c89cf473e189c8beeed6fa7da1b2
Author: Michael Adam ob...@samba.org
Date: Fri Jan 23 00:52:28 2009 +0100
s3:idmap_tdb: add tmp talloc ctx to idmap_tdb_sid_to_id and remove an
fstring
Michael
---
Summary of changes:
source3/winbindd/idmap_tdb.c | 91 +
source3/winbindd/idmap_tdb2.c | 90 -
2 files changed, 108 insertions(+), 73 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 481ac1b..3a64979 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -203,29 +203,21 @@ static bool idmap_tdb_upgrade(struct db_context *db)
return True;
}
-static NTSTATUS idmap_tdb_open_db(TALLOC_CTX *memctx,
- bool check_config,
- struct db_context **dbctx)
+static NTSTATUS idmap_tdb_load_ranges(void)
{
- NTSTATUS ret;
- TALLOC_CTX *ctx;
- char *tdbfile = NULL;
- struct db_context *db = NULL;
- int32_t version;
uid_t low_uid = 0;
uid_t high_uid = 0;
gid_t low_gid = 0;
gid_t high_gid = 0;
- bool config_error = false;
- /* load ranges */
- if (!lp_idmap_uid(low_uid, high_uid)
- || !lp_idmap_gid(low_gid, high_gid)) {
- DEBUG(1, (idmap uid or idmap gid missing\n));
- config_error = true;
- if (check_config) {
- return NT_STATUS_UNSUCCESSFUL;
- }
+ if (!lp_idmap_uid(low_uid, high_uid)) {
+ DEBUG(1, (idmap uid missing\n));
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ if (!lp_idmap_gid(low_gid, high_gid)) {
+ DEBUG(1, (idmap gid missing\n));
+ return NT_STATUS_UNSUCCESSFUL;
}
idmap_tdb_state.low_uid = low_uid;
@@ -235,29 +227,41 @@ static NTSTATUS idmap_tdb_open_db(TALLOC_CTX *memctx,
if (idmap_tdb_state.high_uid = idmap_tdb_state.low_uid) {
DEBUG(1, (idmap uid range missing or invalid\n));
- config_error = true;
- if (check_config) {
- return NT_STATUS_UNSUCCESSFUL;
- }
+ return NT_STATUS_UNSUCCESSFUL;
}
if (idmap_tdb_state.high_gid = idmap_tdb_state.low_gid) {
DEBUG(1, (idmap gid range missing or invalid\n));
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ return NT_STATUS_OK;
+}
+
+static NTSTATUS
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-524-g145fe37
The branch, master has been updated via 145fe37766cf1ecffb16a03b58b44d08f7ed7558 (commit) from 2c1d980abebef1748627bd953b0661f6d711b5cb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558 Author: Michael Adam ob...@samba.org Date: Thu Feb 5 22:19:58 2009 +0100 docs: fix two typos in the mount.cifs manpage Michael --- Summary of changes: docs-xml/manpages-3/mount.cifs.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 00711e0..c386592 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -372,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried. termnoacl/term listitemparaDo not allow POSIX ACL operations even if server would support them./parapara The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers - version 3.10 and later. Setting POSIX ACLs requires enabling both XATTR and + version 3.0.10 and later. Setting POSIX ACLs requires enabling both XATTR and then POSIX support in the CIFS configuration options when building the cifs - module. POSIX ACL support can be disabled on a per mount basic by specifying + module. POSIX ACL support can be disabled on a per mount basis by specifying noacl on mount./para /listitem /varlistentry -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-527-g3accf9e
The branch, master has been updated
via 3accf9e80f52d4beba8fd4988d17e563e4e70325 (commit)
via 4f6556d6c0c9b82770e14ce9002a90fd187e9b6c (commit)
via 40227ef3bf42c048e321edec714bd2618bdc89c3 (commit)
from 145fe37766cf1ecffb16a03b58b44d08f7ed7558 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3accf9e80f52d4beba8fd4988d17e563e4e70325
Author: Günther Deschner g...@samba.org
Date: Thu Feb 5 02:08:40 2009 +0100
s3: use pidl to pull a KRB5_EDATA_NTSTATUS.
Guenther
commit 4f6556d6c0c9b82770e14ce9002a90fd187e9b6c
Author: Günther Deschner g...@samba.org
Date: Thu Feb 5 02:08:04 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 40227ef3bf42c048e321edec714bd2618bdc89c3
Author: Günther Deschner g...@samba.org
Date: Thu Feb 5 02:07:39 2009 +0100
idl: add KRB5_EDATA_NTSTATUS to misc.idl.
Guenther
---
Summary of changes:
librpc/gen_ndr/misc.h |6 ++
librpc/gen_ndr/ndr_misc.c | 36
librpc/gen_ndr/ndr_misc.h |3 +++
librpc/idl/misc.idl |6 ++
source3/include/ads.h |6 --
source3/libads/kerberos.c | 42 ++
6 files changed, 57 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/misc.h b/librpc/gen_ndr/misc.h
index de4abdc..e000cb0 100644
--- a/librpc/gen_ndr/misc.h
+++ b/librpc/gen_ndr/misc.h
@@ -42,4 +42,10 @@ enum netr_SchannelType
#endif
;
+struct KRB5_EDATA_NTSTATUS {
+ NTSTATUS ntstatus;
+ uint32_t unknown1;
+ uint32_t unknown2;
+}/* [public] */;
+
#endif /* _HEADER_misc */
diff --git a/librpc/gen_ndr/ndr_misc.c b/librpc/gen_ndr/ndr_misc.c
index 83c9772..28c8560 100644
--- a/librpc/gen_ndr/ndr_misc.c
+++ b/librpc/gen_ndr/ndr_misc.c
@@ -132,3 +132,39 @@ _PUBLIC_ void ndr_print_netr_SchannelType(struct ndr_print
*ndr, const char *nam
ndr_print_enum(ndr, name, ENUM, val, r);
}
+_PUBLIC_ enum ndr_err_code ndr_push_KRB5_EDATA_NTSTATUS(struct ndr_push *ndr,
int ndr_flags, const struct KRB5_EDATA_NTSTATUS *r)
+{
+ if (ndr_flags NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r-ntstatus));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-unknown1));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-unknown2));
+ }
+ if (ndr_flags NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_KRB5_EDATA_NTSTATUS(struct ndr_pull *ndr,
int ndr_flags, struct KRB5_EDATA_NTSTATUS *r)
+{
+ if (ndr_flags NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, r-ntstatus));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-unknown1));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-unknown2));
+ }
+ if (ndr_flags NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_KRB5_EDATA_NTSTATUS(struct ndr_print *ndr, const char
*name, const struct KRB5_EDATA_NTSTATUS *r)
+{
+ ndr_print_struct(ndr, name, KRB5_EDATA_NTSTATUS);
+ ndr-depth++;
+ ndr_print_NTSTATUS(ndr, ntstatus, r-ntstatus);
+ ndr_print_uint32(ndr, unknown1, r-unknown1);
+ ndr_print_uint32(ndr, unknown2, r-unknown2);
+ ndr-depth--;
+}
+
diff --git a/librpc/gen_ndr/ndr_misc.h b/librpc/gen_ndr/ndr_misc.h
index a38b3c9..938c946 100644
--- a/librpc/gen_ndr/ndr_misc.h
+++ b/librpc/gen_ndr/ndr_misc.h
@@ -20,4 +20,7 @@ void ndr_print_policy_handle(struct ndr_print *ndr, const
char *name, const stru
enum ndr_err_code ndr_push_netr_SchannelType(struct ndr_push *ndr, int
ndr_flags, enum netr_SchannelType r);
enum ndr_err_code ndr_pull_netr_SchannelType(struct ndr_pull *ndr, int
ndr_flags, enum netr_SchannelType *r);
void ndr_print_netr_SchannelType(struct ndr_print *ndr, const char *name, enum
netr_SchannelType r);
+enum ndr_err_code ndr_push_KRB5_EDATA_NTSTATUS(struct ndr_push *ndr, int
ndr_flags, const struct KRB5_EDATA_NTSTATUS *r);
+enum ndr_err_code ndr_pull_KRB5_EDATA_NTSTATUS(struct ndr_pull *ndr, int
ndr_flags, struct KRB5_EDATA_NTSTATUS *r);
+void ndr_print_KRB5_EDATA_NTSTATUS(struct ndr_print *ndr, const char *name,
const struct KRB5_EDATA_NTSTATUS *r);
#endif /* _HEADER_NDR_misc */
diff --git a/librpc/idl/misc.idl b/librpc/idl/misc.idl
index 1ef0d91..c4d8c62 100644
--- a/librpc/idl/misc.idl
+++ b/librpc/idl/misc.idl
@@ -35,4 +35,10 @@ interface misc
SEC_CHAN_DOMAIN = 4,
SEC_CHAN_BDC = 6
} netr_SchannelType;
+
+ typedef [public] struct {
+ NTSTATUS ntstatus;
+ uint32 unknown1;
+
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-534-g1609dba
The branch, master has been updated
via 1609dbaf88a22bcab75fa490ec632d846a1b5f5a (commit)
via 7fa534bd7c55be91a7ad209e1271a69163256288 (commit)
via bbfc11644d7aeb353b5bc1e7131f40a4f82ceaae (commit)
via 2e2f511ca3ec691156273d394a7740fc99b7a5c8 (commit)
via 2e076ff437473f397edd68b4f2a2a9a0bfabcb02 (commit)
via 3df528f2d1c5eb1d29b1b372ad330ff4d4bd70c5 (commit)
from 55f2cb18adf4bed0e6770bc33278ef6bf0c64e17 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1609dbaf88a22bcab75fa490ec632d846a1b5f5a
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 15:46:28 2008 +0100
netapi: add NetServer testsuite.
Guenther
commit 7fa534bd7c55be91a7ad209e1271a69163256288
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 15:34:19 2008 +0100
netapi: include more SERVER_INFO_X levels in example code.
Guenther
commit bbfc11644d7aeb353b5bc1e7131f40a4f82ceaae
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 15:34:01 2008 +0100
netapi: implement more SERVER_INFO_X levels.
Guenther
commit 2e2f511ca3ec691156273d394a7740fc99b7a5c8
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 15:32:33 2008 +0100
netapi: add SERVER_INFO_X to public header.
Guenther
commit 2e076ff437473f397edd68b4f2a2a9a0bfabcb02
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 14:07:00 2008 +0100
rerun make idl.
Guenther
commit 3df528f2d1c5eb1d29b1b372ad330ff4d4bd70c5
Author: Günther Deschner g...@samba.org
Date: Fri Oct 31 14:06:07 2008 +0100
netapi: add more SERVER_INFO_X levels.
Guenther
---
Summary of changes:
.../lib/netapi/examples/server/server_getinfo.c| 16 +
source3/lib/netapi/netapi.h| 612
source3/lib/netapi/serverinfo.c| 272 ++-
source3/lib/netapi/tests/Makefile.in |2 +-
source3/lib/netapi/tests/common.h |2 +
source3/lib/netapi/tests/netapitest.c |5 +
.../user/user_del.c = tests/netserver.c} | 67 +-
source3/librpc/gen_ndr/libnetapi.h | 613
source3/librpc/gen_ndr/ndr_libnetapi.c | 3621
source3/librpc/gen_ndr/ndr_libnetapi.h | 297 ++
source3/librpc/idl/libnetapi.idl | 613
11 files changed, 6074 insertions(+), 46 deletions(-)
copy source3/lib/netapi/{examples/user/user_del.c = tests/netserver.c} (52%)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/examples/server/server_getinfo.c
b/source3/lib/netapi/examples/server/server_getinfo.c
index afd2edd..b6a665e 100644
--- a/source3/lib/netapi/examples/server/server_getinfo.c
+++ b/source3/lib/netapi/examples/server/server_getinfo.c
@@ -38,6 +38,10 @@ int main(int argc, const char **argv)
struct SERVER_INFO_100 *i100;
struct SERVER_INFO_101 *i101;
struct SERVER_INFO_102 *i102;
+ struct SERVER_INFO_402 *i402;
+ struct SERVER_INFO_403 *i403;
+ struct SERVER_INFO_502 *i502;
+ struct SERVER_INFO_503 *i503;
struct SERVER_INFO_1005 *i1005;
poptContext pc;
@@ -112,6 +116,18 @@ int main(int argc, const char **argv)
printf(licenses: %d\n, i102-sv102_licenses);
printf(userpath: %s\n, i102-sv102_userpath);
break;
+ case 402:
+ i402 = (struct SERVER_INFO_402 *)buffer;
+ break;
+ case 403:
+ i403 = (struct SERVER_INFO_403 *)buffer;
+ break;
+ case 502:
+ i502 = (struct SERVER_INFO_502 *)buffer;
+ break;
+ case 503:
+ i503 = (struct SERVER_INFO_503 *)buffer;
+ break;
case 1005:
i1005 = (struct SERVER_INFO_1005 *)buffer;
printf(comment: %s\n, i1005-sv1005_comment);
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index 9687461..e8cd71e 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -134,11 +134,623 @@ struct SERVER_INFO_102 {
const char * sv102_userpath;
};
+struct SERVER_INFO_402 {
+ uint32_t sv402_ulist_mtime;
+ uint32_t sv402_glist_mtime;
+ uint32_t sv402_alist_mtime;
+ const char * sv402_alerts;
+ uint32_t sv402_security;
+ uint32_t sv402_numadmin;
+ uint32_t sv402_lanmask;
+ const char * sv402_guestacct;
+ uint32_t sv402_chdevs;
+ uint32_t sv402_chdevq;
+ uint32_t sv402_chdevjobs;
+ uint32_t sv402_connections;
+ uint32_t sv402_shares;
+ uint32_t
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-535-g2170a81
The branch, master has been updated
via 2170a810ed16043c6292eb3e39437a8cf96a8be6 (commit)
from 1609dbaf88a22bcab75fa490ec632d846a1b5f5a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2170a810ed16043c6292eb3e39437a8cf96a8be6
Author: Stefan Metzmacher me...@samba.org
Date: Fri Feb 6 12:10:23 2009 +0100
s4:pyregistry: fix crash bugs introduced by
e5a6eadd8214b56da34f733318a0fecaebbe5ef5
The registry api uses wild casts in the returned types, so we can't check
the talloc name against the type used in the public api...
metze
---
Summary of changes:
source4/lib/registry/pyregistry.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/registry/pyregistry.c
b/source4/lib/registry/pyregistry.c
index 9ebd136..30becbb 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -36,8 +36,9 @@ PyAPI_DATA(PyTypeObject) PyRegistry;
PyAPI_DATA(PyTypeObject) PyHiveKey;
/*#define PyRegistryKey_AsRegistryKey(obj) py_talloc_get_type(obj, struct
registry_key)*/
-#define PyRegistry_AsRegistryContext(obj) py_talloc_get_type(obj, struct
registry_context)
-#define PyHiveKey_AsHiveKey(obj) py_talloc_get_type(obj, struct hive_key)
+#define PyRegistry_AsRegistryContext(obj) ((struct registry_context
*)py_talloc_get_ptr(obj))
+#define PyHiveKey_AsHiveKey(obj) ((struct hive_key*)py_talloc_get_ptr(obj))
+
static PyObject *py_get_predefined_key_by_name(PyObject *self, PyObject *args)
{
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3432-gfe456e4
The branch, v3-2-test has been updated
via fe456e4bf8db272d1d6e99b4c1714894af17190b (commit)
from 6c9b13a4c2bfa17793d0f575f53d815afe8a8682 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit fe456e4bf8db272d1d6e99b4c1714894af17190b
Author: Michael Adam ob...@samba.org
Date: Fri Feb 6 10:42:11 2009 +0100
s3:net conf: remove check for sharename being a usernam in net conf
addshare
This is useless and can be overriden by net conf setparm anyways.
Michael
---
Summary of changes:
source/utils/net_conf.c |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 08a06ea..6639b85 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -549,12 +549,6 @@ static int net_conf_addshare(struct smbconf_ctx *conf_ctx,
goto done;
}
- if (getpwnam(sharename)) {
- d_fprintf(stderr, ERROR: share name %s is already a valid
- system user name.\n, sharename);
- goto done;
- }
-
if (strequal(sharename, GLOBAL_NAME)) {
d_fprintf(stderr,
ERROR: 'global' is not a valid share name.\n);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-536-gea8bd81b
The branch, master has been updated
via ea8bd81b6eaf2d2ca005d30c1580e7a45d3b3c5d (commit)
from 2170a810ed16043c6292eb3e39437a8cf96a8be6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ea8bd81b6eaf2d2ca005d30c1580e7a45d3b3c5d
Author: Shirish Pargaonkar shirishpargaon...@gmail.com
Date: Fri Feb 6 08:13:38 2009 -0500
mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs
...so that these options work correctly when passed in by mount(8).
---
Summary of changes:
source3/client/mount.cifs.c | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 9f4d1d3..df5be84 100644
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -85,6 +85,7 @@
const char *thisprogram;
int verboseflag = 0;
+int fakemnt = 0;
static int got_password = 0;
static int got_user = 0;
static int got_domain = 0;
@@ -1103,8 +1104,8 @@ int main(int argc, char ** argv)
mount_cifs_usage ();
exit(EX_USAGE);
case 'n':
- ++nomtab;
- break;
+ ++nomtab;
+ break;
case 'b':
#ifdef MS_BIND
flags |= MS_BIND;
@@ -1209,6 +1210,9 @@ int main(int argc, char ** argv)
break;
case 't':
break;
+ case 'f':
+ ++fakemnt;
+ break;
default:
printf(unknown mount option %c\n,c);
mount_cifs_usage();
@@ -1410,7 +1414,7 @@ mount_retry:
}
}
- if (mount(dev_name, mountpoint, cifs, flags, options)) {
+ if (!fakemnt mount(dev_name, mountpoint, cifs, flags, options)) {
switch (errno) {
case ECONNREFUSED:
case EHOSTUNREACH:
@@ -1440,6 +1444,8 @@ mount_retry:
goto mount_exit;
}
+ if (nomtab)
+ goto mount_exit;
atexit(unlock_mtab);
rc = lock_mtab();
if (rc) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-148-ga894bd4
The branch, v3-0-test has been updated
via a894bd4504f070233dd2785a62483090581f5bf3 (commit)
from 45699a287d27cce24e883384a72441d310c8ee28 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit a894bd4504f070233dd2785a62483090581f5bf3
Author: Shirish Pargaonkar shirishpargaon...@gmail.com
Date: Fri Feb 6 08:23:52 2009 -0500
mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs
...so that these options work correctly when passed in by mount(8).
---
Summary of changes:
source/client/mount.cifs.c | 15 ++-
1 files changed, 10 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 1ac1410..939db45 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -71,6 +71,7 @@
const char *thisprogram;
int verboseflag = 0;
+int fakemnt = 0;
static int got_password = 0;
static int got_user = 0;
static int got_domain = 0;
@@ -1018,7 +1019,7 @@ int main(int argc, char ** argv)
char * resolved_path = NULL;
char * temp;
char * dev_name;
- int rc;
+ int rc = 0;
int rsize = 0;
int wsize = 0;
int nomtab = 0;
@@ -1087,8 +1088,8 @@ int main(int argc, char ** argv)
mount_cifs_usage ();
exit(EX_USAGE);
case 'n':
- ++nomtab;
- break;
+ ++nomtab;
+ break;
case 'b':
#ifdef MS_BIND
flags |= MS_BIND;
@@ -1196,6 +1197,9 @@ int main(int argc, char ** argv)
break;
case 't':
break;
+ case 'f':
+ ++fakemnt;
+ break;
default:
printf(unknown mount option %c\n,c);
mount_cifs_usage();
@@ -1376,8 +1380,7 @@ mount_retry:
/* convert all '\\' to '/' in share portion so that /proc/mounts looks
pretty */
replace_char(dev_name, '\\', '/', strlen(share_name));
- if(mount(dev_name, mountpoint, cifs, flags, options)) {
- /* remember to kill daemon on error */
+ if(!fakemnt mount(dev_name, mountpoint, cifs, flags, options)) {
switch (errno) {
case 0:
printf(mount failed but no error number set\n);
@@ -1401,6 +1404,8 @@ mount_retry:
printf(Refer to the mount.cifs(8) manual page (e.g.man
mount.cifs)\n);
rc = EX_FAIL;
} else {
+ if (nomtab)
+ goto mount_exit;
atexit(unlock_mtab);
rc = lock_mtab();
if (rc) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-537-gd895ca5
The branch, master has been updated via d895ca505f7f9c4edf476a0c966e93917e35575c (commit) from ea8bd81b6eaf2d2ca005d30c1580e7a45d3b3c5d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d895ca505f7f9c4edf476a0c966e93917e35575c Author: Jeff Layton jlay...@redhat.com Date: Fri Feb 6 08:29:58 2009 -0500 mount.cifs: initialize rc to 0 in main The value of rc in main() isn't initialized in the declaration. This wasn't a problem before, but Shirish's fakemount patch can make it so that we return the uninitialized variable if the -n flag is used. Fix this by initializing rc to 0. Signed-off-by: Jeff Layton jlay...@redhat.com --- Summary of changes: source3/client/mount.cifs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index df5be84..a736609 100644 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -1031,7 +1031,7 @@ int main(int argc, char ** argv) char * resolved_path = NULL; char * temp; char * dev_name; - int rc; + int rc = 0; int rsize = 0; int wsize = 0; int nomtab = 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4916-g45d75ec
The branch, v3-3-test has been updated via 45d75ece3e35b5180e82dc0488b13fbd2a93c41e (commit) from 5cd79db1326d70c592e86491d36567a2eb4e1717 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 45d75ece3e35b5180e82dc0488b13fbd2a93c41e Author: Jeff Layton jlay...@redhat.com Date: Fri Feb 6 08:31:45 2009 -0500 mount.cifs: initialize rc to 0 in main The value of rc in main() isn't initialized in the declaration. This wasn't a problem before, but Shirish's fakemount patch can make it so that we return the uninitialized variable if the -n flag is used. Fix this by initializing rc to 0. Signed-off-by: Jeff Layton jlay...@redhat.com --- Summary of changes: source/client/mount.cifs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c index df5be84..a736609 100644 --- a/source/client/mount.cifs.c +++ b/source/client/mount.cifs.c @@ -1031,7 +1031,7 @@ int main(int argc, char ** argv) char * resolved_path = NULL; char * temp; char * dev_name; - int rc; + int rc = 0; int rsize = 0; int wsize = 0; int nomtab = 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3434-gc86c221
The branch, v3-2-test has been updated via c86c2219b23fb2e5ce652dae18b0299d76dcb524 (commit) from 035fa67801d55f05afbac94592a7700764624ee4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit c86c2219b23fb2e5ce652dae18b0299d76dcb524 Author: Jeff Layton jlay...@redhat.com Date: Fri Feb 6 08:32:40 2009 -0500 mount.cifs: initialize rc to 0 in main The value of rc in main() isn't initialized in the declaration. This wasn't a problem before, but Shirish's fakemount patch can make it so that we return the uninitialized variable if the -n flag is used. Fix this by initializing rc to 0. Signed-off-by: Jeff Layton jlay...@redhat.com --- Summary of changes: source/client/mount.cifs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c index 021baf4..e7397da 100644 --- a/source/client/mount.cifs.c +++ b/source/client/mount.cifs.c @@ -1027,7 +1027,7 @@ int main(int argc, char ** argv) char * resolved_path = NULL; char * temp; char * dev_name; - int rc; + int rc = 0; int rsize = 0; int wsize = 0; int nomtab = 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-528-g55f2cb1
The branch, master has been updated
via 55f2cb18adf4bed0e6770bc33278ef6bf0c64e17 (commit)
from 3accf9e80f52d4beba8fd4988d17e563e4e70325 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 55f2cb18adf4bed0e6770bc33278ef6bf0c64e17
Author: Michael Adam ob...@samba.org
Date: Fri Feb 6 10:42:11 2009 +0100
s3:net conf: remove check for sharename being a usernam in net conf
addshare
This is useless and can be overriden by net conf setparm anyways.
Michael
---
Summary of changes:
source3/utils/net_conf.c |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 31e87ca..0c2cd24 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -576,12 +576,6 @@ static int net_conf_addshare(struct net_context *c,
goto done;
}
- if (getpwnam(sharename)) {
- d_fprintf(stderr, ERROR: share name %s is already a valid
- system user name.\n, sharename);
- goto done;
- }
-
if (strequal(sharename, GLOBAL_NAME)) {
d_fprintf(stderr,
ERROR: 'global' is not a valid share name.\n);
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-83-g8f9b7c4
The branch, v3-2-ctdb has been updated via 8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e (commit) via c415b6a48dae2809d5d60b0af23eb7781f1146db (commit) via 1c3313dea793a7eea72afb990da125f6c2a8444c (commit) via b44b29e5d9047f79202fa8fb3ca0eb86b2a98090 (commit) via 876b0b001976226a7c1887570c08178d72842a48 (commit) via e6c46844b2bbc34a8f87ba438f5cc16fcc12d095 (commit) via 5d76e219ab4856a5c72835eebf48d5dd1cf0e01e (commit) via a0d32cbc36a52bcd6b9b542919edee72ce95acdf (commit) via ce440096473d4db0e43f65ced6c2084a5bdbabc6 (commit) via bbfe82768add789a98ce3711fb5f378d19363401 (commit) via 5e4f6639e7ed96f3457177d203283c1c55ec52dd (commit) via d7c7acee813b3cd9649b381a3e63c0be56e67d29 (commit) via e0381d6a173dcf64910ac597a10a3f0fa59ffe43 (commit) via ca155297bf932df6fd4a0ff223e5a7f1b8340f6b (commit) via 772dcc3b3703507af6baee090602a0ae8633fe2f (commit) via 31ea6bbc4a964604377509d3c096bae647c614a2 (commit) via ef76b71683f3d420fa8062bc5364493c44ab68ce (commit) via 077e0ed31315242c571ccd9e9579f53aac0dbbc7 (commit) via 8e7d0cf27cf9eb18be497d13bd0dbbe1d76b97a0 (commit) via a8eb8de94f5bfe4de000c5e85a43469af555a717 (commit) via c21720a3c47748dcbf04d94377c36c47262c4953 (commit) via e0c56d65f4096cdbcf9e560309e71fc21faa7d9a (commit) via ac4d07ef8300a2b571296b8b3f7c23e8850b526a (commit) via 74534203b5b91445cd8ae4cd7f2a0d35ea73a281 (commit) via c2d30b0a8e3609854908aeff19174e8e4e291cb7 (commit) via a09ca37c438f31133943238b15c63a5834226c73 (commit) via a691e29b466fdf1776160d92704e1ca958fa9eee (commit) via 632f4b83158d46ae456713286a27ac0c2aa2ee25 (commit) via 84237fb48aad5f11789d75a6767a6f47465f140b (commit) via 9483b143fe473d374e7f5c71f0d497f28f4e69f7 (commit) via 7b994fc658ad175bc40af9e38a8f1b870276d980 (commit) via d04d93f783533612e20326b7b6ea5958eb5fcdc6 (commit) via 7e38054a94d3feacda9c249549d2721a4ee0b261 (commit) via 9c3da895e6dd5df2f4e3377e1bf562b376436081 (commit) via 0ee05c012e5f58c9132549c59cfd1ed74dd27759 (commit) via c421d57e69de4d8c135123ed9f78dc9712bc7b3d (commit) via bd3bb83824803c5301201f7fa2703a52971eae8f (commit) via f3d355ffa75cd2b0f8cc51189e80aaf3552766d0 (commit) via 410acb0410ce3c33da15dbefd0b59e971494d2fb (commit) via d2e79f3e54cf1762df2ef814af90dcb16cb8e859 (commit) via fe3680cb7ab54142d589c89789af73a3e32a6b79 (commit) via d5f74cfc4434d754afc9fdd746c2a575ebdd3641 (commit) via 299f1ae3f335ce99cb9b5d477e0950a4108f80cb (commit) via 2545fcc4628eef2d6b83ef5656be1e53bf7e (commit) via 067d4a889a218c79cc2e343e542d9c2f0af459d6 (commit) via e9de9cd33a3260c0b1b019208db9c3f96d9d5f3a (commit) from a9a506b6640986548e2ae8540b7ae93960d6ece5 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit 8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e Merge: a9a506b6640986548e2ae8540b7ae93960d6ece5 c415b6a48dae2809d5d60b0af23eb7781f1146db Author: Michael Adam ob...@samba.org Date: Tue Feb 3 16:53:57 2009 +0100 Merge commit 'origin/v3-2-test' into v3-2-ctdb commit c415b6a48dae2809d5d60b0af23eb7781f1146db Author: Karolin Seeger ksee...@samba.org Date: Tue Feb 3 09:48:40 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin commit 1c3313dea793a7eea72afb990da125f6c2a8444c Author: Lars Müller l...@samba.org Date: Mon Feb 2 21:38:38 2009 +0100 Adjust regex to match variable names including underscores This is required to get the CIFSUPCALL_PROGS setting extracted from config.log. commit b44b29e5d9047f79202fa8fb3ca0eb86b2a98090 Author: Lars Müller l...@samba.org Date: Mon Feb 2 21:12:52 2009 +0100 Conditional install of the cifs.upcall man page Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while configure. commit 876b0b001976226a7c1887570c08178d72842a48 Author: Karolin Seeger ksee...@samba.org Date: Mon Feb 2 11:46:39 2009 +0100 docs: Describe service in man mount.cifs. This fixes bug #5346. Thanks to the Debian Samba package maintainers for reporting and providing a patch! Karolin (cherry picked from commit 73f4fc1f802f31459b70dba4777d142d00fcdd92) (cherry picked from commit ab4768452811e67f6606253b5a79101184f777d0) commit e6c46844b2bbc34a8f87ba438f5cc16fcc12d095 Author: Karolin Seeger ksee...@samba.org Date: Mon Feb 2 10:13:38 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin commit 5d76e219ab4856a5c72835eebf48d5dd1cf0e01e Author: Björn Jacke b...@sernet.de Date: Sun Feb 1 03:22:41 2009 +0100 fix build with external dns_sd libraries This used to be commit 16f07280 in master. (cherry picked from
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-96-gc860c4a
The branch, v3-2-ctdb has been updated via c860c4a688bb66dbe6916a365d340a94601ea416 (commit) via c86c2219b23fb2e5ce652dae18b0299d76dcb524 (commit) via 035fa67801d55f05afbac94592a7700764624ee4 (commit) via fe456e4bf8db272d1d6e99b4c1714894af17190b (commit) via 6c9b13a4c2bfa17793d0f575f53d815afe8a8682 (commit) via f00dfc58ea2a6d5794b71136acf5d1532393132b (commit) via de24718cbc55fa4b16a0370d335005f789e924f7 (commit) via 27f34cb57c4e4299cb43c14e22c5b15053c898ea (commit) via 52e48c12cf2a56d31a2404ab142d6678b430a85a (commit) via 16e9f1e2d4a1d391efdf8348fa7f57b2640a6bdb (commit) via 268be70cecd5025b0512372cff572095be763af1 (commit) via 8ddb30ca90d31624ba86cd731f573aedad43face (commit) via 11c966b7bc30b17de1bb360f405f6cb956dd5c83 (commit) from 8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit c860c4a688bb66dbe6916a365d340a94601ea416 Merge: 8f9b7c41c8a8632467db52eb7fa3f2f6e46c2f2e c86c2219b23fb2e5ce652dae18b0299d76dcb524 Author: Michael Adam ob...@samba.org Date: Fri Feb 6 16:51:28 2009 +0100 Merge commit 'origin/v3-2-test' into v3-2-ctdb commit c86c2219b23fb2e5ce652dae18b0299d76dcb524 Author: Jeff Layton jlay...@redhat.com Date: Fri Feb 6 08:32:40 2009 -0500 mount.cifs: initialize rc to 0 in main The value of rc in main() isn't initialized in the declaration. This wasn't a problem before, but Shirish's fakemount patch can make it so that we return the uninitialized variable if the -n flag is used. Fix this by initializing rc to 0. Signed-off-by: Jeff Layton jlay...@redhat.com commit 035fa67801d55f05afbac94592a7700764624ee4 Author: Shirish Pargaonkar shirishpargaon...@gmail.com Date: Fri Feb 6 08:16:11 2009 -0500 mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs ...so that these options work correctly when passed in by mount(8). commit fe456e4bf8db272d1d6e99b4c1714894af17190b Author: Michael Adam ob...@samba.org Date: Fri Feb 6 10:42:11 2009 +0100 s3:net conf: remove check for sharename being a usernam in net conf addshare This is useless and can be overriden by net conf setparm anyways. Michael commit 6c9b13a4c2bfa17793d0f575f53d815afe8a8682 Author: Michael Adam ob...@samba.org Date: Thu Feb 5 22:19:58 2009 +0100 docs: fix two typos in the mount.cifs manpage Michael (cherry picked from commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558) Signed-off-by: Michael Adam ob...@samba.org commit f00dfc58ea2a6d5794b71136acf5d1532393132b Author: Günter Kukkukk li...@kukkukk.com Date: Thu Feb 5 18:59:03 2009 -0800 Don't try and delete a default ACL from a file. commit de24718cbc55fa4b16a0370d335005f789e924f7 Author: Aravind Srinivasan aravind.sriniva...@isilon.com Date: Thu Feb 5 14:46:59 2009 -0800 Have nmbd check all available interfaces for WINS before failing When nmbd is acting as WINS, it picks the first interface's IP as WINS server's IP. If the first interface's IP is zero, we will just quit (even though we might have other interfaces with valid IPs). This patch makes nmbd look at all interfaces and pick the first interface with a valid IP as the WINS server's IP. commit 27f34cb57c4e4299cb43c14e22c5b15053c898ea Author: Shirish Pargaonkar shirishpargaon...@gmail.com Date: Thu Feb 5 14:17:48 2009 -0500 umount.cifs: clean-up entries in /etc/mtab after unmount This patch removes the remaining entry in /etc/mtab after a filesystem is unmounted by canonicalizing the mountpoint supplied on the command line. Please refer to bug 4370 in samba bugzilla. commit 52e48c12cf2a56d31a2404ab142d6678b430a85a Author: Günther Deschner g...@samba.org Date: Wed Feb 4 23:55:54 2009 +0100 s3-net: remove unused ENUM_HND. Guenther (cherry picked from commit a713060a6e36706cfd5b997aa4cbfabf4e180c84) commit 16e9f1e2d4a1d391efdf8348fa7f57b2640a6bdb Author: Miguel Suarez miguel.sua...@stratus.com Date: Tue Feb 3 14:35:19 2009 -0800 Fix bug #6085 - In vfs_default.c change utime( ) call. commit 268be70cecd5025b0512372cff572095be763af1 Author: Ted Percival ted.perci...@quest.com Date: Tue Feb 3 14:10:20 2009 -0800 Probably fixes a crash during name resolution when log level = 10 and libc segfaults if printf is passed NULL for a %s arg (eg. Solaris). commit 8ddb30ca90d31624ba86cd731f573aedad43face Author: Volker Lendecke v...@samba.org Date: Tue Feb 3 14:41:49 2009 +0100 s3: Fix 'net rpc join' for users with the SeMachineAccountPrivilege. This used to be commit fda8abac in master. commit 11c966b7bc30b17de1bb360f405f6cb956dd5c83 Author: Karolin Seeger ksee...@samba.org Date: Tue Feb 3 14:49:08 2009 +0100
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3435-g9181335
The branch, v3-2-test has been updated
via 918133544b535d12761b5d6242e59eb7d21bae45 (commit)
from c86c2219b23fb2e5ce652dae18b0299d76dcb524 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 918133544b535d12761b5d6242e59eb7d21bae45
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 19 16:26:00 2009 -0800
s3: reinit_after_fork() should reinit the event context before the
messaging context
Because messaging_reinit() may add events to the event context, which will
removed by event_context_reinit().
metze
(cherry picked from commit 56af6112d67aa9dd3757297fbe29ce1a3eabf00d)
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
source/lib/util.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 1ed70fd..002c14a 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1052,6 +1052,10 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
return false;
}
+ if (ev_ctx) {
+ event_context_reinit(ev_ctx);
+ }
+
if (msg_ctx) {
/*
* For clustering, we need to re-init our ctdbd connection
after the
@@ -1065,10 +1069,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
}
}
- if (ev_ctx) {
- event_context_reinit(ev_ctx);
- }
-
return true;
}
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-98-g410cb22
The branch, v3-2-ctdb has been updated
via 410cb22473a02705cc6f478d0f26d56b435ccd8e (commit)
via 918133544b535d12761b5d6242e59eb7d21bae45 (commit)
from c860c4a688bb66dbe6916a365d340a94601ea416 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 410cb22473a02705cc6f478d0f26d56b435ccd8e
Merge: c860c4a688bb66dbe6916a365d340a94601ea416
918133544b535d12761b5d6242e59eb7d21bae45
Author: Michael Adam ob...@samba.org
Date: Fri Feb 6 17:03:18 2009 +0100
Merge commit 'origin/v3-2-test' into v3-2-ctdb
commit 918133544b535d12761b5d6242e59eb7d21bae45
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 19 16:26:00 2009 -0800
s3: reinit_after_fork() should reinit the event context before the
messaging context
Because messaging_reinit() may add events to the event context, which will
removed by event_context_reinit().
metze
(cherry picked from commit 56af6112d67aa9dd3757297fbe29ce1a3eabf00d)
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
source/lib/util.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 017384d..b913775 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1052,6 +1052,10 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
return false;
}
+ if (ev_ctx) {
+ event_context_reinit(ev_ctx);
+ }
+
if (msg_ctx) {
/*
* For clustering, we need to re-init our ctdbd connection
after the
@@ -1065,10 +1069,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
}
}
- if (ev_ctx) {
- event_context_reinit(ev_ctx);
- }
-
return true;
}
--
SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3433-g035fa67
The branch, v3-2-test has been updated
via 035fa67801d55f05afbac94592a7700764624ee4 (commit)
from fe456e4bf8db272d1d6e99b4c1714894af17190b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 035fa67801d55f05afbac94592a7700764624ee4
Author: Shirish Pargaonkar shirishpargaon...@gmail.com
Date: Fri Feb 6 08:16:11 2009 -0500
mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs
...so that these options work correctly when passed in by mount(8).
---
Summary of changes:
source/client/mount.cifs.c | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 79a84e6..021baf4 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -85,6 +85,7 @@
const char *thisprogram;
int verboseflag = 0;
+int fakemnt = 0;
static int got_password = 0;
static int got_user = 0;
static int got_domain = 0;
@@ -1099,8 +1100,8 @@ int main(int argc, char ** argv)
mount_cifs_usage ();
exit(EX_USAGE);
case 'n':
- ++nomtab;
- break;
+ ++nomtab;
+ break;
case 'b':
#ifdef MS_BIND
flags |= MS_BIND;
@@ -1205,6 +1206,9 @@ int main(int argc, char ** argv)
break;
case 't':
break;
+ case 'f':
+ ++fakemnt;
+ break;
default:
printf(unknown mount option %c\n,c);
mount_cifs_usage();
@@ -1400,7 +1404,7 @@ mount_retry:
}
}
- if (mount(dev_name, mountpoint, cifs, flags, options)) {
+ if (!fakemnt mount(dev_name, mountpoint, cifs, flags, options)) {
switch (errno) {
case ECONNREFUSED:
case EHOSTUNREACH:
@@ -1430,6 +1434,8 @@ mount_retry:
goto mount_exit;
}
+ if (nomtab)
+ goto mount_exit;
atexit(unlock_mtab);
rc = lock_mtab();
if (rc) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-147-g45699a2
The branch, v3-0-test has been updated via 45699a287d27cce24e883384a72441d310c8ee28 (commit) from 04fc826efb290ba4b1f173752efb37a4b87281f2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 45699a287d27cce24e883384a72441d310c8ee28 Author: Michael Adam ob...@samba.org Date: Thu Feb 5 22:19:58 2009 +0100 docs: fix two typos in the mount.cifs manpage Michael (cherry picked from commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/mount.cifs.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index a292e82..6c80089 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -372,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried. termnoacl/term listitemparaDo not allow POSIX ACL operations even if server would support them./parapara The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers - version 3.10 and later. Setting POSIX ACLs requires enabling both XATTR and + version 3.0.10 and later. Setting POSIX ACLs requires enabling both XATTR and then POSIX support in the CIFS configuration options when building the cifs - module. POSIX ACL support can be disabled on a per mount basic by specifying + module. POSIX ACL support can be disabled on a per mount basis by specifying noacl on mount./para /listitem /varlistentry -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-562-gf157c1a
The branch, master has been updated via f157c1a07f3fbbc461a806b10e24e25d0b261070 (commit) via 33d2507ba2374afabeaff455c08896fa45babbe8 (commit) via 88aaac39fa2a38997c11d4f545f3e223129a5a6a (commit) via 8ddb81ca0addf1c9bad4f624e55ee5679aa3fe4c (commit) via 3954cd83aa6976ef8c79900f81fefb693934 (commit) via 99398e8768f308f01b3298bfbc3bb783f6ea8c2f (commit) via d400de2ffa53bebe13cba0d2d3c18dcc05bc37bd (commit) via 6e1c008913f545d731dae6aefc1d11053a32d151 (commit) via 0d4dbe6012ee6f15256de14f8d4d6b32eb4ca313 (commit) via b970eb791cdf8893881bab3c113fdd5f2ff9866e (commit) via 8153916f4aad1482351719ed2f1d91d48fe89197 (commit) via 22e2f220be4ac05aead7ba7a893904299c5bbfd8 (commit) via cf15c687d279d3807caa90560d8799d6b00f005b (commit) via 37c89c143009f1c6e0dae819bf08baaeca81df7d (commit) via cb5837dc192dabfe5d0edfb1be9acc3672785cd4 (commit) via 121b5f4afdb22ae720947183303feab4c48f41a3 (commit) via de7a30817de5d77579520a8c776c2a8b1b2ffcc7 (commit) via c1a1480f7a31b9c6651f546acafa58d1f3de3457 (commit) via 45104ba1459c3698d6c34ca3ab31c28cbf6c710c (commit) via c2975cc7ead5da000b3d2c2e9af7bfbe98be79a4 (commit) via cb0687f9e7dee2e722929dd1d7064e7598acc40a (commit) via c2cd781d0aac788f1ee4c9c510b7726911df9020 (commit) via 82ce981a4116a10e04e04c8083167e6b83595caf (commit) via ea2d151721f531defc5b97dd7c91cd8df6300b1e (commit) via 8b84c97e8db17858344d1f953d199bd40ac70883 (commit) from d895ca505f7f9c4edf476a0c966e93917e35575c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f157c1a07f3fbbc461a806b10e24e25d0b261070 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 14:51:47 2009 +0100 s4-spoolss: fix s4 spoolss server build (using a temp macro). Guenther commit 33d2507ba2374afabeaff455c08896fa45babbe8 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:53:16 2009 +0100 s4-smbtorture: fix test_EnumPrinterKey. Guenther commit 88aaac39fa2a38997c11d4f545f3e223129a5a6a Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:44:44 2009 +0100 s4-smbtorture: fix test_EnumPrinterDataEx. Guenther commit 8ddb81ca0addf1c9bad4f624e55ee5679aa3fe4c Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:38:59 2009 +0100 s4-smbtorture: fix test_GetPrinterDataEx. Guenther commit 3954cd83aa6976ef8c79900f81fefb693934 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:28:48 2009 +0100 s4-smbtorture: fix test_GetPrinterDriver2. Guenther commit 99398e8768f308f01b3298bfbc3bb783f6ea8c2f Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:09:22 2009 +0100 s4-smbtorture: fix test_GetForm. Guenther commit d400de2ffa53bebe13cba0d2d3c18dcc05bc37bd Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:44:57 2009 +0100 s4-smbtorture: fix test_DoPrintTest. Guenther commit 6e1c008913f545d731dae6aefc1d11053a32d151 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:42:13 2009 +0100 s4-smbtorture: fix test_DoPrintTest. Guenther commit 0d4dbe6012ee6f15256de14f8d4d6b32eb4ca313 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:32:57 2009 +0100 s4-smbtorture: fix test_GetPrinterDriverDirectory. Guenther commit b970eb791cdf8893881bab3c113fdd5f2ff9866e Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:25:47 2009 +0100 s4-smbtorture: fix test_GetPrinter. Guenther commit 8153916f4aad1482351719ed2f1d91d48fe89197 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:22:35 2009 +0100 s4-smbtorture: fix test_GetPrinter. Guenther commit 22e2f220be4ac05aead7ba7a893904299c5bbfd8 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 12:18:06 2009 +0100 s4-smbtorture: fix test_GetJob. Guenther commit cf15c687d279d3807caa90560d8799d6b00f005b Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:57:13 2009 +0100 s3: re-run make samba3-idl. Guenther commit 37c89c143009f1c6e0dae819bf08baaeca81df7d Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:53:03 2009 +0100 spoolss: fix spoolss_EnumPrinterKey IDL. Guenther commit cb5837dc192dabfe5d0edfb1be9acc3672785cd4 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:42:23 2009 +0100 spoolss: fix spoolss_EnumPrinterDataEx IDL. Guenther commit 121b5f4afdb22ae720947183303feab4c48f41a3 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:33:59 2009 +0100 spoolss: fix spoolss_GetPrinterDataEx IDL. Guenther commit de7a30817de5d77579520a8c776c2a8b1b2ffcc7 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 13:25:51 2009 +0100 spoolss: fix
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-100-gb392a24
The branch, v3-2-ctdb has been updated via b392a2441b393cc19235e3f287e438f8b8c62579 (commit) via 2762c1f05cbed70b5ef883813de62827399c6f95 (commit) from 410cb22473a02705cc6f478d0f26d56b435ccd8e (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit b392a2441b393cc19235e3f287e438f8b8c62579 Author: Stefan Metzmacher me...@samba.org Date: Wed Jan 28 17:36:36 2009 +0100 s3:configure: autodetect ctdb/cluster support We need to make sure ctdb has transaction support and we autodetect ipv6 support. metze (cherry picked from commit 11163720e6f30e83f523c5009e1e60b5cf28cda6) (cherry picked from commit f87f4842cc0ffc62d76ee5350b94f7bda735aa71) Signed-off-by: Michael Adam ob...@samba.org commit 2762c1f05cbed70b5ef883813de62827399c6f95 Author: Stefan Metzmacher me...@samba.org Date: Wed Jan 28 18:55:13 2009 +0100 s3:ctdbd_conn: canonicalize ips before sending them to ctdbd This makes samba work with older ctdb versions. metze (cherry picked from commit 7540d13956a8a69d25f6fbbc4f9a3417e91db1d2) (cherry picked from commit a7fcaff295c3a36e2b783398ac212500eef33ecb) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: source/Makefile.in |1 - source/configure.in | 119 +-- source/lib/ctdbd_conn.c | 50 source/m4/check_path.m4 | 12 - 4 files changed, 155 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 946bd0b..d76538c 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -124,7 +124,6 @@ INSTALLPERMS_DATA = 0644 LOGFILEBASE = @logfilebase@ CONFIGFILE = $(CONFIGDIR)/smb.conf LMHOSTSFILE = $(CONFIGDIR)/lmhosts -CTDBDIR = @ctdbdir@ # This is where smbpasswd et al go PRIVATEDIR = @privatedir@ diff --git a/source/configure.in b/source/configure.in index bc05ddd..b811516 100644 --- a/source/configure.in +++ b/source/configure.in @@ -5184,17 +5184,128 @@ AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT]) # # check for cluster extensions -AC_MSG_CHECKING(whether to include cluster support) +CTDB_CFLAGS= +AC_SUBST(CTDB_CFLAGS) +AC_ARG_WITH(ctdb, +[AS_HELP_STRING([--with-ctdb=DIR], [Where to find ctdb sources])], +[ case $withval in + yes|no) +AC_MSG_WARN([--with-ctdb called without argument]) +;; + *) +CTDB_CPPFLAGS=-I$withval/include +;; + esac]) + +SAVED_CPPFLAGS=$CPPFLAGS +CPPFLAGS=$CPPFLAGS $CTDB_CPPFLAGS +ctdb_broken=missing or broken headers + +AC_CHECK_HEADERS(ctdb.h ctdb_private.h,,,[ +#include confdefs.h +#define NO_CONFIG_H +#include replace.h +#include system/wait.h +#include system/network.h +#define private #error __USED_RESERVED_WORD_private__ +#include talloc.h +#include tdb.h +#include ctdb.h +]) + +AC_HAVE_DECL(CTDB_CONTROL_TRANS2_COMMIT_RETRY,[ +#include confdefs.h +#define NO_CONFIG_H +#include replace.h +#include system/wait.h +#include system/network.h +#include talloc.h +#include tdb.h +#include ctdb.h +#include ctdb_private.h +]) +if test x$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl = xyes; then + ctdb_broken=no +else + ctdb_broken=missing transaction support +fi + +# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client +AC_CHECK_TYPE(struct ctdb_tcp_client,[ + AC_DEFINE([ctdb_control_tcp],[ctdb_tcp_client],[ctdb ipv4 support]) +],,[ +#include confdefs.h +#define NO_CONFIG_H +#include replace.h +#include system/wait.h +#include system/network.h +#include talloc.h +#include tdb.h +#include ctdb.h +#include ctdb_private.h +]) + +AC_CHECK_TYPE(struct ctdb_control_tcp,[ + AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP],[1],[ctdb ipv4 support]) +],[ + ctdb_broken=missing struct ctdb_control_tcp +],[ +#include confdefs.h +#define NO_CONFIG_H +#include replace.h +#include system/wait.h +#include system/network.h +#include talloc.h +#include tdb.h +#include ctdb.h +#include ctdb_private.h +]) + +AC_CHECK_TYPE(struct ctdb_control_tcp_addr,[ + AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR],[1],[ctdb ipv6 support]) +],,[ +#include confdefs.h +#define NO_CONFIG_H +#include replace.h +#include system/wait.h +#include system/network.h +#include talloc.h +#include tdb.h +#include ctdb.h +#include ctdb_private.h +]) +CPPFLAGS=$SAVED_CPPFLAGS + +AC_MSG_CHECKING(cluster support) AC_ARG_WITH(cluster-support, -[AS_HELP_STRING([--with-cluster-support], [Enable cluster extensions (default=no)])]) -if test x$with_cluster_support = xyes; then +[AS_HELP_STRING([--with-cluster-support], [Enable cluster extensions (default=auto)])]) + +if test x$with_cluster_support = x ; then + with_cluster_support=auto +fi + +if test
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4915-g5cd79db1
The branch, v3-3-test has been updated
via 5cd79db1326d70c592e86491d36567a2eb4e1717 (commit)
from e513360db3f2cc6ff1865ec08fc243dd6346e18e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 5cd79db1326d70c592e86491d36567a2eb4e1717
Author: Shirish Pargaonkar shirishpargaon...@gmail.com
Date: Fri Feb 6 08:15:35 2009 -0500
mount.cifs: add fakemount (-f) and nomtab (-n) flags to mount.cifs
...so that these options work correctly when passed in by mount(8).
---
Summary of changes:
source/client/mount.cifs.c | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9f4d1d3..df5be84 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -85,6 +85,7 @@
const char *thisprogram;
int verboseflag = 0;
+int fakemnt = 0;
static int got_password = 0;
static int got_user = 0;
static int got_domain = 0;
@@ -1103,8 +1104,8 @@ int main(int argc, char ** argv)
mount_cifs_usage ();
exit(EX_USAGE);
case 'n':
- ++nomtab;
- break;
+ ++nomtab;
+ break;
case 'b':
#ifdef MS_BIND
flags |= MS_BIND;
@@ -1209,6 +1210,9 @@ int main(int argc, char ** argv)
break;
case 't':
break;
+ case 'f':
+ ++fakemnt;
+ break;
default:
printf(unknown mount option %c\n,c);
mount_cifs_usage();
@@ -1410,7 +1414,7 @@ mount_retry:
}
}
- if (mount(dev_name, mountpoint, cifs, flags, options)) {
+ if (!fakemnt mount(dev_name, mountpoint, cifs, flags, options)) {
switch (errno) {
case ECONNREFUSED:
case EHOSTUNREACH:
@@ -1440,6 +1444,8 @@ mount_retry:
goto mount_exit;
}
+ if (nomtab)
+ goto mount_exit;
atexit(unlock_mtab);
rc = lock_mtab();
if (rc) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3431-g6c9b13a
The branch, v3-2-test has been updated via 6c9b13a4c2bfa17793d0f575f53d815afe8a8682 (commit) from f00dfc58ea2a6d5794b71136acf5d1532393132b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 6c9b13a4c2bfa17793d0f575f53d815afe8a8682 Author: Michael Adam ob...@samba.org Date: Thu Feb 5 22:19:58 2009 +0100 docs: fix two typos in the mount.cifs manpage Michael (cherry picked from commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/mount.cifs.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 00711e0..c386592 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -372,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried. termnoacl/term listitemparaDo not allow POSIX ACL operations even if server would support them./parapara The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers - version 3.10 and later. Setting POSIX ACLs requires enabling both XATTR and + version 3.0.10 and later. Setting POSIX ACLs requires enabling both XATTR and then POSIX support in the CIFS configuration options when building the cifs - module. POSIX ACL support can be disabled on a per mount basic by specifying + module. POSIX ACL support can be disabled on a per mount basis by specifying noacl on mount./para /listitem /varlistentry -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4913-g38ea92a
The branch, v3-3-test has been updated via 38ea92a4c1cb0e8c52ccff9b77bb59070030d10c (commit) from ba3884d4d5c55723c1989e8e3868aa7ea8db8c60 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 38ea92a4c1cb0e8c52ccff9b77bb59070030d10c Author: Michael Adam ob...@samba.org Date: Thu Feb 5 22:19:58 2009 +0100 docs: fix two typos in the mount.cifs manpage Michael (cherry picked from commit 145fe37766cf1ecffb16a03b58b44d08f7ed7558) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/mount.cifs.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 4eb9cb2..534f168 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -372,9 +372,9 @@ port 445 is tried and if no response then port 139 is tried. termnoacl/term listitemparaDo not allow POSIX ACL operations even if server would support them./parapara The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers - version 3.10 and later. Setting POSIX ACLs requires enabling both XATTR and + version 3.0.10 and later. Setting POSIX ACLs requires enabling both XATTR and then POSIX support in the CIFS configuration options when building the cifs - module. POSIX ACL support can be disabled on a per mount basic by specifying + module. POSIX ACL support can be disabled on a per mount basis by specifying noacl on mount./para /listitem /varlistentry -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-567-gab6d6c7
The branch, master has been updated
via ab6d6c7c131d6bf23251fe3fe84765cbe73934f7 (commit)
via afe300cb527c19cffa8667db4772d0d5812c342b (commit)
via 0155b5c8439d829c8ced81cd0198830de095cca6 (commit)
via 9ad6b94339203a88cfbd78a9faff3bc35877ff8e (commit)
via 68077a6d641bc115dfe821fa02552ce10ce5c153 (commit)
from f157c1a07f3fbbc461a806b10e24e25d0b261070 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ab6d6c7c131d6bf23251fe3fe84765cbe73934f7
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 17:11:15 2009 +0100
s4-spoolss: fix spoolss server w.r.t. needed out pointers (+ remove tmp
macro).
Guenther
commit afe300cb527c19cffa8667db4772d0d5812c342b
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 17:09:30 2009 +0100
s4-smbtorture: fix spoolss enum tests.
Guenther
commit 0155b5c8439d829c8ced81cd0198830de095cca6
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 17:13:58 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 9ad6b94339203a88cfbd78a9faff3bc35877ff8e
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 17:10:02 2009 +0100
spoolss: fix spoolss helper functions and macros w.r.t. needed pointer.
Guenther
commit 68077a6d641bc115dfe821fa02552ce10ce5c153
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 17:07:16 2009 +0100
spoolss: make needed an out,ref pointer for all the tripple-enumcalls.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c| 32 +++---
librpc/gen_ndr/cli_spoolss.h| 16 ++--
librpc/gen_ndr/ndr_spoolss.c| 168 +++
librpc/gen_ndr/spoolss.h| 32 +++---
librpc/idl/spoolss.idl | 32 +++---
librpc/ndr/ndr_spoolss_buf.c|4 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 24 ++--
source4/torture/rpc/samba3rpc.c |6 +-
source4/torture/rpc/spoolss.c | 65 +++
source4/torture/rpc/spoolss_win.c | 14 ++-
10 files changed, 271 insertions(+), 122 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index dfb0060..04065c8 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -14,7 +14,7 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
DATA_BLOB *buffer /* [in] [unique] */,
uint32_t offered /* [in] */,
union spoolss_PrinterInfo *info /* [out]
[unique,switch_is(level),size_is(count)] */,
-uint32_t needed /* [out] */,
+uint32_t *needed /* [out] [ref] */,
uint32_t count /* [out] */,
WERROR *werror)
{
@@ -54,7 +54,7 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
if (info r.out.info) {
memcpy(info, r.out.info, count * sizeof(*info));
}
- return NT_STATUS_NOT_SUPPORTED;
+ *needed = *r.out.needed;
return NT_STATUS_NOT_SUPPORTED;
/* Return result */
@@ -231,7 +231,7 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client
*cli,
DATA_BLOB *buffer /* [in] [unique] */,
uint32_t offered /* [in] */,
union spoolss_JobInfo *info /* [out]
[unique,switch_is(level),size_is(count)] */,
-uint32_t needed /* [out] */,
+uint32_t *needed /* [out] [ref] */,
uint32_t count /* [out] */,
WERROR *werror)
{
@@ -272,7 +272,7 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client
*cli,
if (info r.out.info) {
memcpy(info, r.out.info, count * sizeof(*info));
}
- return NT_STATUS_NOT_SUPPORTED;
+ *needed = *r.out.needed;
return NT_STATUS_NOT_SUPPORTED;
/* Return result */
@@ -524,7 +524,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct
rpc_pipe_client *cli,
DATA_BLOB *buffer /* [in] [unique]
*/,
uint32_t offered /* [in] */,
union spoolss_DriverInfo *info /*
[out] [unique,switch_is(level),size_is(count)] */,
- uint32_t needed /* [out] */,
+ uint32_t *needed /* [out] [ref] */,
uint32_t count /*
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4914-ge513360
The branch, v3-3-test has been updated
via e513360db3f2cc6ff1865ec08fc243dd6346e18e (commit)
from 38ea92a4c1cb0e8c52ccff9b77bb59070030d10c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit e513360db3f2cc6ff1865ec08fc243dd6346e18e
Author: Michael Adam ob...@samba.org
Date: Fri Feb 6 10:42:11 2009 +0100
s3:net conf: remove check for sharename being a usernam in net conf
addshare
This is useless and can be overriden by net conf setparm anyways.
Michael
---
Summary of changes:
source/utils/net_conf.c |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index ab1b0f3..3d542fc 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -576,12 +576,6 @@ static int net_conf_addshare(struct net_context *c,
goto done;
}
- if (getpwnam(sharename)) {
- d_fprintf(stderr, ERROR: share name %s is already a valid
- system user name.\n, sharename);
- goto done;
- }
-
if (strequal(sharename, GLOBAL_NAME)) {
d_fprintf(stderr,
ERROR: 'global' is not a valid share name.\n);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-573-g143a5b8
The branch, master has been updated
via 143a5b89eeb669640299e67d82decb38512d4f3c (commit)
via b156bd2124a7be375f21e3086629fffa83500032 (commit)
via cd5a314b51cb852dcfa452791c0cf857883f600f (commit)
via 6f38fe3e66d1af1ed22dd8ddf88798d39c0f826b (commit)
via 1ebd35e872a7ef4def2a835ecb371079020fa53d (commit)
via 117d6d1686bbbd158f0c74836c0e173c02a1b77b (commit)
from ab6d6c7c131d6bf23251fe3fe84765cbe73934f7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 143a5b89eeb669640299e67d82decb38512d4f3c
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:34:04 2009 +0100
s4-spoolss: fix dcesrv_spoolss_GetPrinterData.
Guenther
commit b156bd2124a7be375f21e3086629fffa83500032
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:33:34 2009 +0100
s4-spoolss: fix sptr_GetPrintServerData.
Guenther
commit cd5a314b51cb852dcfa452791c0cf857883f600f
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:32:24 2009 +0100
s4-smbtorture: fix test_GetPrinterData.
Guenther
commit 6f38fe3e66d1af1ed22dd8ddf88798d39c0f826b
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:35:01 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 1ebd35e872a7ef4def2a835ecb371079020fa53d
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:32:44 2009 +0100
spoolss: fix ndr_pull/push_spoolss_GetPrinterData.
Guenther
commit 117d6d1686bbbd158f0c74836c0e173c02a1b77b
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:31:46 2009 +0100
spoolss: fix type pointer in spoolss_GetPrinterData and related functions.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c|6 +++---
librpc/gen_ndr/cli_spoolss.h|4 ++--
librpc/gen_ndr/ndr_spoolss.c| 23 +++
librpc/gen_ndr/spoolss.h|6 +++---
librpc/idl/spoolss.idl |6 +++---
librpc/ndr/ndr_spoolss_buf.c|4 ++--
source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 26 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c |4 ++--
source4/torture/rpc/spoolss.c |2 ++
source4/torture/rpc/spoolss_win.c |2 ++
10 files changed, 51 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 04065c8..d8dc5a9 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -1269,8 +1269,8 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct
rpc_pipe_client *cli,
struct policy_handle *handle /* [in]
[ref] */,
const char *value_name /* [in]
[charset(UTF16)] */,
uint32_t offered /* [in] */,
- enum spoolss_PrinterDataType type /*
[out] */,
- union spoolss_PrinterData data /* [out]
[subcontext_size(offered),subcontext(4),switch_is(type)] */,
+ enum spoolss_PrinterDataType *type /*
[out] [ref] */,
+ union spoolss_PrinterData data /* [out]
[subcontext_size(offered),subcontext(4),switch_is(*type)] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
@@ -1305,7 +1305,7 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct
rpc_pipe_client *cli,
}
/* Return variables */
- return NT_STATUS_NOT_SUPPORTED;
+ *type = *r.out.type;
return NT_STATUS_NOT_SUPPORTED;
*needed = *r.out.needed;
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index bea0440..6a4ffb0 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -173,8 +173,8 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct
rpc_pipe_client *cli,
struct policy_handle *handle /* [in]
[ref] */,
const char *value_name /* [in]
[charset(UTF16)] */,
uint32_t offered /* [in] */,
- enum spoolss_PrinterDataType type /*
[out] */,
- union spoolss_PrinterData data /* [out]
[subcontext_size(offered),subcontext(4),switch_is(type)] */,
+ enum spoolss_PrinterDataType *type /*
[out] [ref] */,
+ union spoolss_PrinterData data /* [out]
[subcontext_size(offered),subcontext(4),switch_is(*type)] */,
uint32_t
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-575-g1bb22b5
The branch, master has been updated
via 1bb22b55274c6d9661acb8c051f8489287a9a2cd (commit)
via 2bbe0c2859487e286f90d0ab7305da54aed5f1e1 (commit)
from 143a5b89eeb669640299e67d82decb38512d4f3c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1bb22b55274c6d9661acb8c051f8489287a9a2cd
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:52:42 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 2bbe0c2859487e286f90d0ab7305da54aed5f1e1
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 18:51:36 2009 +0100
pidl: return early when AllocOutVar() in s3 server generator has nothing to
do.
Jelmer, Metze, please check.
Guenther
---
Summary of changes:
librpc/gen_ndr/srv_spoolss.c| 88 ---
pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |7 ++-
2 files changed, 5 insertions(+), 90 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/srv_spoolss.c b/librpc/gen_ndr/srv_spoolss.c
index 1f7d29f..64af1c4 100644
--- a/librpc/gen_ndr/srv_spoolss.c
+++ b/librpc/gen_ndr/srv_spoolss.c
@@ -57,12 +57,6 @@ static bool api_spoolss_EnumPrinters(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumPrinters(p, r);
if (p-rng_fault_state) {
@@ -388,12 +382,6 @@ static bool api_spoolss_EnumJobs(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumJobs(p, r);
if (p-rng_fault_state) {
@@ -858,12 +846,6 @@ static bool api_spoolss_EnumPrinterDrivers(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumPrinterDrivers(p, r);
if (p-rng_fault_state) {
@@ -1255,12 +1237,6 @@ static bool api_spoolss_EnumPrintProcessors(pipes_struct
*p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumPrintProcessors(p, r);
if (p-rng_fault_state) {
@@ -2098,12 +2074,6 @@ static bool api_spoolss_GetPrinterData(pipes_struct *p)
return false;
}
- r-out.data = talloc_zero(r, union spoolss_PrinterData);
- if (r-out.data == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.needed = talloc_zero(r, uint32_t);
if (r-out.needed == NULL) {
talloc_free(r);
@@ -2722,12 +2692,6 @@ static bool api_spoolss_EnumForms(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumForms(p, r);
if (p-rng_fault_state) {
@@ -2814,12 +2778,6 @@ static bool api_spoolss_EnumPorts(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumPorts(p, r);
if (p-rng_fault_state) {
@@ -2906,12 +2864,6 @@ static bool api_spoolss_EnumMonitors(pipes_struct *p)
return false;
}
- r-out.count = talloc_zero(r, uint32_t);
- if (r-out.count == NULL) {
- talloc_free(r);
- return false;
- }
-
r-out.result = _spoolss_EnumMonitors(p, r);
if (p-rng_fault_state) {
@@ -7527,11 +7479,6 @@ NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- r-out.count = talloc_zero(mem_ctx, uint32_t);
- if (r-out.count == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
r-out.result =
_spoolss_EnumPrinters(cli-pipes_struct, r);
return NT_STATUS_OK;
}
@@ -7584,11 +7531,6 @@ NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- r-out.count =
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-577-ga45107a
The branch, master has been updated via a45107abca61c2c7f097c807818bc11fc5910fd4 (commit) via e11fa4cc331d28d71db4ab95d52ae39922f2502f (commit) from 1bb22b55274c6d9661acb8c051f8489287a9a2cd (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a45107abca61c2c7f097c807818bc11fc5910fd4 Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:32:14 2008 +0100 s3-spoolss server: add _spoolss_ server stubs. Guenther commit e11fa4cc331d28d71db4ab95d52ae39922f2502f Author: Günther Deschner g...@samba.org Date: Fri Nov 14 21:30:59 2008 +0100 s3-spoolss: prepare to use generated spoolss. Guenther --- Summary of changes: source3/Makefile.in |9 +- source3/configure.in|6 +- source3/include/proto.h |5 +- source3/include/rpc_client.h|1 + source3/include/smb.h |1 + source3/rpc_server/srv_spoolss.c| 47 +- source3/rpc_server/srv_spoolss_nt.c | 1056 +++ 7 files changed, 1093 insertions(+), 32 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 8e8932b..b67cbab 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -308,7 +308,8 @@ LIBNDR_GEN_OBJ = ../librpc/gen_ndr/ndr_wkssvc.o \ ../librpc/gen_ndr/ndr_xattr.o \ ../librpc/gen_ndr/ndr_epmapper.o \ ../librpc/gen_ndr/ndr_named_pipe_auth.o \ -../librpc/gen_ndr/ndr_ntsvcs.o +../librpc/gen_ndr/ndr_ntsvcs.o \ +$(LIBNDR_GEN_OBJ2) RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o @@ -481,6 +482,7 @@ LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \ ../librpc/gen_ndr/cli_ntsvcs.o \ ../librpc/gen_ndr/cli_epmapper.o \ ../librpc/gen_ndr/cli_drsuapi.o \ + ../librpc/gen_ndr/cli_spoolss.o \ $(LIBNDR_GEN_OBJ) \ $(RPCCLIENT_NDR_OBJ) @@ -567,7 +569,8 @@ RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \ RPC_DFS_OBJ = ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o -RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o +RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o \ + ../librpc/gen_ndr/srv_spoolss.o RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \ $(LIB_EVENTLOG_OBJ) ../librpc/gen_ndr/srv_eventlog.o @@ -2253,7 +2256,7 @@ bin/librpc_dsset...@shlibext@: $(BINARY_PREREQS) $(RPC_DSSETUP_OBJ) @echo Linking $@ @$(SHLD_MODULE) $(RPC_DSSETUP_OBJ) -bin/librpc_spool...@shlibext@: $(BINARY_PREREQS) $(RPC_SPOOLSS_OBJ) +bin/librpc_spools...@shlibext@: $(BINARY_PREREQS) $(RPC_SPOOLSS_OBJ) @echo Linking $@ @$(SHLD_MODULE) $(RPC_SPOOLSS_OBJ) diff --git a/source3/configure.in b/source3/configure.in index 306566f..431d330 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -414,7 +414,7 @@ AC_SUBST(DYNEXP) dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template +default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss2 rpc_eventlog auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer @@ -6296,7 +6296,7 @@ do done dnl Always build these modules static -MODULE_rpc_spoolss=STATIC +MODULE_rpc_spoolss2=STATIC MODULE_rpc_srvsvc=STATIC MODULE_idmap_tdb=STATIC MODULE_idmap_passdb=STATIC @@ -6339,7 +6339,7 @@ SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), bin/librpc_ntsvcs.$SHLIBEXT, RPC) SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), bin/librpc_NETLOGON.$SHLIBEXT, RPC) SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), bin/librpc_netdfs.$SHLIBEXT, RPC) SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), bin/librpc_svcsvc.$SHLIBEXT, RPC) -SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ),
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-580-g88f09a8
The branch, master has been updated via 88f09a8353597b72885838dfdc61b7631ae0192f (commit) via 0bd5698dabdf8a408e21c5261a688dd2599af3cf (commit) via 46903a0f907869253899d05b3c04c93aa2e2812d (commit) from a45107abca61c2c7f097c807818bc11fc5910fd4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 88f09a8353597b72885838dfdc61b7631ae0192f Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:59:39 2008 +0100 s3-spoolss: remove old _spoolss_ClosePrinter. Guenther commit 0bd5698dabdf8a408e21c5261a688dd2599af3cf Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:58:26 2008 +0100 s3-spoolss: use rpccli_spoolss_ClosePrinter. Guenther commit 46903a0f907869253899d05b3c04c93aa2e2812d Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:36:11 2008 +0100 s3-spoolss: use pidl for _spoolss_ClosePrinter. Guenther --- Summary of changes: source3/include/proto.h |6 --- source3/include/rpc_spoolss.h | 13 --- source3/libads/ldap_printer.c |2 +- source3/rpc_client/cli_spoolss.c| 25 -- source3/rpc_parse/parse_spoolss.c | 60 --- source3/rpc_server/srv_spoolss.c| 22 + source3/rpc_server/srv_spoolss_nt.c | 24 -- source3/rpcclient/cmd_spoolss.c | 42 source3/utils/net_rpc_printer.c | 50 ++-- 9 files changed, 55 insertions(+), 189 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index baf0a4a..2c77945 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5428,8 +5428,6 @@ NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli, WERROR rpccli_spoolss_open_printer_ex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *printername, const char *datatype, uint32 access_required, const char *station, const char *username, POLICY_HND *pol); -WERROR rpccli_spoolss_close_printer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, -POLICY_HND *pol); WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, char *name, uint32 flags, uint32 level, uint32 *num_printers, PRINTER_INFO_CTR *ctr); @@ -5881,7 +5879,6 @@ bool spoolss_io_r_deleteprinterdata(const char *desc, SPOOL_R_DELETEPRINTERDATA bool spoolss_io_q_deleteprinterdataex(const char *desc, SPOOL_Q_DELETEPRINTERDATAEX *q_u, prs_struct *ps, int depth); bool spoolss_io_r_deleteprinterdataex(const char *desc, SPOOL_R_DELETEPRINTERDATAEX *r_u, prs_struct *ps, int depth); bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u, prs_struct *ps, int depth); -bool make_spoolss_q_closeprinter(SPOOL_Q_CLOSEPRINTER *q_u, POLICY_HND *hnd); bool spoolss_io_q_abortprinter(const char *desc, SPOOL_Q_ABORTPRINTER *q_u, prs_struct *ps, int depth); bool spoolss_io_r_abortprinter(const char *desc, SPOOL_R_ABORTPRINTER *r_u, prs_struct *ps, int depth); bool spoolss_io_q_deleteprinter(const char *desc, SPOOL_Q_DELETEPRINTER *q_u, prs_struct *ps, int depth); @@ -5890,8 +5887,6 @@ bool spoolss_io_q_deleteprinterdriver(const char *desc, SPOOL_Q_DELETEPRINTERDRI bool spoolss_io_r_deleteprinterdriver(const char *desc, SPOOL_R_DELETEPRINTERDRIVER *r_u, prs_struct *ps, int depth); bool spoolss_io_q_deleteprinterdriverex(const char *desc, SPOOL_Q_DELETEPRINTERDRIVEREX *q_u, prs_struct *ps, int depth); bool spoolss_io_r_deleteprinterdriverex(const char *desc, SPOOL_R_DELETEPRINTERDRIVEREX *r_u, prs_struct *ps, int depth); -bool spoolss_io_q_closeprinter(const char *desc, SPOOL_Q_CLOSEPRINTER *q_u, prs_struct *ps, int depth); -bool spoolss_io_r_closeprinter(const char *desc, SPOOL_R_CLOSEPRINTER *r_u, prs_struct *ps, int depth); bool spoolss_io_q_startdocprinter(const char *desc, SPOOL_Q_STARTDOCPRINTER *q_u, prs_struct *ps, int depth); bool spoolss_io_r_startdocprinter(const char *desc, SPOOL_R_STARTDOCPRINTER *r_u, prs_struct *ps, int depth); bool spoolss_io_q_enddocprinter(const char *desc, SPOOL_Q_ENDDOCPRINTER *q_u, prs_struct *ps, int depth); @@ -6299,7 +6294,6 @@ WERROR _spoolss_open_printer(pipes_struct *p, SPOOL_Q_OPEN_PRINTER *q_u, SPOOL_R WERROR _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, SPOOL_R_OPEN_PRINTER_EX *r_u); bool convert_devicemode(const char *printername, const DEVICEMODE *devmode, NT_DEVICEMODE **pp_nt_devmode); -WERROR _spoolss_closeprinter(pipes_struct *p, SPOOL_Q_CLOSEPRINTER *q_u, SPOOL_R_CLOSEPRINTER *r_u); WERROR
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-581-g126d444
The branch, master has been updated
via 126d44436765746dd74258a217d66e9885bc396d (commit)
from 88f09a8353597b72885838dfdc61b7631ae0192f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 126d44436765746dd74258a217d66e9885bc396d
Author: Günther Deschner g...@samba.org
Date: Fri Feb 6 19:23:55 2009 +0100
s3-spoolss: call the correct get_pipe_fns function in proxy_spoolss_call().
Guenther
---
Summary of changes:
source3/rpc_server/srv_spoolss.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 1f25342..24d4049 100644
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -35,7 +35,7 @@ static bool proxy_spoolss_call(pipes_struct *p, uint8_t opnum)
struct api_struct *fns;
int n_fns;
- spoolss2_get_pipe_fns(fns, n_fns);
+ spoolss_get_pipe_fns(fns, n_fns);
if (opnum = n_fns) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-592-g100aad0
The branch, master has been updated via 100aad0ddff4e817de99c5d8e0f51ff730d55d58 (commit) via 714ac784e183ea50ce9dab440eb4c73320227a0b (commit) via 2a5ae9e47b6b25c59ad7bc891a0fa5c6ebfa320b (commit) via 3fe9b2fb4fc0d3b88d7e668c093feaf934ccbc5b (commit) via eb542ef630ffa429746a5ec05a8592db85a0a99d (commit) via 7f5ff8852039bc0fde2ae63acb3588646ddecc6f (commit) via f8582f18ecc9e8f022e5d89eae8bf010cc080eac (commit) via 246a1a1eacf983f7dae97677e0047d4d5182eb02 (commit) via cb6ef25341d183eda44df40e51b2e5b0aba55c2c (commit) via 69577cacfe16be0612a70a548b51886b9752c0ed (commit) via f968057cd21c78122a6716de11bdb448f99e907d (commit) from 126d44436765746dd74258a217d66e9885bc396d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 100aad0ddff4e817de99c5d8e0f51ff730d55d58 Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:59:00 2008 +0100 s3-spoolss: remove old _spoolss_EndDocPrinter. Guenther commit 714ac784e183ea50ce9dab440eb4c73320227a0b Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:58:36 2008 +0100 s3-spoolss: use pidl for _spoolss_EndDocPrinter. Guenther commit 2a5ae9e47b6b25c59ad7bc891a0fa5c6ebfa320b Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:53:37 2008 +0100 s3-spoolss: remove old _spoolss_AbortPrinter. Guenther commit 3fe9b2fb4fc0d3b88d7e668c093feaf934ccbc5b Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:53:08 2008 +0100 s3-spoolss: use pidl for _spoolss_AbortPrinter. Guenther commit eb542ef630ffa429746a5ec05a8592db85a0a99d Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:49:21 2008 +0100 s3-spoolss: remove old _spoolss_EndPagePrinter. Guenther commit 7f5ff8852039bc0fde2ae63acb3588646ddecc6f Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:49:00 2008 +0100 s3-spoolss: use pidl for _spoolss_EndPagePrinter. Guenther commit f8582f18ecc9e8f022e5d89eae8bf010cc080eac Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:45:19 2008 +0100 s3-spoolss: remove old _spoolss_StartPagePrinter. Guenther commit 246a1a1eacf983f7dae97677e0047d4d5182eb02 Author: Günther Deschner g...@samba.org Date: Fri Feb 6 21:38:43 2009 +0100 w commit cb6ef25341d183eda44df40e51b2e5b0aba55c2c Author: Günther Deschner g...@samba.org Date: Sat Nov 15 00:44:51 2008 +0100 s3-spoolss: use pidl for _spoolss_StartPagePrinter. Guenther commit 69577cacfe16be0612a70a548b51886b9752c0ed Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:47:53 2008 +0100 s3-spoolss: remove old _spoolss_DeletePrinter. Guenther commit f968057cd21c78122a6716de11bdb448f99e907d Author: Günther Deschner g...@samba.org Date: Fri Nov 14 23:43:30 2008 +0100 s3-spoolss: use pidl for _spoolss_DeletePrinter. Guenther --- Summary of changes: source3/include/proto.h | 27 source3/include/rpc_spoolss.h | 59 - source3/rpc_client/cli_spoolss.c| 75 source3/rpc_parse/parse_spoolss.c | 226 --- source3/rpc_server/srv_spoolss.c| 111 + source3/rpc_server/srv_spoolss_nt.c | 115 +- 6 files changed, 37 insertions(+), 576 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 2c77945..3aad313 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5489,16 +5489,10 @@ WERROR rpccli_spoolss_setjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, uint32 jobid, uint32 level, JOB_INFO_CTR *ctr); -WERROR rpccli_spoolss_startpageprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *hnd); -WERROR rpccli_spoolss_endpageprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *hnd); WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *docname, char *outputfile, char *datatype, uint32 *jobid); -WERROR rpccli_spoolss_enddocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *hnd); WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, const char *valuename, REGISTRY_VALUE *value); @@ -5879,22
[SCM] CTDB repository - branch master updated - ctdb-1.0.70b-26-g59a04a5
The branch, master has been updated via 59a04a50e64aae0a89b165d0428e23a8bcf8eb24 (commit) from dfb16ce9ed65048d30109851737a9075d071ecdb (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 59a04a50e64aae0a89b165d0428e23a8bcf8eb24 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Sat Feb 7 08:10:34 2009 +1100 add a licence file --- Summary of changes: COPYING | 674 +++ 1 files changed, 674 insertions(+), 0 deletions(-) create mode 100644 COPYING Changeset truncated at 500 lines: diff --git a/COPYING b/COPYING new file mode 100644 index 000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + This License refers to version 3 of the GNU General Public License. + + Copyright also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + The Program refers to any copyrightable work licensed under this +License. Each licensee is addressed as you. Licensees and +recipients may be individuals or organizations. +
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-593-g6b19c39
The branch, master has been updated via 6b19c396970f527fc0527c736acdce22de2917ae (commit) from 100aad0ddff4e817de99c5d8e0f51ff730d55d58 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6b19c396970f527fc0527c736acdce22de2917ae Author: Günther Deschner g...@samba.org Date: Sat Feb 7 00:21:46 2009 +0100 s4-smbtorture: fix valgrind warnings in RPC-SPOOLSS_WIN test. Guenther --- Summary of changes: source4/torture/rpc/spoolss_win.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c index ed2bdc7..ab5adef 100644 --- a/source4/torture/rpc/spoolss_win.c +++ b/source4/torture/rpc/spoolss_win.c @@ -357,6 +357,7 @@ static bool test_EnumPrinterKey(struct torture_context *tctx, epk.in.key_name = talloc_strdup(tctx, key); epk.in.key_buffer_size = 0; epk.out.needed = needed; + epk.out.key_buffer = talloc_array(tctx, uint16_t, 0); status = dcerpc_spoolss_EnumPrinterKey(p, tctx, epk); torture_assert_ntstatus_ok(tctx, status, EnumPrinterKey failed); @@ -398,6 +399,7 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx, epde.in.offered = 0; epde.out.needed = needed; epde.out.count = count; + epde.out.buffer = talloc_array(tctx, uint8_t, 0); status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, epde); torture_assert_ntstatus_ok(tctx, status, EnumPrinterDataEx failed.); -- Samba Shared Repository
Build status as of Sat Feb 7 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-02-06 00:00:22.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-07 00:00:33.0 + @@ -1,23 +1,23 @@ -Build status as of Fri Feb 6 00:00:01 2009 +Build status as of Sat Feb 7 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 29 6 0 +ccache 28 6 0 ctdb 0 0 0 distcc 1 0 0 -ldb 29 29 0 -libreplace 28 11 0 -lorikeet-heimdal 26 15 0 -pidl 18 2 0 -ppp 11 0 0 -rsync29 8 0 +ldb 26 28 0 +libreplace 27 11 0 +lorikeet-heimdal 25 14 0 +pidl 17 2 0 +ppp 10 0 0 +rsync28 8 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 27 24 0 -samba_3_X_test 27 24 0 -samba_4_0_test 29 28 1 +samba_3_X_devel 26 24 0 +samba_3_X_test 26 23 0 +samba_4_0_test 28 26 7 smb-build26 5 0 -talloc 29 29 0 -tdb 26 9 0 +talloc 28 28 0 +tdb 25 9 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-595-g9bfca0b
The branch, master has been updated
via 9bfca0bea0521b41c7bbf1ccbd35ce2e4cbb31ef (commit)
via 2f44170836a2011e65c069109f7153568834bc12 (commit)
from 6b19c396970f527fc0527c736acdce22de2917ae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9bfca0bea0521b41c7bbf1ccbd35ce2e4cbb31ef
Author: Günther Deschner g...@samba.org
Date: Sat Feb 7 01:49:55 2009 +0100
s4-spoolss: try to fix dcesrv_spoolss_GetPrinterData.
Guenther
commit 2f44170836a2011e65c069109f7153568834bc12
Author: Günther Deschner g...@samba.org
Date: Sat Feb 7 00:51:05 2009 +0100
spoolss: fix ndr_pull_spoolss_GetPrinterData.
Guenther
---
Summary of changes:
librpc/ndr/ndr_spoolss_buf.c|2 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c |3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index c18f31a..0ab017e 100644
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -481,7 +481,7 @@ enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct
ndr_pull *ndr, int flag
NDR_CHECK(ndr_pull___spoolss_GetPrinterData(_ndr_data,
flags, __r));
r-out.data = __r.out.data;
} else {
- r-out.type = SPOOLSS_PRINTER_DATA_TYPE_NULL;
+ *r-out.type= SPOOLSS_PRINTER_DATA_TYPE_NULL;
}
}
return NDR_ERR_SUCCESS;
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c
b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index 2ba1a65..e137497 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -564,6 +564,9 @@ static WERROR dcesrv_spoolss_GetPrinterData(struct
dcesrv_call_state *dce_call,
if (!handle)
return WERR_BADFID;
+ r-out.type = talloc_zero(mem_ctx, enum spoolss_PrinterDataType);
+ W_ERROR_HAVE_NO_MEMORY(r-out.type);
+
switch (handle-type) {
case NTPTR_HANDLE_SERVER:
status = ntptr_GetPrintServerData(handle, mem_ctx, r);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-599-g04c971d
The branch, master has been updated via 04c971dc6c5b1f4a621b1a28bdfbb396bc6d1a9e (commit) via f5a24b71b930a6906af5f357de5d0be34f1dead2 (commit) via b56c5bf5105ef3ddb1dd7525476323d2f503e59e (commit) via b8cd20cd5c3ff537d48a05dd04886ced107da7ae (commit) from 9bfca0bea0521b41c7bbf1ccbd35ce2e4cbb31ef (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 04c971dc6c5b1f4a621b1a28bdfbb396bc6d1a9e Author: Günther Deschner g...@samba.org Date: Mon Nov 17 10:57:49 2008 +0100 s3-spoolss: remove old _spoolss_DeleteForm. Guenther commit f5a24b71b930a6906af5f357de5d0be34f1dead2 Author: Günther Deschner g...@samba.org Date: Mon Nov 17 10:56:32 2008 +0100 s3-spoolss: use pidl for _spoolss_DeleteForm. Guenther commit b56c5bf5105ef3ddb1dd7525476323d2f503e59e Author: Günther Deschner g...@samba.org Date: Sat Nov 15 22:17:23 2008 +0100 s3-spoolss: rework some form functions and add form_by_string functions. Guenther commit b8cd20cd5c3ff537d48a05dd04886ced107da7ae Author: Günther Deschner g...@samba.org Date: Sat Nov 15 22:16:51 2008 +0100 s3-spoolss: use rpccli_spoolss_DeleteForm. Guenther --- Summary of changes: source3/include/proto.h |9 +- source3/include/rpc_spoolss.h | 13 -- source3/printing/nt_printing.c | 31 --- source3/rpc_client/cli_spoolss.c| 25 --- source3/rpc_parse/parse_spoolss.c | 46 --- source3/rpc_server/srv_spoolss.c| 22 + source3/rpc_server/srv_spoolss_nt.c | 34 ++ source3/rpcclient/cmd_spoolss.c |9 ++- 8 files changed, 45 insertions(+), 144 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 3aad313..6b4a252 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4788,10 +4788,12 @@ uint32 update_c_setprinter(bool initialize); uint32 get_c_setprinter(void); int get_builtin_ntforms(nt_forms_struct **list); bool get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form); +bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form); int get_ntforms(nt_forms_struct **list); int write_ntforms(nt_forms_struct **list, int number); bool add_a_form(nt_forms_struct **list, const FORM *form, int *count); bool delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR *ret); +bool delete_a_form_by_string(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret); void update_a_form(nt_forms_struct **list, const FORM *form, int count); int get_ntdrivers(fstring **list, const char *architecture, uint32 version); const char *get_short_archi(const char *long_archi); @@ -5475,8 +5477,6 @@ WERROR rpccli_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR rpccli_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, const char *formname, uint32 level, FORM_1 *form); -WERROR rpccli_spoolss_deleteform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *handle, const char *form_name); WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, int level, uint32 *num_forms, FORM_1 **forms); @@ -6060,8 +6060,6 @@ bool spoolss_io_q_setprinterdata(const char *desc, SPOOL_Q_SETPRINTERDATA *q_u, bool spoolss_io_r_setprinterdata(const char *desc, SPOOL_R_SETPRINTERDATA *r_u, prs_struct *ps, int depth); bool spoolss_io_q_resetprinter(const char *desc, SPOOL_Q_RESETPRINTER *q_u, prs_struct *ps, int depth); bool spoolss_io_r_resetprinter(const char *desc, SPOOL_R_RESETPRINTER *r_u, prs_struct *ps, int depth); -bool spoolss_io_q_deleteform(const char *desc, SPOOL_Q_DELETEFORM *q_u, prs_struct *ps, int depth); -bool spoolss_io_r_deleteform(const char *desc, SPOOL_R_DELETEFORM *r_u, prs_struct *ps, int depth); bool spoolss_io_q_addform(const char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth); bool spoolss_io_r_addform(const char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int depth); bool spoolss_io_q_setform(const char *desc, SPOOL_Q_SETFORM *q_u, prs_struct *ps, int depth); @@ -6116,8 +6114,6 @@ bool make_spoolss_q_addform(SPOOL_Q_ADDFORM *q_u, POLICY_HND *handle, int level, FORM *form); bool make_spoolss_q_setform(SPOOL_Q_SETFORM *q_u, POLICY_HND *handle, int level, const char *form_name, FORM *form); -bool make_spoolss_q_deleteform(SPOOL_Q_DELETEFORM *q_u, POLICY_HND *handle, -
